8 files changed, 55 insertions, 23 deletions

diff --git a/lib/clang/include/clang/Basic/Version.inc b/lib/clang/include/clang/Basic/Version.inc
index 67ace7f6cc14..2cca975f3da4 100644
--- a/lib/clang/include/clang/Basic/Version.inc
+++ b/lib/clang/include/clang/Basic/Version.inc
@@ -1,11 +1,11 @@
 /* $FreeBSD$ */
 
-#define	CLANG_VERSION			5.0.1
-#define	CLANG_VERSION_STRING		"5.0.1"
-#define	CLANG_VERSION_MAJOR		5
+#define	CLANG_VERSION			6.0.0
+#define	CLANG_VERSION_STRING		"6.0.0"
+#define	CLANG_VERSION_MAJOR		6
 #define	CLANG_VERSION_MINOR		0
-#define	CLANG_VERSION_PATCHLEVEL	1
+#define	CLANG_VERSION_PATCHLEVEL	0
 
 #define	CLANG_VENDOR			"FreeBSD "
 
-#define	SVN_REVISION			"320880"
+#define	SVN_REVISION			"321017"
diff --git a/lib/clang/include/clang/Config/config.h b/lib/clang/include/clang/Config/config.h
index 5f593450f1ad..aa640bff291d 100644
--- a/lib/clang/include/clang/Config/config.h
+++ b/lib/clang/include/clang/Config/config.h
@@ -18,9 +18,15 @@
 /* Default runtime library to use. */
 #define CLANG_DEFAULT_RTLIB ""
 
+/* Default objcopy to use */
+#define CLANG_DEFAULT_OBJCOPY "objcopy"
+
 /* Default OpenMP runtime used by -fopenmp. */
 #define CLANG_DEFAULT_OPENMP_RUNTIME "libomp"
 
+/* Default architecture for OpenMP offloading to Nvidia GPUs. */
+#define CLANG_OPENMP_NVPTX_DEFAULT_ARCH "sm_35"
+
 /* Multilib suffix for libdir. */
 #define CLANG_LIBDIR_SUFFIX ""
 
@@ -46,7 +52,7 @@
 #define CLANG_HAVE_RLIMITS 1
 
 /* The LLVM product name and version */
-#define BACKEND_PACKAGE_STRING "LLVM 5.0.1"
+#define BACKEND_PACKAGE_STRING "LLVM 6.0.0svn"
 
 /* Linker version detected at compile time. */
 /* #undef HOST_LINK_VERSION */
diff --git a/lib/clang/include/lld/Common/Version.inc b/lib/clang/include/lld/Common/Version.inc
new file mode 100644
index 000000000000..232289f39374
--- /dev/null
+++ b/lib/clang/include/lld/Common/Version.inc
@@ -0,0 +1,8 @@
+// $FreeBSD$
+
+#define LLD_VERSION 6.0.0
+#define LLD_VERSION_STRING "6.0.0"
+#define LLD_VERSION_MAJOR 6
+#define LLD_VERSION_MINOR 0
+#define LLD_REVISION_STRING "321017"
+#define LLD_REPOSITORY_STRING "FreeBSD"
diff --git a/lib/clang/include/lld/Config/Version.inc b/lib/clang/include/lld/Config/Version.inc
deleted file mode 100644
index 6f72748a9d3e..000000000000
--- a/lib/clang/include/lld/Config/Version.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-// $FreeBSD$
-
-#define LLD_VERSION 5.0.1
-#define LLD_VERSION_STRING "5.0.1"
-#define LLD_VERSION_MAJOR 5
-#define LLD_VERSION_MINOR 0
-#define LLD_REVISION_STRING "320880"
-#define LLD_REPOSITORY_STRING "FreeBSD"
diff --git a/lib/clang/include/lldb/Host/Config.h b/lib/clang/include/lldb/Host/Config.h
index 670eca5b585d..86ef19b64e15 100644
--- a/lib/clang/include/lldb/Host/Config.h
+++ b/lib/clang/include/lldb/Host/Config.h
@@ -25,4 +25,6 @@
 
 #define HAVE_NR_PROCESS_VM_READV 0
 
+/* #undef HAVE_LIBCOMPRESSION */
+
 #endif // #ifndef LLDB_HOST_CONFIG_H
diff --git a/lib/clang/include/llvm/Config/config.h b/lib/clang/include/llvm/Config/config.h
index 6f3fb108bc07..e76dd28418a8 100644
--- a/lib/clang/include/llvm/Config/config.h
+++ b/lib/clang/include/llvm/Config/config.h
@@ -121,6 +121,12 @@
 /* Define to 1 if you have the `pthread' library (-lpthread). */
 #define HAVE_LIBPTHREAD 1
 
+/* Define to 1 if you have the `pthread_getname_np' function. */
+/* #undef HAVE_PTHREAD_GETNAME_NP */
+
+/* Define to 1 if you have the `pthread_setname_np' function. */
+/* #undef HAVE_PTHREAD_SETNAME_NP */
+
 /* Define to 1 if you have the `shell32' library (-lshell32). */
 /* #undef HAVE_LIBSHELL32 */
 
@@ -193,6 +199,12 @@
 /* Define to 1 if you have the `setenv' function. */
 #define HAVE_SETENV 1
 
+/* Define to 1 if you have the `sched_getaffinity' function. */
+/* #undef HAVE_SCHED_GETAFFINITY */
+
+/* Define to 1 if you have the `CPU_COUNT' macro. */
+/* #undef HAVE_CPU_COUNT */
+
 /* Define to 1 if you have the `setrlimit' function. */
 #define HAVE_SETRLIMIT 1
 
@@ -380,16 +392,19 @@
 #define LLVM_VERSION_PRINTER_SHOW_HOST_TARGET_INFO 1
 
 /* Major version of the LLVM API */
-#define LLVM_VERSION_MAJOR 5
+#define LLVM_VERSION_MAJOR 6
 
 /* Minor version of the LLVM API */
 #define LLVM_VERSION_MINOR 0
 
 /* Patch version of the LLVM API */
-#define LLVM_VERSION_PATCH 1
+#define LLVM_VERSION_PATCH 0
 
 /* LLVM version string */
-#define LLVM_VERSION_STRING "5.0.1"
+#define LLVM_VERSION_STRING "6.0.0svn"
+
+/* Define if libxml2 is supported on this platform. */
+/* #undef LLVM_LIBXML2_ENABLED */
 
 /* Define to the extension used for shared libraries, say, ".so". */
 #define LTDL_SHLIB_EXT ".so"
@@ -401,13 +416,13 @@
 #define PACKAGE_NAME "LLVM"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "LLVM 5.0.1"
+#define PACKAGE_STRING "LLVM 6.0.0svn"
 
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "5.0.1"
+#define PACKAGE_VERSION "6.0.0svn"
 
 /* Define to the vendor of this package. */
 /* #undef PACKAGE_VENDOR */
@@ -427,4 +442,10 @@
 /* Define to a function implementing strdup */
 /* #undef strdup */
 
+/* Whether GlobalISel rule coverage is being collected */
+#define LLVM_GISEL_COV_ENABLED 0
+
+/* Define to the default GlobalISel coverage file prefix */
+/* #undef LLVM_GISEL_COV_PREFIX */
+
 #endif
diff --git a/lib/clang/include/llvm/Config/llvm-config.h b/lib/clang/include/llvm/Config/llvm-config.h
index d288d8a927ad..75cd5fe0a95b 100644
--- a/lib/clang/include/llvm/Config/llvm-config.h
+++ b/lib/clang/include/llvm/Config/llvm-config.h
@@ -15,6 +15,9 @@
 #ifndef LLVM_CONFIG_H
 #define LLVM_CONFIG_H
 
+/* Define if LLVM_ENABLE_DUMP is enabled */
+/* #undef LLVM_ENABLE_DUMP */
+
 /* Define if we link Polly to the tools */
 /* #undef LINK_POLLY_INTO_TOOLS */
 
@@ -64,15 +67,15 @@
 #define LLVM_USE_OPROFILE 0
 
 /* Major version of the LLVM API */
-#define LLVM_VERSION_MAJOR 5
+#define LLVM_VERSION_MAJOR 6
 
 /* Minor version of the LLVM API */
 #define LLVM_VERSION_MINOR 0
 
 /* Patch version of the LLVM API */
-#define LLVM_VERSION_PATCH 1
+#define LLVM_VERSION_PATCH 0
 
 /* LLVM version string */
-#define LLVM_VERSION_STRING "5.0.1"
+#define LLVM_VERSION_STRING "6.0.0svn"
 
 #endif
diff --git a/lib/clang/include/llvm/Support/VCSRevision.h b/lib/clang/include/llvm/Support/VCSRevision.h
index 053a7d4cb8da..e6c32bec8e8e 100644
--- a/lib/clang/include/llvm/Support/VCSRevision.h
+++ b/lib/clang/include/llvm/Support/VCSRevision.h
@@ -1,2 +1,2 @@
 /* $FreeBSD$ */
-#define LLVM_REVISION "svn-r320880"
+#define LLVM_REVISION "svn-r321017"