Bump llvm/clang version numbers from 12.0.1 to 13.0.0.

DimitryAndric · Oct 18, 2021 · b977c0e · b977c0e
1 parent a23cbd8
commit b977c0e
Show file tree

Hide file tree

Showing 14 changed files with 631 additions and 322 deletions.
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
diff --git a/etc/mtree/BSD.debug.dist b/etc/mtree/BSD.debug.dist
@@ -31,7 +31,7 @@
             ..
             lib
                 clang
-                    12.0.1
+                    13.0.0
                         lib
                             freebsd
                             ..

diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
@@ -35,7 +35,7 @@
     ..
     lib
         clang
-            12.0.1
+            13.0.0
                 include
                     cuda_wrappers
                     ..

diff --git 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.1/include
+INCSDIR=	${LIBDIR}/clang/13.0.0/include
 CUDADIR=	${INCSDIR}/cuda_wrappers
 OMPDIR=		${INCSDIR}/openmp_wrappers
 PPCDIR=		${INCSDIR}/ppc_wrappers

diff --git a/lib/clang/include/Plugins/Plugins.def b/lib/clang/include/Plugins/Plugins.def
@@ -38,6 +38,7 @@ LLDB_PLUGIN(ABIX86)
 LLDB_PLUGIN(ArchitectureArm)
 LLDB_PLUGIN(ArchitectureMips)
 LLDB_PLUGIN(ArchitecturePPC64)
+LLDB_PLUGIN(ArchitectureAArch64)
 LLDB_PLUGIN(DisassemblerLLVMC)
 LLDB_PLUGIN(DynamicLoaderPosixDYLD)
 LLDB_PLUGIN(DynamicLoaderStatic)
@@ -60,6 +61,7 @@ LLDB_PLUGIN(ObjectFileELF)
 LLDB_PLUGIN(ObjectFileJIT)
 LLDB_PLUGIN(PlatformFreeBSD)
 LLDB_PLUGIN(PlatformGDB)
+LLDB_PLUGIN(ScriptedProcess)
 LLDB_PLUGIN(ProcessElfCore)
 LLDB_SCRIPT_PLUGIN(ScriptInterpreterNone)
 LLDB_SCRIPT_PLUGIN(ScriptInterpreterLua)

diff --git a/lib/clang/include/VCSVersion.inc b/lib/clang/include/VCSVersion.inc
@@ -1,14 +1,14 @@
 // $FreeBSD$
 
-#define LLVM_REVISION "llvmorg-12.0.1-0-gfed41342a82f"
+#define LLVM_REVISION "llvmorg-13-init-16847-g88e66fa60ae5"
 #define LLVM_REPOSITORY "git@github.com:llvm/llvm-project.git"
 
-#define CLANG_REVISION "llvmorg-12.0.1-0-gfed41342a82f"
+#define CLANG_REVISION "llvmorg-13-init-16847-g88e66fa60ae5"
 #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.1-0-gfed41342a82f-1400002"
+#define LLD_REVISION "llvmorg-13-init-16847-g88e66fa60ae5-1400002"
 #define LLD_REPOSITORY "FreeBSD"
 
-#define LLDB_REVISION "llvmorg-12.0.1-0-gfed41342a82f"
+#define LLDB_REVISION "llvmorg-13-init-16847-g88e66fa60ae5"
 #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
@@ -1,9 +1,9 @@
 /* $FreeBSD$ */
 
-#define	CLANG_VERSION			12.0.1
-#define	CLANG_VERSION_STRING		"12.0.1"
-#define	CLANG_VERSION_MAJOR		12
+#define	CLANG_VERSION			13.0.0
+#define	CLANG_VERSION_STRING		"13.0.0"
+#define	CLANG_VERSION_MAJOR		13
 #define	CLANG_VERSION_MINOR		0
-#define	CLANG_VERSION_PATCHLEVEL	1
+#define	CLANG_VERSION_PATCHLEVEL	0
 
 #define	CLANG_VENDOR			"FreeBSD "
diff --git 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.1"
+#define BACKEND_PACKAGE_STRING "LLVM 13.0.0git"
 
 /* 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
@@ -1,3 +1,3 @@
 // $FreeBSD$
 
-#define LLD_VERSION_STRING "12.0.1"
+#define LLD_VERSION_STRING "13.0.0"
diff --git a/lib/clang/include/llvm/Config/config.h b/lib/clang/include/llvm/Config/config.h
@@ -155,6 +155,9 @@
 #define HAVE_MALLINFO 1
 #endif
 
+/* Define to 1 if you have the `mallinfo2' function. */
+/* #undef HAVE_MALLINFO2 */
+
 /* Define to 1 if you have the <malloc/malloc.h> header file. */
 #if __has_include(<malloc/malloc.h>)
 #define HAVE_MALLOC_MALLOC_H 1
@@ -252,11 +255,6 @@
 #define LLVM_ENABLE_TERMINFO 1
 #endif
 
-/* Define if the xar_open() function is supported this platform. */
-#if defined(__APPLE__)
-#define HAVE_LIBXAR
-#endif
-
 /* Define to 1 if you have the <termios.h> header file. */
 #define HAVE_TERMIOS_H 1
 
@@ -348,7 +346,7 @@
 #define LLVM_VERSION_PRINTER_SHOW_HOST_TARGET_INFO 1
 
 /* Define if libxml2 is supported on this platform. */
-/* #undef LLVM_LIBXML2_ENABLED */
+/* #undef LLVM_ENABLE_LIBXML2 */
 
 /* Define to the extension used for shared libraries, say, ".so". */
 #if defined(__APPLE__)
@@ -357,17 +355,24 @@
 #define LTDL_SHLIB_EXT ".so"
 #endif
 
+/* Define to the extension used for plugin libraries, say, ".so". */
+#if defined(__APPLE__)
+#define LLVM_PLUGIN_EXT ".dylib"
+#else
+#define LLVM_PLUGIN_EXT ".so"
+#endif
+
 /* Define to the address where bug reports for this package should be sent. */
 #define PACKAGE_BUGREPORT "https://bugs.freebsd.org/submit/"
 
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "LLVM"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "LLVM 12.0.1"
+#define PACKAGE_STRING "LLVM 13.0.0git"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "12.0.1"
+#define PACKAGE_VERSION "13.0.0git"
 
 /* Define to the vendor of this package. */
 /* #undef PACKAGE_VENDOR */
@@ -390,11 +395,9 @@
 /* Define to the default GlobalISel coverage file prefix */
 /* #undef LLVM_GISEL_COV_PREFIX */
 
-/* Whether Timers signpost passes in Xcode Instruments */
-#if defined(__APPLE__)
-#define LLVM_SUPPORT_XCODE_SIGNPOSTS 1
-#else
-#define LLVM_SUPPORT_XCODE_SIGNPOSTS 0
-#endif
+/* Define to the default GlobalISel coverage file prefix */
+/* #undef LLVM_GISEL_COV_PREFIX */
+
+/* #undef HAVE_PROC_PID_RUSAGE */
 
 #endif
diff --git a/lib/clang/include/llvm/Config/llvm-config.h b/lib/clang/include/llvm/Config/llvm-config.h
@@ -64,16 +64,16 @@
 #define LLVM_USE_PERF 0
 
 /* Major version of the LLVM API */
-#define LLVM_VERSION_MAJOR 12
+#define LLVM_VERSION_MAJOR 13
 
 /* 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 "12.0.1"
+#define LLVM_VERSION_STRING "13.0.0git"
 
 /* Whether LLVM records statistics for use with GetStatistics(),
  * PrintStatistics() or PrintStatisticsJSON()
@@ -93,6 +93,19 @@
 #define HAVE_SYSEXITS_H 1
 
 /* Define to 1 to enable the experimental new pass manager by default */
-#define LLVM_ENABLE_NEW_PASS_MANAGER 0
+#define LLVM_ENABLE_NEW_PASS_MANAGER 1
+
+/* Define if the xar_open() function is supported on this platform. */
+#if defined(__APPLE__)
+#define LLVM_HAVE_LIBXAR 1
+#endif
+
+/* Whether Timers signpost passes in Xcode Instruments */
+#if defined(__APPLE__)
+#define LLVM_SUPPORT_XCODE_SIGNPOSTS 1
+#else
+#define LLVM_SUPPORT_XCODE_SIGNPOSTS 0
+#endif
+
 
 #endif
diff --git 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.1-0-gfed41342a82f"
+#define LLVM_REVISION "llvmorg-13-init-16847-g88e66fa60ae5"
 #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
@@ -1,4 +1,4 @@
-CLANG_SUBDIR=clang/12.0.1
+CLANG_SUBDIR=clang/13.0.0
 CLANGDIR=	/usr/lib/${CLANG_SUBDIR}
 SANITIZER_LIBDIR=		${CLANGDIR}/lib/freebsd