aboutsummaryrefslogtreecommitdiff
path: root/lib/clang
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2019-12-22 11:50:44 +0000
committerDimitry Andric <dim@FreeBSD.org>2019-12-22 11:50:44 +0000
commitc14a5a8800a0f7a007f8cd197b4cad4d26a78f8c (patch)
treea1dde3bcaa50b579a1c761196c9bb100d2021707 /lib/clang
parent3cf3b4e6419d14ed25c0b67b84763b3be937c8b5 (diff)
parentb96995b67f15110f39c41149543e19c8189abdaf (diff)
downloadsrc-c14a5a8800a0f7a007f8cd197b4cad4d26a78f8c.tar.gz
src-c14a5a8800a0f7a007f8cd197b4cad4d26a78f8c.zip
Merge llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp
Notes
Notes: svn path=/head/; revision=356004
Diffstat (limited to 'lib/clang')
-rw-r--r--lib/clang/freebsd_cc_version.h2
-rw-r--r--lib/clang/headers/Makefile3
-rw-r--r--lib/clang/include/VCSVersion.inc14
-rw-r--r--lib/clang/include/clang/Basic/Version.inc6
-rw-r--r--lib/clang/include/clang/Config/config.h2
-rw-r--r--lib/clang/include/lld/Common/Version.inc4
-rw-r--r--lib/clang/include/llvm/Config/config.h4
-rw-r--r--lib/clang/include/llvm/Config/llvm-config.h4
-rw-r--r--lib/clang/include/llvm/Support/VCSRevision.h4
9 files changed, 22 insertions, 21 deletions
diff --git a/lib/clang/freebsd_cc_version.h b/lib/clang/freebsd_cc_version.h
index 2e6dc0b30884..1be76ba09f9b 100644
--- a/lib/clang/freebsd_cc_version.h
+++ b/lib/clang/freebsd_cc_version.h
@@ -1,3 +1,3 @@
/* $FreeBSD$ */
-#define FREEBSD_CC_VERSION 1300005
+#define FREEBSD_CC_VERSION 1300006
diff --git a/lib/clang/headers/Makefile b/lib/clang/headers/Makefile
index 189fadc3bc0e..290c6f4bad75 100644
--- a/lib/clang/headers/Makefile
+++ b/lib/clang/headers/Makefile
@@ -1,3 +1,4 @@
+
# $FreeBSD$
.include "../clang.pre.mk"
@@ -5,7 +6,7 @@
.PATH: ${CLANG_SRCS}/lib/Headers
INCSGROUPS= INCS CUDA OMP PPC
-INCSDIR= ${LIBDIR}/clang/9.0.0/include
+INCSDIR= ${LIBDIR}/clang/9.0.1/include
CUDADIR= ${INCSDIR}/cuda_wrappers
OMPDIR= ${INCSDIR}/openmp_wrappers
PPCDIR= ${INCSDIR}/ppc_wrappers
diff --git a/lib/clang/include/VCSVersion.inc b/lib/clang/include/VCSVersion.inc
index edab4ccb73f2..154b86ba4569 100644
--- a/lib/clang/include/VCSVersion.inc
+++ b/lib/clang/include/VCSVersion.inc
@@ -1,14 +1,14 @@
// $FreeBSD$
-#define LLVM_REVISION "372316"
-#define LLVM_REPOSITORY "https://llvm.org/svn/llvm-project/llvm/tags/RELEASE_900/final"
+#define LLVM_REVISION "c1a0a213378a458fbea1a5c77b315c7dce08fd05"
+#define LLVM_REPOSITORY "git@github.com:llvm/llvm-project.git"
-#define CLANG_REVISION "372316"
-#define CLANG_REPOSITORY "https://llvm.org/svn/llvm-project/cfe/tags/RELEASE_900/final"
+#define CLANG_REVISION "c1a0a213378a458fbea1a5c77b315c7dce08fd05"
+#define CLANG_REPOSITORY "git@github.com:llvm/llvm-project.git"
// <Upstream revision at import>-<Local identifier in __FreeBSD_version style>
-#define LLD_REVISION "372316-1300005"
+#define LLD_REVISION "c1a0a213378a458fbea1a5c77b315c7dce08fd05-1300006"
#define LLD_REPOSITORY "FreeBSD"
-#define LLDB_REVISION "372316"
-#define LLDB_REPOSITORY "https://llvm.org/svn/llvm-project/lldb/tags/RELEASE_900/final"
+#define LLDB_REVISION "c1a0a213378a458fbea1a5c77b315c7dce08fd05"
+#define LLDB_REPOSITORY "git@github.com:llvm/llvm-project.git"
diff --git a/lib/clang/include/clang/Basic/Version.inc b/lib/clang/include/clang/Basic/Version.inc
index 04b0ce9b9a68..efc0cde3e7db 100644
--- a/lib/clang/include/clang/Basic/Version.inc
+++ b/lib/clang/include/clang/Basic/Version.inc
@@ -1,9 +1,9 @@
/* $FreeBSD$ */
-#define CLANG_VERSION 9.0.0
-#define CLANG_VERSION_STRING "9.0.0"
+#define CLANG_VERSION 9.0.1
+#define CLANG_VERSION_STRING "9.0.1"
#define CLANG_VERSION_MAJOR 9
#define CLANG_VERSION_MINOR 0
-#define CLANG_VERSION_PATCHLEVEL 0
+#define CLANG_VERSION_PATCHLEVEL 1
#define CLANG_VENDOR "FreeBSD "
diff --git a/lib/clang/include/clang/Config/config.h b/lib/clang/include/clang/Config/config.h
index aea09a42bfda..821dd4c23b30 100644
--- a/lib/clang/include/clang/Config/config.h
+++ b/lib/clang/include/clang/Config/config.h
@@ -62,7 +62,7 @@
#define CLANG_HAVE_RLIMITS 1
/* The LLVM product name and version */
-#define BACKEND_PACKAGE_STRING "LLVM 9.0.0"
+#define BACKEND_PACKAGE_STRING "LLVM 9.0.1"
/* 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
index ccc9037657d0..2893e90e2c48 100644
--- a/lib/clang/include/lld/Common/Version.inc
+++ b/lib/clang/include/lld/Common/Version.inc
@@ -1,6 +1,6 @@
// $FreeBSD$
-#define LLD_VERSION 9.0.0
-#define LLD_VERSION_STRING "9.0.0"
+#define LLD_VERSION 9.0.1
+#define LLD_VERSION_STRING "9.0.1"
#define LLD_VERSION_MAJOR 9
#define LLD_VERSION_MINOR 0
diff --git a/lib/clang/include/llvm/Config/config.h b/lib/clang/include/llvm/Config/config.h
index 05c9d0f5ec6a..d4bfec5b1e77 100644
--- a/lib/clang/include/llvm/Config/config.h
+++ b/lib/clang/include/llvm/Config/config.h
@@ -322,10 +322,10 @@
#define PACKAGE_NAME "LLVM"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "LLVM 9.0.0"
+#define PACKAGE_STRING "LLVM 9.0.1"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "9.0.0"
+#define PACKAGE_VERSION "9.0.1"
/* Define to the vendor of this package. */
/* #undef PACKAGE_VENDOR */
diff --git a/lib/clang/include/llvm/Config/llvm-config.h b/lib/clang/include/llvm/Config/llvm-config.h
index 4ec04d91c1d4..20d30709a54d 100644
--- a/lib/clang/include/llvm/Config/llvm-config.h
+++ b/lib/clang/include/llvm/Config/llvm-config.h
@@ -73,10 +73,10 @@
#define LLVM_VERSION_MINOR 0
/* Patch version of the LLVM API */
-#define LLVM_VERSION_PATCH 0
+#define LLVM_VERSION_PATCH 1
/* LLVM version string */
-#define LLVM_VERSION_STRING "9.0.0"
+#define LLVM_VERSION_STRING "9.0.1"
/* Whether LLVM records statistics for use with GetStatistics(),
* PrintStatistics() or PrintStatisticsJSON()
diff --git a/lib/clang/include/llvm/Support/VCSRevision.h b/lib/clang/include/llvm/Support/VCSRevision.h
index e4f436f68680..3a11d8c5f76a 100644
--- a/lib/clang/include/llvm/Support/VCSRevision.h
+++ b/lib/clang/include/llvm/Support/VCSRevision.h
@@ -1,3 +1,3 @@
/* $FreeBSD$ */
-#define LLVM_REVISION "372316"
-#define LLVM_REPOSITORY "https://llvm.org/svn/llvm-project/llvm/tags/RELEASE_900/final"
+#define LLVM_REVISION "c1a0a213378a458fbea1a5c77b315c7dce08fd05"
+#define LLVM_REPOSITORY "git@github.com:llvm/llvm-project.git"