From owner-svn-src-head@FreeBSD.ORG  Sat Nov 19 17:15:20 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C42B81065744;
	Sat, 19 Nov 2011 17:15:20 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B2BAF8FC17;
	Sat, 19 Nov 2011 17:15:20 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pAJHFKwq052952;
	Sat, 19 Nov 2011 17:15:20 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pAJHFKtE052950;
	Sat, 19 Nov 2011 17:15:20 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201111191715.pAJHFKtE052950@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 19 Nov 2011 17:15:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r227736 -
	head/contrib/llvm/tools/clang/include/clang/Basic
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 19 Nov 2011 17:15:20 -0000

Author: dim
Date: Sat Nov 19 17:15:20 2011
New Revision: 227736
URL: http://svn.freebsd.org/changeset/base/227736

Log:
  Pull in r144237 from upstream clang trunk:
  
  Fix the signature of __sigsetjmp and sigsetjmp.  This eliminates
  incorrect warnings about the prototypes of these functions.
  
  MFC after:	1 week

Modified:
  head/contrib/llvm/tools/clang/include/clang/Basic/Builtins.def

Modified: head/contrib/llvm/tools/clang/include/clang/Basic/Builtins.def
==============================================================================
--- head/contrib/llvm/tools/clang/include/clang/Basic/Builtins.def	Sat Nov 19 17:09:36 2011	(r227735)
+++ head/contrib/llvm/tools/clang/include/clang/Basic/Builtins.def	Sat Nov 19 17:15:20 2011	(r227736)
@@ -679,9 +679,9 @@ LIBBUILTIN(vfork, "i",            "fj", 
 // it here to avoid having two identical LIBBUILTIN entries.
 #undef setjmp
 LIBBUILTIN(_setjmp, "iJ",         "fj",   "setjmp.h", ALL_LANGUAGES)
-LIBBUILTIN(__sigsetjmp, "iJi",    "fj",   "setjmp.h", ALL_LANGUAGES)
+LIBBUILTIN(__sigsetjmp, "iSJi",   "fj",   "setjmp.h", ALL_LANGUAGES)
 LIBBUILTIN(setjmp, "iJ",          "fj",   "setjmp.h", ALL_LANGUAGES)
-LIBBUILTIN(sigsetjmp, "iJi",      "fj",   "setjmp.h", ALL_LANGUAGES)
+LIBBUILTIN(sigsetjmp, "iSJi",     "fj",   "setjmp.h", ALL_LANGUAGES)
 LIBBUILTIN(setjmp_syscall, "iJ",  "fj",   "setjmp.h", ALL_LANGUAGES)
 LIBBUILTIN(savectx, "iJ",         "fj",   "setjmp.h", ALL_LANGUAGES)
 LIBBUILTIN(qsetjmp, "iJ",         "fj",   "setjmp.h", ALL_LANGUAGES)