9 files changed, 17 insertions, 16 deletions

diff --git a/lib/clang/headers/Makefile b/lib/clang/headers/Makefile
index 02712327667c..5cd962a3fd69 100644
--- a/lib/clang/headers/Makefile
+++ b/lib/clang/headers/Makefile
@@ -5,7 +5,7 @@
 .PATH:		${CLANG_SRCS}/lib/Headers
 
 INCSGROUPS=	INCS CUDA OMP PPC
-INCSDIR=	${LIBDIR}/clang/12.0.0/include
+INCSDIR=	${LIBDIR}/clang/12.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 691215becf3a..fc50df3ad24e 100644
--- a/lib/clang/include/VCSVersion.inc
+++ b/lib/clang/include/VCSVersion.inc
@@ -1,14 +1,14 @@
 // $FreeBSD$
 
-#define LLVM_REVISION "llvmorg-12.0.0-0-gd28af7c654d8"
+#define LLVM_REVISION "llvmorg-12.0.1-rc2-0-ge7dac564cd0e"
 #define LLVM_REPOSITORY "git@github.com:llvm/llvm-project.git"
 
-#define CLANG_REVISION "llvmorg-12.0.0-0-gd28af7c654d8"
+#define CLANG_REVISION "llvmorg-12.0.1-rc2-0-ge7dac564cd0e"
 #define CLANG_REPOSITORY "git@github.com:llvm/llvm-project.git"
 
 // <Upstream revision at import>-<Local identifier in __FreeBSD_version style>
-#define LLD_REVISION "llvmorg-12.0.0-0-gd28af7c654d8-1400001"
+#define LLD_REVISION "llvmorg-12.0.1-rc2-0-ge7dac564cd0e-1400001"
 #define LLD_REPOSITORY "FreeBSD"
 
-#define LLDB_REVISION "llvmorg-12.0.0-0-gd28af7c654d8"
+#define LLDB_REVISION "llvmorg-12.0.1-rc2-0-ge7dac564cd0e"
 #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 06e684daa4e7..7e28da22ce5c 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			12.0.0
-#define	CLANG_VERSION_STRING		"12.0.0"
+#define	CLANG_VERSION			12.0.1
+#define	CLANG_VERSION_STRING		"12.0.1"
 #define	CLANG_VERSION_MAJOR		12
 #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 e514deda3691..a9d765b327b2 100644
--- a/lib/clang/include/clang/Config/config.h
+++ b/lib/clang/include/clang/Config/config.h
@@ -65,7 +65,7 @@
 #define CLANG_HAVE_RLIMITS 1
 
 /* The LLVM product name and version */
-#define BACKEND_PACKAGE_STRING "LLVM 12.0.0"
+#define BACKEND_PACKAGE_STRING "LLVM 12.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 5a8f2fa31ca7..65472b919842 100644
--- a/lib/clang/include/lld/Common/Version.inc
+++ b/lib/clang/include/lld/Common/Version.inc
@@ -1,3 +1,3 @@
 // $FreeBSD$
 
-#define LLD_VERSION_STRING "12.0.0"
+#define LLD_VERSION_STRING "12.0.1"
diff --git a/lib/clang/include/llvm/Config/config.h b/lib/clang/include/llvm/Config/config.h
index ab8be211be67..0cd6dabeab17 100644
--- a/lib/clang/include/llvm/Config/config.h
+++ b/lib/clang/include/llvm/Config/config.h
@@ -324,10 +324,10 @@
 #define PACKAGE_NAME "LLVM"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "LLVM 12.0.0"
+#define PACKAGE_STRING "LLVM 12.0.1"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "12.0.0"
+#define PACKAGE_VERSION "12.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 ea3de5d1a6c7..9d95bb2c68dc 100644
--- a/lib/clang/include/llvm/Config/llvm-config.h
+++ b/lib/clang/include/llvm/Config/llvm-config.h
@@ -1,3 +1,4 @@
+
 /* $FreeBSD$ */
 /*===------- llvm/Config/llvm-config.h - llvm configuration -------*- C -*-===*/
 /*                                                                            */
@@ -70,10 +71,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 "12.0.0"
+#define LLVM_VERSION_STRING "12.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 e642c2d77c8a..f3cccac9f545 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 "llvmorg-12.0.0-0-gd28af7c654d8"
+#define LLVM_REVISION "llvmorg-12.0.1-rc2-0-ge7dac564cd0e"
 #define LLVM_REPOSITORY "git@github.com:llvm/llvm-project.git"
diff --git a/lib/libclang_rt/compiler-rt-vars.mk b/lib/libclang_rt/compiler-rt-vars.mk
index aa4f7123be58..974a553e379c 100644
--- a/lib/libclang_rt/compiler-rt-vars.mk
+++ b/lib/libclang_rt/compiler-rt-vars.mk
@@ -1,4 +1,4 @@
-CLANG_SUBDIR=clang/12.0.0
+CLANG_SUBDIR=clang/12.0.1
 CLANGDIR=	/usr/lib/${CLANG_SUBDIR}
 SANITIZER_LIBDIR=		${CLANGDIR}/lib/freebsd