Module Name: src
Committed By: joerg
Date: Fri May 29 17:37:50 UTC 2015
Modified Files:
src/external/bsd/llvm: Makefile.inc
src/external/bsd/llvm/config/clang/Config: config.h
src/external/bsd/llvm/config/llvm/Config: config.h.in llvm-config.h.in
Log Message:
Update build glue for LLVM/Clang 3.6.1. This brings in a number of
bugfixes for various platforms and corrects the mcount symbol on
NetBSD/ARM.
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/external/bsd/llvm/Makefile.inc
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/llvm/config/clang/Config/config.h
cvs rdiff -u -r1.15 -r1.16 \
src/external/bsd/llvm/config/llvm/Config/config.h.in
cvs rdiff -u -r1.8 -r1.9 \
src/external/bsd/llvm/config/llvm/Config/llvm-config.h.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/llvm/Makefile.inc
diff -u src/external/bsd/llvm/Makefile.inc:1.78 src/external/bsd/llvm/Makefile.inc:1.79
--- src/external/bsd/llvm/Makefile.inc:1.78 Wed Mar 18 17:43:20 2015
+++ src/external/bsd/llvm/Makefile.inc Fri May 29 17:37:50 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.78 2015/03/18 17:43:20 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.79 2015/05/29 17:37:50 joerg Exp $
.if !defined(LLVM_TOPLEVEL_MK)
LLVM_TOPLEVEL_MK=
@@ -8,7 +8,7 @@ LLVM_TOPLEVEL_MK=
SVN_ROOT= http://llvm.org/svn/llvm-project
SVN_BRANCH= branches/release_36
-COMMON_REVISION= 232565
+COMMON_REVISION= 237755
CLANG_REVISION= ${COMMON_REVISION}
LLD_REVISION= ${COMMON_REVISION}
LLDB_REVISION= ${COMMON_REVISION}
@@ -17,9 +17,9 @@ LLVM_REVISION= ${COMMON_REVISION}
MCLINKER_REVISION= deeb2a77b4165827316f88e0a7ba4ba6b743a080
MCLINKER_ROOT= https://code.google.com/p/mclinker/
-LLVM_VERSION= 3.6.0
-CLANG_VERSION= 3.6.0
-LLD_VERSION= 3.6.0
+LLVM_VERSION= 3.6.1
+CLANG_VERSION= 3.6.1
+LLD_VERSION= 3.6.1
CLANG_SRCDIR:= ${.PARSEDIR}/dist/clang
LLD_SRCDIR:= ${.PARSEDIR}/dist/lld
Index: src/external/bsd/llvm/config/clang/Config/config.h
diff -u src/external/bsd/llvm/config/clang/Config/config.h:1.12 src/external/bsd/llvm/config/clang/Config/config.h:1.13
--- src/external/bsd/llvm/config/clang/Config/config.h:1.12 Thu Jan 29 20:41:34 2015
+++ src/external/bsd/llvm/config/clang/Config/config.h Fri May 29 17:37:50 2015
@@ -27,7 +27,7 @@
/* Define if we have libxml2 */
/* #undef CLANG_HAVE_LIBXML */
-#define PACKAGE_STRING "LLVM 3.6.0svn"
+#define PACKAGE_STRING "LLVM 3.6.1"
/* The LLVM product name and version */
#define BACKEND_PACKAGE_STRING PACKAGE_STRING
Index: src/external/bsd/llvm/config/llvm/Config/config.h.in
diff -u src/external/bsd/llvm/config/llvm/Config/config.h.in:1.15 src/external/bsd/llvm/config/llvm/Config/config.h.in:1.16
--- src/external/bsd/llvm/config/llvm/Config/config.h.in:1.15 Thu Jan 29 20:41:34 2015
+++ src/external/bsd/llvm/config/llvm/Config/config.h.in Fri May 29 17:37:50 2015
@@ -97,7 +97,7 @@
#define HAVE_FCNTL_H 1
/* Define to 1 if you have the <fenv.h> header file. */
- #ifndef __powerpc__
+ #ifndef __powerpc
#define HAVE_FENV_H 1
#endif
@@ -423,6 +423,9 @@
/* Have host's __chkstk */
/* #undef HAVE___CHKSTK */
+/* Have host's __chkstk_ms */
+/* #undef HAVE___CHKSTK_MS */
+
/* Have host's __cmpdi2 */
/* #undef HAVE___CMPDI2 */
@@ -459,6 +462,9 @@
/* Have host's ___chkstk */
/* #undef HAVE____CHKSTK */
+/* Have host's ___chkstk_ms */
+/* #undef HAVE____CHKSTK_MS */
+
/* Linker version detected at compile time. */
#define HOST_LINK_VERSION "1"
@@ -547,10 +553,10 @@
#define LLVM_VERSION_MINOR 6
/* Patch version of the LLVM API */
-#define LLVM_VERSION_PATCH 0
+#define LLVM_VERSION_PATCH 1
/* LLVM version string */
-#define LLVM_VERSION_STRING "3.6.0svn"
+#define LLVM_VERSION_STRING "3.6.1"
/* The shared library extension */
#define LTDL_SHLIB_EXT ".so"
@@ -566,13 +572,13 @@
#define PACKAGE_NAME "LLVM"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "LLVM 3.6.0svn"
+#define PACKAGE_STRING "LLVM 3.6.1"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "llvm"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "3.6.0svn"
+#define PACKAGE_VERSION "3.6.1"
/* Define as the return type of signal handlers (`int' or `void'). */
#define RETSIGTYPE void
Index: src/external/bsd/llvm/config/llvm/Config/llvm-config.h.in
diff -u src/external/bsd/llvm/config/llvm/Config/llvm-config.h.in:1.8 src/external/bsd/llvm/config/llvm/Config/llvm-config.h.in:1.9
--- src/external/bsd/llvm/config/llvm/Config/llvm-config.h.in:1.8 Thu Jan 29 20:41:34 2015
+++ src/external/bsd/llvm/config/llvm/Config/llvm-config.h.in Fri May 29 17:37:50 2015
@@ -93,7 +93,10 @@
/* Minor version of the LLVM API */
#define LLVM_VERSION_MINOR 6
+/* Patch version of the LLVM API */
+#define LLVM_VERSION_PATCH 1
+
/* LLVM version string */
-#define LLVM_VERSION_STRING "3.6.0svn"
+#define LLVM_VERSION_STRING "3.6.1"
#endif
