Bump llvm-project numbers from 17.0.6 to 18.0.0.

DimitryAndric · DimitryAndric · commit a3780eae310e · 2024-02-09T12:47:51.000+01:00
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
diff --git a/etc/mtree/BSD.debug.dist b/etc/mtree/BSD.debug.dist
@@ -28,7 +28,7 @@
             ..
             lib
                 clang
-                    17
+                    18
                         lib
                             freebsd
                             ..
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
@@ -36,7 +36,7 @@
     ..
     lib
         clang
-            17
+            18
                 include
                     cuda_wrappers
                         bits
diff --git a/lib/clang/headers/Makefile b/lib/clang/headers/Makefile
@@ -4,7 +4,7 @@
 .PATH:		${CLANG_SRCS}/lib/Headers
 
 INCSGROUPS+=	INCS
-INCSDIR=	${LIBDIR}/clang/17/include
+INCSDIR=	${LIBDIR}/clang/18/include
 INCS+=		__clang_cuda_builtin_vars.h
 INCS+=		__clang_cuda_cmath.h
 INCS+=		__clang_cuda_complex_builtins.h
@@ -20,7 +20,21 @@ INCS+=		__clang_hip_libdevice_declares.h
 INCS+=		__clang_hip_math.h
 INCS+=		__clang_hip_runtime_wrapper.h
 INCS+=		__clang_hip_stdlib.h
+INCS+=		__stdarg___gnuc_va_list.h
+INCS+=		__stdarg___va_copy.h
+INCS+=		__stdarg_va_arg.h
+INCS+=		__stdarg_va_copy.h
+INCS+=		__stdarg_va_list.h
 INCS+=		__stddef_max_align_t.h
+INCS+=		__stddef_null.h
+INCS+=		__stddef_nullptr_t.h
+INCS+=		__stddef_offsetof.h
+INCS+=		__stddef_ptrdiff_t.h
+INCS+=		__stddef_rsize_t.h
+INCS+=		__stddef_size_t.h
+INCS+=		__stddef_unreachable.h
+INCS+=		__stddef_wchar_t.h
+INCS+=		__stddef_wint_t.h
 INCS+=		__wmmintrin_aes.h
 INCS+=		__wmmintrin_pclmul.h
 INCS+=		adxintrin.h
@@ -101,6 +115,8 @@ INCS+=		immintrin.h
 INCS+=		invpcidintrin.h
 INCS+=		keylockerintrin.h
 INCS+=		larchintrin.h
+INCS+=		lasxintrin.h
+INCS+=		lsxintrin.h
 INCS+=		lwpintrin.h
 INCS+=		lzcntintrin.h
 INCS+=		mm3dnow.h
@@ -123,6 +139,8 @@ INCS+=		ptwriteintrin.h
 INCS+=		raointintrin.h
 INCS+=		rdpruintrin.h
 INCS+=		rdseedintrin.h
+INCS+=		riscv_bitmanip.h
+INCS+=		riscv_crypto.h
 INCS+=		riscv_ntlh.h
 INCS+=		riscv_vector.h
 INCS+=		rtmintrin.h
@@ -135,10 +153,12 @@ INCS+=		sifive_vector.h
 INCS+=		sm3intrin.h
 INCS+=		sm4intrin.h
 INCS+=		smmintrin.h
+INCS+=		stdckdint.h
 INCS+=		tbmintrin.h
 INCS+=		tmmintrin.h
 INCS+=		tsxldtrkintrin.h
 INCS+=		uintrintrin.h
+INCS+=		usermsrintrin.h
 INCS+=		vadefs.h
 INCS+=		vaesintrin.h
 INCS+=		vecintrin.h
@@ -216,6 +236,7 @@ PPC+=		ppc_wrappers/emmintrin.h
 PPC+=		ppc_wrappers/immintrin.h
 PPC+=		ppc_wrappers/mm_malloc.h
 PPC+=		ppc_wrappers/mmintrin.h
+PPC+=		ppc_wrappers/nmmintrin.h
 PPC+=		ppc_wrappers/pmmintrin.h
 PPC+=		ppc_wrappers/smmintrin.h
 PPC+=		ppc_wrappers/tmmintrin.h
@@ -238,6 +259,12 @@ arm_sme_draft_spec_subject_to_change.h: ${CLANG_SRCS}/include/clang/Basic/arm_sm
 	    -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_sme.td
 GENINCS+=	arm_sme_draft_spec_subject_to_change.h
 
+arm_vector_types.h: ${CLANG_SRCS}/include/clang/Basic/arm_sme.td
+	${CLANG_TBLGEN} -gen-arm-vector-type \
+	    -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \
+	    -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_neon.td
+GENINCS+=	arm_vector_types.h
+
 .for hdr in vector/vector-header
 riscv_${hdr:H}.h: ${CLANG_SRCS}/include/clang/Basic/riscv_${hdr:H}.td
 	${CLANG_TBLGEN} -gen-riscv-${hdr:T} \
diff --git a/lib/clang/include/Plugins/Plugins.def b/lib/clang/include/Plugins/Plugins.def
@@ -33,6 +33,7 @@ LLDB_PLUGIN(ABIAArch64)
 LLDB_PLUGIN(ABIARM)
 LLDB_PLUGIN(ABIMips)
 LLDB_PLUGIN(ABIPowerPC)
+LLDB_PLUGIN(ABIRISCV)
 LLDB_PLUGIN(ABIX86)
 LLDB_PLUGIN(ArchitectureArm)
 LLDB_PLUGIN(ArchitectureMips)
@@ -48,6 +49,7 @@ LLDB_PLUGIN(InstructionMIPS64)
 LLDB_PLUGIN(InstructionPPC64)
 LLDB_PLUGIN(InstructionRISCV)
 LLDB_PLUGIN(InstrumentationRuntimeASan)
+LLDB_PLUGIN(InstrumentationRuntimeASanLibsanitizers)
 LLDB_PLUGIN(InstrumentationRuntimeMainThreadChecker)
 LLDB_PLUGIN(InstrumentationRuntimeTSan)
 LLDB_PLUGIN(InstrumentationRuntimeUBSan)
@@ -60,6 +62,7 @@ LLDB_PLUGIN(ObjectFileBreakpad)
 LLDB_PLUGIN(ObjectFileELF)
 LLDB_PLUGIN(PlatformFreeBSD)
 LLDB_PLUGIN(PlatformGDB)
+LLDB_PLUGIN(PlatformQemuUser)
 LLDB_PLUGIN(ScriptedProcess)
 LLDB_PLUGIN(ProcessElfCore)
 LLDB_PLUGIN(ProcessFreeBSDKernel)
@@ -68,6 +71,8 @@ LLDB_SCRIPT_PLUGIN(ScriptInterpreterLua)
 LLDB_PLUGIN(SymbolFileBreakpad)
 LLDB_PLUGIN(SymbolFileDWARF)
 LLDB_PLUGIN(SymbolFileSymtab)
+LLDB_PLUGIN(SymbolLocatorDefault)
+LLDB_PLUGIN(SymbolLocatorDebuginfod)
 LLDB_PLUGIN(SymbolVendorELF)
 LLDB_PLUGIN(TypeSystemClang)
 LLDB_PLUGIN(UnwindAssemblyInstEmulation)
diff --git a/lib/clang/include/VCSVersion.inc b/lib/clang/include/VCSVersion.inc
@@ -1,8 +1,8 @@
-#define LLVM_REVISION "llvmorg-17.0.6-0-g6009708b4367"
+#define LLVM_REVISION "llvmorg-18-init-15088-gd14ee76181fb"
 #define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git"
 
-#define CLANG_REVISION "llvmorg-17.0.6-0-g6009708b4367"
+#define CLANG_REVISION "llvmorg-18-init-15088-gd14ee76181fb"
 #define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git"
 
-#define LLDB_REVISION "llvmorg-17.0.6-0-g6009708b4367"
+#define LLDB_REVISION "llvmorg-18-init-15088-gd14ee76181fb"
 #define LLDB_REPOSITORY "https://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,8 +1,8 @@
-#define	CLANG_VERSION			17.0.6
-#define	CLANG_VERSION_STRING		"17.0.6"
-#define	CLANG_VERSION_MAJOR		17
-#define	CLANG_VERSION_MAJOR_STRING	"17"
+#define	CLANG_VERSION			18.0.0git
+#define	CLANG_VERSION_STRING		"18.0.0git"
+#define	CLANG_VERSION_MAJOR		18
+#define	CLANG_VERSION_MAJOR_STRING	"18"
 #define	CLANG_VERSION_MINOR		0
-#define	CLANG_VERSION_PATCHLEVEL	6
+#define	CLANG_VERSION_PATCHLEVEL	0
 
 #define	CLANG_VENDOR			"FreeBSD "
diff --git a/lib/clang/include/lld/Common/Version.inc b/lib/clang/include/lld/Common/Version.inc
@@ -1,4 +1,4 @@
 // Local identifier in __FreeBSD_version style
 #define LLD_FREEBSD_VERSION 1500000
 
-#define LLD_VERSION_STRING "17.0.6 (FreeBSD llvmorg-17.0.6-0-g6009708b4367-" __XSTRING(LLD_FREEBSD_VERSION) ")"
+#define LLD_VERSION_STRING "18.0.0 (FreeBSD llvmorg-18-init-15088-gd14ee76181fb-" __XSTRING(LLD_FREEBSD_VERSION) ")"
diff --git a/lib/clang/include/lldb/Version/Version.inc b/lib/clang/include/lldb/Version/Version.inc
@@ -1,6 +1,6 @@
-#define LLDB_VERSION 17.0.6
-#define LLDB_VERSION_STRING "17.0.6"
-#define LLDB_VERSION_MAJOR 17
+#define LLDB_VERSION 18.0.0git
+#define LLDB_VERSION_STRING "18.0.0git"
+#define LLDB_VERSION_MAJOR 18
 #define LLDB_VERSION_MINOR 0
-#define LLDB_VERSION_PATCH 6
+#define LLDB_VERSION_PATCH 0
 /* #undef LLDB_FULL_VERSION_STRING */
diff --git a/lib/clang/include/llvm/Config/config.h b/lib/clang/include/llvm/Config/config.h
@@ -344,10 +344,10 @@
 #define PACKAGE_NAME "LLVM"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "LLVM 17.0.6"
+#define PACKAGE_STRING "LLVM 18.0.0git"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "17.0.6"
+#define PACKAGE_VERSION "18.0.0git"
 
 /* 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
@@ -54,6 +54,113 @@
 /* LLVM name for the native target MCA init function, if available */
 /* #undef LLVM_NATIVE_TARGETMCA */
 
+/* Define if the AArch64 target is built in */
+#ifdef LLVM_TARGET_ENABLE_AARCH64
+#define LLVM_HAS_AARCH64_TARGET 1
+#else
+#define LLVM_HAS_AARCH64_TARGET 0
+#endif
+
+/* Define if the AMDGPU target is built in */
+#define LLVM_HAS_AMDGPU_TARGET 0
+
+/* Define if the ARC target is built in */
+#define LLVM_HAS_ARC_TARGET 0
+
+/* Define if the ARM target is built in */
+#ifdef LLVM_TARGET_ENABLE_ARM
+#define LLVM_HAS_ARM_TARGET 1
+#else
+#define LLVM_HAS_ARM_TARGET 0
+#endif
+
+/* Define if the AVR target is built in */
+#define LLVM_HAS_AVR_TARGET 0
+
+/* Define if the BPF target is built in */
+#ifdef LLVM_TARGET_ENABLE_BPF
+#define LLVM_HAS_BPF_TARGET 1
+#else
+#define LLVM_HAS_BPF_TARGET 0
+#endif
+
+/* Define if the CSKY target is built in */
+#define LLVM_HAS_CSKY_TARGET 0
+
+/* Define if the DirectX target is built in */
+#define LLVM_HAS_DIRECTX_TARGET 0
+
+/* Define if the Hexagon target is built in */
+#define LLVM_HAS_HEXAGON_TARGET 0
+
+/* Define if the Lanai target is built in */
+#define LLVM_HAS_LANAI_TARGET 0
+
+/* Define if the LoongArch target is built in */
+#define LLVM_HAS_LOONGARCH_TARGET 0
+
+/* Define if the M68k target is built in */
+#define LLVM_HAS_M68K_TARGET 0
+
+/* Define if the Mips target is built in */
+#ifdef LLVM_TARGET_ENABLE_MIPS
+#define LLVM_HAS_MIPS_TARGET 1
+#else
+#define LLVM_HAS_MIPS_TARGET 0
+#endif
+
+/* Define if the MSP430 target is built in */
+#define LLVM_HAS_MSP430_TARGET 0
+
+/* Define if the NVPTX target is built in */
+#define LLVM_HAS_NVPTX_TARGET 0
+
+/* Define if the PowerPC target is built in */
+#ifdef LLVM_TARGET_ENABLE_POWERPC
+#define LLVM_HAS_POWERPC_TARGET 1
+#else
+#define LLVM_HAS_POWERPC_TARGET 0
+#endif
+
+/* Define if the RISCV target is built in */
+#ifdef LLVM_TARGET_ENABLE_RISCV
+#define LLVM_HAS_RISCV_TARGET 1
+#else
+#define LLVM_HAS_RISCV_TARGET 0
+#endif
+
+/* Define if the Sparc target is built in */
+#ifdef LLVM_TARGET_ENABLE_SPARC
+#define LLVM_HAS_SPARC_TARGET 1
+#else
+#define LLVM_HAS_SPARC_TARGET 0
+#endif
+
+/* Define if the SPIRV target is built in */
+#define LLVM_HAS_SPIRV_TARGET 0
+
+/* Define if the SystemZ target is built in */
+#define LLVM_HAS_SYSTEMZ_TARGET 0
+
+/* Define if the VE target is built in */
+#define LLVM_HAS_VE_TARGET 0
+
+/* Define if the WebAssembly target is built in */
+#define LLVM_HAS_WEBASSEMBLY_TARGET 0
+
+/* Define if the X86 target is built in */
+#ifdef LLVM_TARGET_ENABLE_X86
+#define LLVM_HAS_X86_TARGET 1
+#else
+#define LLVM_HAS_X86_TARGET 0
+#endif
+
+/* Define if the XCore target is built in */
+#define LLVM_HAS_XCORE_TARGET 0
+
+/* Define if the Xtensa target is built in */
+#define LLVM_HAS_XTENSA_TARGET 0
+
 /* Define if this is Unixish platform */
 #define LLVM_ON_UNIX 1
 
@@ -67,16 +174,16 @@
 #define LLVM_USE_PERF 0
 
 /* Major version of the LLVM API */
-#define LLVM_VERSION_MAJOR 17
+#define LLVM_VERSION_MAJOR 18
 
 /* Minor version of the LLVM API */
 #define LLVM_VERSION_MINOR 0
 
 /* Patch version of the LLVM API */
-#define LLVM_VERSION_PATCH 6
+#define LLVM_VERSION_PATCH 0
 
 /* LLVM version string */
-#define LLVM_VERSION_STRING "17.0.6"
+#define LLVM_VERSION_STRING "18.0.0git"
 
 /* Whether LLVM records statistics for use with GetStatistics(),
  * PrintStatistics() or PrintStatisticsJSON()
@@ -98,17 +205,12 @@
 /* Define if zstd compression is available */
 #define LLVM_ENABLE_ZSTD 1
 
-/* Define if LLVM is using tflite instead of libtensorflow */
+/* Define if LLVM is using tflite */
 /* #undef LLVM_HAVE_TFLITE */
 
 /* Define to 1 if you have the <sysexits.h> header file. */
 #define HAVE_SYSEXITS_H 1
 
-/* Define if the xar_open() function is supported on this platform. */
-#if defined(__APPLE__)
-#define LLVM_HAVE_LIBXAR 1
-#endif
-
 /* Define if building libLLVM shared library */
 /* #undef LLVM_BUILD_LLVM_DYLIB */
 
diff --git a/lib/clang/include/llvm/Support/VCSRevision.h b/lib/clang/include/llvm/Support/VCSRevision.h
@@ -1,2 +1,2 @@
-#define LLVM_REVISION "llvmorg-17.0.6-0-g6009708b4367"
+#define LLVM_REVISION "llvmorg-18-init-15088-gd14ee76181fb"
 #define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git"
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc

-Original file line number
+Diff line change
             ..
             lib
                 clang
 -                    17
 +                    18
                         lib
                             freebsd
                             ..