11 files changed, 54 insertions, 23 deletions

diff --git a/lib/clang/include/AArch64GenSystemOperands.inc b/lib/clang/include/AArch64GenSystemOperands.inc
new file mode 100644
index 0000000000000..a43602f34f556
--- /dev/null
+++ b/lib/clang/include/AArch64GenSystemOperands.inc
@@ -0,0 +1,2 @@
+/* $FreeBSD$ */
+#include "AArch64GenSystemOperands.inc.h"
diff --git a/lib/clang/include/Makefile b/lib/clang/include/Makefile
index 1a74e726b3af0..5e6d2d733694e 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=${LIBDIR}/clang/3.8.0/include
+INCSDIR=${LIBDIR}/clang/3.9.0/include
 
 INCS=	__clang_cuda_runtime_wrapper.h \
 	__stddef_max_align_t.h \
diff --git a/lib/clang/include/clang/Basic/Version.inc b/lib/clang/include/clang/Basic/Version.inc
index 94dc282fe8a78..d5e366a11799e 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.8.0
+#define	CLANG_VERSION			3.9.0
 #define	CLANG_VERSION_MAJOR		3
-#define	CLANG_VERSION_MINOR		8
+#define	CLANG_VERSION_MINOR		9
 #define	CLANG_VERSION_PATCHLEVEL	0
 
 #define	CLANG_VENDOR			"FreeBSD "
 
-#define	SVN_REVISION			"262564"
+#define	SVN_REVISION			"278877"
diff --git a/lib/clang/include/clang/Config/config.h b/lib/clang/include/clang/Config/config.h
index 76180df98ca20..c4656807d9459 100644
--- a/lib/clang/include/clang/Config/config.h
+++ b/lib/clang/include/clang/Config/config.h
@@ -9,6 +9,9 @@
 /* Bug report URL. */
 #define BUG_REPORT_URL "https://bugs.freebsd.org/submit/"
 
+/* Default C++ stdlib to use. */
+#define CLANG_DEFAULT_CXX_STDLIB ""
+
 /* Default OpenMP runtime used by -fopenmp. */
 #define CLANG_DEFAULT_OPENMP_RUNTIME "libomp"
 
@@ -31,9 +34,15 @@
 /* #undef CLANG_HAVE_LIBXML */
 
 /* The LLVM product name and version */
-#define BACKEND_PACKAGE_STRING "LLVM 3.8.0"
+#define BACKEND_PACKAGE_STRING "LLVM 3.9.0"
 
 /* Linker version detected at compile time. */
 /* #undef HOST_LINK_VERSION */
 
+/* pass --build-id to ld */
+/* #undef ENABLE_LINKER_BUILD_ID */
+
+/* enable x86 relax relocations by default */
+#define ENABLE_X86_RELAX_RELOCATIONS 0
+
 #endif
diff --git a/lib/clang/include/Checkers.inc b/lib/clang/include/clang/StaticAnalyzer/Checkers/Checkers.inc
index d5b8138489a15..d5b8138489a15 100644
--- a/lib/clang/include/Checkers.inc
+++ b/lib/clang/include/clang/StaticAnalyzer/Checkers/Checkers.inc
diff --git a/lib/clang/include/llvm/Config/AsmParsers.def b/lib/clang/include/llvm/Config/AsmParsers.def
index 3be6e385415c2..e3744e20890d4 100644
--- a/lib/clang/include/llvm/Config/AsmParsers.def
+++ b/lib/clang/include/llvm/Config/AsmParsers.def
@@ -1,5 +1,9 @@
 /* $FreeBSD$ */
 
+#ifndef LLVM_ASM_PARSER
+#  error Please define the macro LLVM_ASM_PARSER(TargetName)
+#endif
+
 LLVM_ASM_PARSER(AArch64)
 LLVM_ASM_PARSER(ARM)
 LLVM_ASM_PARSER(Mips)
diff --git a/lib/clang/include/llvm/Config/AsmPrinters.def b/lib/clang/include/llvm/Config/AsmPrinters.def
index 9ed021771d62d..6b44cb3906383 100644
--- a/lib/clang/include/llvm/Config/AsmPrinters.def
+++ b/lib/clang/include/llvm/Config/AsmPrinters.def
@@ -1,5 +1,9 @@
 /* $FreeBSD$ */
 
+#ifndef LLVM_ASM_PRINTER
+#  error Please define the macro LLVM_ASM_PRINTER(TargetName)
+#endif
+
 LLVM_ASM_PRINTER(AArch64)
 LLVM_ASM_PRINTER(ARM)
 LLVM_ASM_PRINTER(Mips)
diff --git a/lib/clang/include/llvm/Config/Disassemblers.def b/lib/clang/include/llvm/Config/Disassemblers.def
index 44fc7ef547081..4d3a1fc45fa85 100644
--- a/lib/clang/include/llvm/Config/Disassemblers.def
+++ b/lib/clang/include/llvm/Config/Disassemblers.def
@@ -1,5 +1,9 @@
 /* $FreeBSD$ */
 
+#ifndef LLVM_DISASSEMBLER
+#  error Please define the macro LLVM_DISASSEMBLER(TargetName)
+#endif
+
 LLVM_DISASSEMBLER(AArch64)
 LLVM_DISASSEMBLER(ARM)
 LLVM_DISASSEMBLER(Mips)
diff --git a/lib/clang/include/llvm/Config/Targets.def b/lib/clang/include/llvm/Config/Targets.def
index 96b60d9b5101b..8e968179c1ab7 100644
--- a/lib/clang/include/llvm/Config/Targets.def
+++ b/lib/clang/include/llvm/Config/Targets.def
@@ -1,5 +1,9 @@
 /* $FreeBSD$ */
 
+#ifndef LLVM_TARGET
+#  error Please define the macro LLVM_TARGET(TargetName)
+#endif
+
 LLVM_TARGET(AArch64)
 LLVM_TARGET(ARM)
 LLVM_TARGET(Mips)
diff --git a/lib/clang/include/llvm/Config/config.h b/lib/clang/include/llvm/Config/config.h
index 014d9d11d9753..1861a5c14398b 100644
--- a/lib/clang/include/llvm/Config/config.h
+++ b/lib/clang/include/llvm/Config/config.h
@@ -1,6 +1,4 @@
 /* $FreeBSD$ */
-/* include/llvm/Config/config.h.cmake corresponding to config.h.in. */
-
 #ifndef CONFIG_H
 #define CONFIG_H
 
@@ -19,15 +17,9 @@
 /* Define to enable crash overrides */
 #define ENABLE_CRASH_OVERRIDES
 
-/* Define to disable C++ atexit */
-#define DISABLE_LLVM_DYLIB_ATEXIT
-
 /* Define if position independent code is enabled */
 #define ENABLE_PIC
 
-/* Define if timestamp information (e.g., __DATE__) is allowed */
-/* #undef ENABLE_TIMESTAMPS */
-
 /* Define to 1 if you have the `arc4random' function. */
 #define HAVE_DECL_ARC4RANDOM 1
 
@@ -264,6 +256,9 @@
 /* Define if you have the shl_load function. */
 #undef HAVE_SHL_LOAD
 
+/* Define to 1 if you have the `sigaltstack' function. */
+#define HAVE_SIGALTSTACK 1
+
 /* Define to 1 if you have the `siglongjmp' function. */
 /* #undef HAVE_SIGLONGJMP */
 
@@ -327,7 +322,7 @@
 #define HAVE_SYS_TIME_H 1
 
 /* Define to 1 if you have the <sys/types.h> header file. */
-/* #undef HAVE_SYS_TYPES_H */
+#define HAVE_SYS_TYPES_H 1
 
 /* Define to 1 if you have the <sys/uio.h> header file. */
 #define HAVE_SYS_UIO_H 1
@@ -335,6 +330,9 @@
 /* Define if the setupterm() function is supported this platform. */
 #define HAVE_TERMINFO 1
 
+/* Define if the xar_open() function is supported this platform. */
+/* #undef HAVE_LIBXAR */
+
 /* Define to 1 if you have the <termios.h> header file. */
 #define HAVE_TERMIOS_H 1
 
@@ -344,6 +342,9 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #define HAVE_UNISTD_H 1
 
+/* Define to 1 if you have the `_Unwind_Backtrace' function. */
+/* #undef HAVE_UNWIND_BACKTRACE */
+
 /* Define to 1 if you have the <utime.h> header file. */
 #define HAVE_UTIME_H 1
 
@@ -504,13 +505,16 @@
 #define LLVM_VERSION_MAJOR 3
 
 /* Minor version of the LLVM API */
-#define LLVM_VERSION_MINOR 8
+#define LLVM_VERSION_MINOR 9
 
 /* Patch version of the LLVM API */
 #define LLVM_VERSION_PATCH 0
 
 /* LLVM version string */
-#define LLVM_VERSION_STRING "3.8.0"
+#define LLVM_VERSION_STRING "3.9.0"
+
+/* LLVM version information */
+/* #undef LLVM_VERSION_INFO */
 
 /* Define if we link Polly to the tools */
 /* #undef LINK_POLLY_INTO_TOOLS */
@@ -542,13 +546,16 @@
 #define PACKAGE_NAME "LLVM"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "LLVM 3.8.0"
+#define PACKAGE_STRING "LLVM 3.9.0"
 
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "3.8.0"
+#define PACKAGE_VERSION "3.9.0"
+
+/* Define to the vendor of this package. */
+/* #undef PACKAGE_VENDOR */
 
 /* Define as the return type of signal handlers (`int' or `void'). */
 #define RETSIGTYPE void
@@ -565,9 +572,6 @@
 /* Define to 1 if your <sys/time.h> declares `struct tm'. */
 #undef TM_IN_SYS_TIME
 
-/* Type of 1st arg on ELM Callback */
-/* #undef WIN32_ELMCB_PCSTR */
-
 /* Define to `int' if <sys/types.h> does not define. */
 #undef pid_t
 
diff --git a/lib/clang/include/llvm/Config/llvm-config.h b/lib/clang/include/llvm/Config/llvm-config.h
index 5cbb474053d4d..060ea20256833 100644
--- a/lib/clang/include/llvm/Config/llvm-config.h
+++ b/lib/clang/include/llvm/Config/llvm-config.h
@@ -95,13 +95,13 @@
 #define LLVM_VERSION_MAJOR 3
 
 /* Minor version of the LLVM API */
-#define LLVM_VERSION_MINOR 8
+#define LLVM_VERSION_MINOR 9
 
 /* Patch version of the LLVM API */
 #define LLVM_VERSION_PATCH 0
 
 /* LLVM version string */
-#define LLVM_VERSION_STRING "3.8.0"
+#define LLVM_VERSION_STRING "3.9.0"
 
 /* Define if we link Polly to the tools */
 /* #undef LINK_POLLY_INTO_TOOLS */