10 files changed, 86 insertions, 38 deletions
diff --git a/lib/clang/include/Makefile b/lib/clang/include/Makefile
index 6f46e2842fa5..73a6120c2cdc 100644
--- a/lib/clang/include/Makefile
+++ b/lib/clang/include/Makefile
@@ -2,10 +2,11 @@
 
 .PATH: ${.CURDIR}/../../../contrib/llvm/tools/clang/lib/Headers
 
-INCSDIR=${INCLUDEDIR}/clang/3.0
+INCSDIR=${INCLUDEDIR}/clang/3.1
 
 INCS=	altivec.h \
 	avxintrin.h \
+	cpuid.h \
 	emmintrin.h \
 	immintrin.h \
 	mm3dnow.h \
@@ -14,7 +15,9 @@ INCS=	altivec.h \
 	nmmintrin.h \
 	pmmintrin.h \
 	smmintrin.h \
+	stdalign.h \
 	tmmintrin.h \
+	unwind.h \
 	wmmintrin.h \
 	x86intrin.h \
 	xmmintrin.h
diff --git a/lib/clang/include/MipsGenMCCodeEmitter.inc b/lib/clang/include/MipsGenMCCodeEmitter.inc
new file mode 100644
index 000000000000..82cd41835e69
--- /dev/null
+++ b/lib/clang/include/MipsGenMCCodeEmitter.inc
@@ -0,0 +1,2 @@
+/* $FreeBSD$ */
+#include "MipsGenMCCodeEmitter.inc.h"
diff --git a/lib/clang/include/clang/Basic/DiagnosticSerializationKinds.inc b/lib/clang/include/clang/Basic/DiagnosticSerializationKinds.inc
new file mode 100644
index 000000000000..f0d84f1ed3aa
--- /dev/null
+++ b/lib/clang/include/clang/Basic/DiagnosticSerializationKinds.inc
@@ -0,0 +1,2 @@
+/* $FreeBSD$ */
+#include "DiagnosticSerializationKinds.inc.h"
diff --git a/lib/clang/include/clang/Basic/Version.inc b/lib/clang/include/clang/Basic/Version.inc
index 98425840a9c3..55d4ea6cfd9d 100644
--- a/lib/clang/include/clang/Basic/Version.inc
+++ b/lib/clang/include/clang/Basic/Version.inc
@@ -1,10 +1,10 @@
 /* $FreeBSD$ */
 
-#define	CLANG_VERSION		3.0
+#define	CLANG_VERSION		3.1
 #define	CLANG_VERSION_MAJOR	3
-#define	CLANG_VERSION_MINOR	0
+#define	CLANG_VERSION_MINOR	1
 
 #define	CLANG_VENDOR		"FreeBSD "
-#define	CLANG_VENDOR_SUFFIX	" 20111210"
+#define	CLANG_VENDOR_SUFFIX	" 20120413"
 
-#define	SVN_REVISION		"145349"
+#define	SVN_REVISION		"154661"
diff --git a/lib/clang/include/clang/Config/config.h b/lib/clang/include/clang/Config/config.h
new file mode 100644
index 000000000000..7348308e3a59
--- /dev/null
+++ b/lib/clang/include/clang/Config/config.h
@@ -0,0 +1,20 @@
+/* $FreeBSD$ */
+/* tools/clang/include/clang/Config/config.h.  Generated from config.h.in by configure.  */
+/* include/clang/Config/config.h.in. */
+
+#ifndef CONFIG_H
+#define CONFIG_H
+
+/* Bug report URL. */
+#define BUG_REPORT_URL "http://llvm.org/bugs/"
+
+/* Relative directory for resource files */
+#define CLANG_RESOURCE_DIR ""
+
+/* Directory where gcc is installed. */
+#define GCC_INSTALL_PREFIX ""
+
+/* Directories clang will search for headers */
+#define C_INCLUDE_DIRS ""
+
+#endif
diff --git a/lib/clang/include/clang/Sema/AttrParsedAttrKinds.inc b/lib/clang/include/clang/Sema/AttrParsedAttrKinds.inc
new file mode 100644
index 000000000000..77d009288a5d
--- /dev/null
+++ b/lib/clang/include/clang/Sema/AttrParsedAttrKinds.inc
@@ -0,0 +1,2 @@
+/* $FreeBSD$ */
+#include "AttrParsedAttrKinds.inc.h"
diff --git a/lib/clang/include/clang/Sema/AttrParsedAttrList.inc b/lib/clang/include/clang/Sema/AttrParsedAttrList.inc
new file mode 100644
index 000000000000..b5aeac3af3e5
--- /dev/null
+++ b/lib/clang/include/clang/Sema/AttrParsedAttrList.inc
@@ -0,0 +1,2 @@
+/* $FreeBSD$ */
+#include "AttrParsedAttrList.inc.h"
diff --git a/lib/clang/include/clang/Sema/AttrTemplateInstantiate.inc b/lib/clang/include/clang/Sema/AttrTemplateInstantiate.inc
new file mode 100644
index 000000000000..88c3c1128625
--- /dev/null
+++ b/lib/clang/include/clang/Sema/AttrTemplateInstantiate.inc
@@ -0,0 +1,2 @@
+/* $FreeBSD$ */
+#include "AttrTemplateInstantiate.inc.h"
diff --git a/lib/clang/include/llvm/Config/config.h b/lib/clang/include/llvm/Config/config.h
index 92c960bc2844..f6001e9be806 100644
--- a/lib/clang/include/llvm/Config/config.h
+++ b/lib/clang/include/llvm/Config/config.h
@@ -11,33 +11,18 @@
 /* Relative directory for resource files */
 #define CLANG_RESOURCE_DIR ""
 
-/* 32 bit multilib directory. */
-#define CXX_INCLUDE_32BIT_DIR ""
-
-/* 64 bit multilib directory. */
-#define CXX_INCLUDE_64BIT_DIR ""
-
-/* Arch the libstdc++ headers. */
-#define CXX_INCLUDE_ARCH ""
-
-/* Directory with the libstdc++ headers. */
-#define CXX_INCLUDE_ROOT ""
-
 /* Directories clang will search for headers */
 #define C_INCLUDE_DIRS ""
 
-/* Define if CBE is enabled for printf %a output */
-#define ENABLE_CBE_PRINTF_A 1
-
 /* Define if position independent code is enabled */
 #define ENABLE_PIC 0
 
-/* Define if threads enabled */
-#define ENABLE_THREADS 0
-
 /* Define if timestamp information (e.g., __DATE___) is allowed */
 #define ENABLE_TIMESTAMPS 0
 
+/* Directory where gcc is installed. */
+#define GCC_INSTALL_PREFIX ""
+
 /* Define to 1 if you have the `argz_append' function. */
 /* #undef HAVE_ARGZ_APPEND */
 
@@ -297,6 +282,9 @@
 /* Define to 1 if you have the `powf' function. */
 #define HAVE_POWF 1
 
+/* Define to 1 if you have the `pread' function. */
+#define HAVE_PREAD 1
+
 /* Define if libtool can extract symbol lists from object files. */
 #define HAVE_PRELOADED_SYMBOLS 1
 
@@ -373,7 +361,7 @@
 #define HAVE_STDLIB_H 1
 
 /* Set to 1 if the std::isinf function is found in <cmath> */
-/* #undef HAVE_STD_ISINF_IN_CMATH */
+#define HAVE_STD_ISINF_IN_CMATH 1
 
 /* Set to 1 if the std::isnan function is found in <cmath> */
 #define HAVE_STD_ISNAN_IN_CMATH 1
@@ -545,18 +533,21 @@
 /* Installation directory for data files */
 /* #undef LLVM_DATADIR */
 
+/* Target triple LLVM will generate code for by default */
+/* #undef LLVM_DEFAULT_TARGET_TRIPLE */
+
 /* Installation directory for documentation */
 /* #undef LLVM_DOCSDIR */
 
+/* Define if threads enabled */
+#define LLVM_ENABLE_THREADS 0
+
 /* Installation directory for config files */
 /* #undef LLVM_ETCDIR */
 
 /* Has gcc/MSVC atomic intrinsics */
 #define LLVM_HAS_ATOMICS 0
 
-/* Host triple we were built on */
-/* #undef LLVM_HOSTTRIPLE */
-
 /* Installation directory for include files */
 /* #undef LLVM_INCLUDEDIR */
 
@@ -578,6 +569,9 @@
 /* LLVM name for the native AsmPrinter init function, if available */
 #define LLVM_NATIVE_ASMPRINTER LLVMInitializeX86AsmPrinter
 
+/* LLVM name for the native Disassembler init function, if available */
+#define LLVM_NATIVE_DISASSEMBLER LLVMInitializeX86Disassembler
+
 /* LLVM name for the native Target init function, if available */
 #define LLVM_NATIVE_TARGET LLVMInitializeX86Target
 
@@ -623,6 +617,18 @@
 /* Installation prefix directory */
 /* #undef LLVM_PREFIX */
 
+/* Define if we have the Intel JIT API runtime support library */
+#define LLVM_USE_INTEL_JITEVENTS 0
+
+/* Define if we have the oprofile JIT-support library */
+#define LLVM_USE_OPROFILE 0
+
+/* Major version of the LLVM API */
+#define LLVM_VERSION_MAJOR 3
+
+/* Minor version of the LLVM API */
+#define LLVM_VERSION_MINOR 1
+
 /* Define if the OS needs help to load dependent libraries for dlopen(). */
 #define LTDL_DLOPEN_DEPLIBS 1
 
@@ -648,19 +654,19 @@
 /* #undef NEED_USCORE */
 
 /* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "llvmbugs@cs.uiuc.edu"
+#define PACKAGE_BUGREPORT "http://llvm.org/bugs/"
 
 /* Define to the full name of this package. */
-#define PACKAGE_NAME "llvm"
+#define PACKAGE_NAME "LLVM"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "llvm 3.0"
+#define PACKAGE_STRING "LLVM 3.1svn"
 
 /* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "-llvm-"
+#define PACKAGE_TARNAME "llvm"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "3.0"
+#define PACKAGE_VERSION "3.1svn"
 
 /* Define as the return type of signal handlers (`int' or `void'). */
 #define RETSIGTYPE void
@@ -677,9 +683,6 @@
 /* Define to 1 if your <sys/time.h> declares `struct tm'. */
 /* #undef TM_IN_SYS_TIME */
 
-/* Define if we have the oprofile JIT-support library */
-#define USE_OPROFILE 0
-
 /* Define if use udis86 library */
 #define USE_UDIS86 0
 
diff --git a/lib/clang/include/llvm/Config/llvm-config.h b/lib/clang/include/llvm/Config/llvm-config.h
index 1b50ab879902..4a8d46060331 100644
--- a/lib/clang/include/llvm/Config/llvm-config.h
+++ b/lib/clang/include/llvm/Config/llvm-config.h
@@ -27,18 +27,21 @@
 /* Installation directory for data files */
 /* #undef LLVM_DATADIR */
 
+/* Target triple LLVM will generate code for by default */
+/* #undef LLVM_DEFAULT_TARGET_TRIPLE */
+
 /* Installation directory for documentation */
 /* #undef LLVM_DOCSDIR */
 
+/* Define if threads enabled */
+#define LLVM_ENABLE_THREADS 0
+
 /* Installation directory for config files */
 /* #undef LLVM_ETCDIR */
 
 /* Has gcc/MSVC atomic intrinsics */
 #define LLVM_HAS_ATOMICS 0
 
-/* Host triple we were built on */
-/* #undef LLVM_HOSTTRIPLE */
-
 /* Installation directory for include files */
 /* #undef LLVM_INCLUDEDIR */
 
@@ -60,6 +63,9 @@
 /* LLVM name for the native AsmPrinter init function, if available */
 #define LLVM_NATIVE_ASMPRINTER LLVMInitializeX86AsmPrinter
 
+/* LLVM name for the native Disassembler init function, if available */
+#define LLVM_NATIVE_DISASSEMBLER LLVMInitializeX86Disassembler
+
 /* LLVM name for the native Target init function, if available */
 #define LLVM_NATIVE_TARGET LLVMInitializeX86Target
 
@@ -105,4 +111,10 @@
 /* Installation prefix directory */
 /* #undef LLVM_PREFIX */
 
+/* Major version of the LLVM API */
+#define LLVM_VERSION_MAJOR 3
+
+/* Minor version of the LLVM API */
+#define LLVM_VERSION_MINOR 1
+
 #endif