Merge head from 7/28

8 files changed, 15 insertions, 37 deletions

diff --git a/lib/clang/include/IA64GenAsmWriter.inc b/lib/clang/include/IA64GenAsmWriter.inc
deleted file mode 100644
index dddc793..0000000
--- a/lib/clang/include/IA64GenAsmWriter.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "IA64GenAsmWriter.inc.h"
diff --git a/lib/clang/include/IA64GenDAGISel.inc b/lib/clang/include/IA64GenDAGISel.inc
deleted file mode 100644
index c6ae3dc..0000000
--- a/lib/clang/include/IA64GenDAGISel.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "IA64GenDAGISel.inc.h"
diff --git a/lib/clang/include/IA64GenInstrInfo.inc b/lib/clang/include/IA64GenInstrInfo.inc
deleted file mode 100644
index 7fe83f6..0000000
--- a/lib/clang/include/IA64GenInstrInfo.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "IA64GenInstrInfo.inc.h"
diff --git a/lib/clang/include/IA64GenRegisterInfo.inc b/lib/clang/include/IA64GenRegisterInfo.inc
deleted file mode 100644
index 89405ed..0000000
--- a/lib/clang/include/IA64GenRegisterInfo.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "IA64GenRegisterInfo.inc.h"
diff --git a/lib/clang/include/Makefile b/lib/clang/include/Makefile
index da39f1c..1ffd3e1 100644
--- a/lib/clang/include/Makefile
+++ b/lib/clang/include/Makefile
@@ -8,7 +8,7 @@ LLVM_SRCS= ${.CURDIR}/../../../contrib/llvm
 
 .PATH: ${LLVM_SRCS}/tools/clang/lib/Headers
 
-INCSDIR=${INCLUDEDIR}/clang/3.4
+INCSDIR=${INCLUDEDIR}/clang/3.4.1
 
 INCS=	__wmmintrin_aes.h \
 	__wmmintrin_pclmul.h \
diff --git a/lib/clang/include/clang/Basic/Version.inc b/lib/clang/include/clang/Basic/Version.inc
index d63713e..d2fcc04 100644
--- a/lib/clang/include/clang/Basic/Version.inc
+++ b/lib/clang/include/clang/Basic/Version.inc
@@ -1,10 +1,11 @@
 /* $FreeBSD$ */
 
-#define	CLANG_VERSION		3.4
-#define	CLANG_VERSION_MAJOR	3
-#define	CLANG_VERSION_MINOR	4
+#define	CLANG_VERSION			3.4.1
+#define	CLANG_VERSION_MAJOR		3
+#define	CLANG_VERSION_MINOR		4
+#define	CLANG_VERSION_PATCHLEVEL	1
 
-#define	CLANG_VENDOR		"FreeBSD "
-#define	CLANG_VENDOR_SUFFIX	" 20140216"
+#define	CLANG_VENDOR			"FreeBSD "
+#define	CLANG_VENDOR_SUFFIX		" 20140512"
 
-#define	SVN_REVISION		"197956"
+#define	SVN_REVISION			"208032"
diff --git a/lib/clang/include/llvm/Config/config.h b/lib/clang/include/llvm/Config/config.h
index 985d259..cbbb4fb 100644
--- a/lib/clang/include/llvm/Config/config.h
+++ b/lib/clang/include/llvm/Config/config.h
@@ -8,9 +8,6 @@
 /* Get __FreeBSD_version. */
 #include <osreldate.h>
 
-/* Define if building universal (internal helper macro) */
-/* #undef AC_APPLE_UNIVERSAL_BUILD */
-
 /* Bug report URL. */
 #define BUG_REPORT_URL "http://llvm.org/bugs/"
 
@@ -634,7 +631,7 @@
 /* #undef LLVM_PATH_XDOT */
 
 /* Installation prefix directory */
-#define LLVM_PREFIX ""
+#define LLVM_PREFIX "/usr"
 
 /* Define if we have the Intel JIT API runtime support library */
 #define LLVM_USE_INTEL_JITEVENTS 0
@@ -648,6 +645,9 @@
 /* Minor version of the LLVM API */
 #define LLVM_VERSION_MINOR 4
 
+/* Patch version of the LLVM API */
+#define LLVM_VERSION_PATCH 1
+
 /* Define if the OS needs help to load dependent libraries for dlopen(). */
 #define LTDL_DLOPEN_DEPLIBS 1
 
@@ -675,16 +675,13 @@
 #define PACKAGE_NAME "LLVM"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "LLVM 3.4"
+#define PACKAGE_STRING "LLVM 3.4.1"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "llvm"
 
-/* Define to the home page for this package. */
-/* #undef PACKAGE_URL */
-
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "3.4"
+#define PACKAGE_VERSION "3.4.1"
 
 /* Define as the return type of signal handlers (`int' or `void'). */
 #define RETSIGTYPE void
@@ -707,18 +704,6 @@
 /* Type of 1st arg on ELM Callback */
 /* #undef WIN32_ELMCB_PCSTR */
 
-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-   significant byte first (like Motorola and SPARC, unlike Intel). */
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-#  define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-/* #  undef WORDS_BIGENDIAN */
-# endif
-#endif
-
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */
 
diff --git a/lib/clang/include/llvm/Config/llvm-config.h b/lib/clang/include/llvm/Config/llvm-config.h
index c746687..1717863 100644
--- a/lib/clang/include/llvm/Config/llvm-config.h
+++ b/lib/clang/include/llvm/Config/llvm-config.h
@@ -109,7 +109,7 @@
 /* #undef LLVM_PATH_XDOT_PY */
 
 /* Installation prefix directory */
-#define LLVM_PREFIX ""
+#define LLVM_PREFIX "/usr"
 
 /* Define if we have the Intel JIT API runtime support library */
 #define LLVM_USE_INTEL_JITEVENTS 0