git: 770cf0a5f02d - main - Fixups after llvm-project main llvmorg-21-init-19288-gface93e724f4 merge
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 25 Apr 2026 14:19:44 UTC
The branch main has been updated by dim:
URL: https://cgit.FreeBSD.org/src/commit/?id=770cf0a5f02dc8983a89c6568d741fbc25baa999
commit 770cf0a5f02dc8983a89c6568d741fbc25baa999
Author: Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2025-12-09 09:38:16 +0000
Commit: Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2026-04-25 14:11:52 +0000
Fixups after llvm-project main llvmorg-21-init-19288-gface93e724f4 merge
Fix various configuration fails, update generated headers, Makefiles, etc.
PR: 292067
MFC after: 1 month
---
ObsoleteFiles.inc | 418 ++++
.../llvm-project/libcxx/include/__cxx03/__config | 3 +-
.../Clang/ClangExpressionParser.cpp | 2 +
etc/mtree/BSD.debug.dist | 2 +-
etc/mtree/BSD.include.dist | 78 +
etc/mtree/BSD.usr.dist | 2 +-
lib/clang/clang.build.mk | 1 -
lib/clang/headers/Makefile | 44 +-
lib/clang/include/Plugins/Plugins.def | 2 +-
lib/clang/include/VCSVersion.inc | 6 +-
lib/clang/include/clang/Basic/Version.inc | 13 +-
lib/clang/include/clang/Config/config.h | 1 -
lib/clang/include/lld/Common/Version.inc | 2 +-
lib/clang/include/lldb/API/SBLanguages.h | 4 +
lib/clang/include/lldb/Host/Config.h | 6 +-
lib/clang/include/lldb/Version/Version.inc | 10 +-
lib/clang/include/llvm/Config/Targets.h | 118 +
lib/clang/include/llvm/Config/config.h | 69 +-
lib/clang/include/llvm/Config/llvm-config.h | 128 +-
lib/clang/include/llvm/Support/VCSRevision.h | 2 +-
lib/clang/libclang/Makefile | 243 +-
lib/clang/liblldb/LLDBWrapLua.cpp | 2388 +++++++++++++++----
lib/clang/liblldb/Makefile | 71 +-
lib/clang/libllvm/Makefile | 251 +-
lib/clang/libllvmminimal/Makefile | 12 +-
lib/libc++/Makefile | 940 +++++++-
lib/libc++/__assertion_handler | 24 +-
lib/libc++/__config_site | 34 +-
lib/libc++/libcxx.imp | 110 +-
lib/libc++/module.modulemap | 2465 ++++++++++++++++++++
lib/libclang_rt/compiler-rt-vars.mk | 2 +-
tools/build/mk/OptionalObsoleteFiles.inc | 874 +++----
usr.bin/clang/clang-tblgen/Makefile | 1 +
usr.bin/clang/lld/Makefile | 2 +
usr.bin/clang/lldb-server/Makefile | 1 -
usr.bin/clang/llvm-min-tblgen/Makefile | 5 +-
usr.bin/clang/llvm-tblgen/Makefile | 22 +-
37 files changed, 7067 insertions(+), 1289 deletions(-)
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 5bd38141cf71..88a7dd337e79 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -51,6 +51,424 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20260425: new clang import which bumps version from 19 to 21
+OLD_FILES+=usr/lib/clang/19/include/__clang_cuda_builtin_vars.h
+OLD_FILES+=usr/lib/clang/19/include/__clang_cuda_cmath.h
+OLD_FILES+=usr/lib/clang/19/include/__clang_cuda_complex_builtins.h
+OLD_FILES+=usr/lib/clang/19/include/__clang_cuda_device_functions.h
+OLD_FILES+=usr/lib/clang/19/include/__clang_cuda_intrinsics.h
+OLD_FILES+=usr/lib/clang/19/include/__clang_cuda_libdevice_declares.h
+OLD_FILES+=usr/lib/clang/19/include/__clang_cuda_math.h
+OLD_FILES+=usr/lib/clang/19/include/__clang_cuda_math_forward_declares.h
+OLD_FILES+=usr/lib/clang/19/include/__clang_cuda_runtime_wrapper.h
+OLD_FILES+=usr/lib/clang/19/include/__clang_cuda_texture_intrinsics.h
+OLD_FILES+=usr/lib/clang/19/include/__clang_hip_cmath.h
+OLD_FILES+=usr/lib/clang/19/include/__clang_hip_libdevice_declares.h
+OLD_FILES+=usr/lib/clang/19/include/__clang_hip_math.h
+OLD_FILES+=usr/lib/clang/19/include/__clang_hip_runtime_wrapper.h
+OLD_FILES+=usr/lib/clang/19/include/__clang_hip_stdlib.h
+OLD_FILES+=usr/lib/clang/19/include/__stdarg___gnuc_va_list.h
+OLD_FILES+=usr/lib/clang/19/include/__stdarg___va_copy.h
+OLD_FILES+=usr/lib/clang/19/include/__stdarg_header_macro.h
+OLD_FILES+=usr/lib/clang/19/include/__stdarg_va_arg.h
+OLD_FILES+=usr/lib/clang/19/include/__stdarg_va_copy.h
+OLD_FILES+=usr/lib/clang/19/include/__stdarg_va_list.h
+OLD_FILES+=usr/lib/clang/19/include/__stddef_header_macro.h
+OLD_FILES+=usr/lib/clang/19/include/__stddef_max_align_t.h
+OLD_FILES+=usr/lib/clang/19/include/__stddef_null.h
+OLD_FILES+=usr/lib/clang/19/include/__stddef_nullptr_t.h
+OLD_FILES+=usr/lib/clang/19/include/__stddef_offsetof.h
+OLD_FILES+=usr/lib/clang/19/include/__stddef_ptrdiff_t.h
+OLD_FILES+=usr/lib/clang/19/include/__stddef_rsize_t.h
+OLD_FILES+=usr/lib/clang/19/include/__stddef_size_t.h
+OLD_FILES+=usr/lib/clang/19/include/__stddef_unreachable.h
+OLD_FILES+=usr/lib/clang/19/include/__stddef_wchar_t.h
+OLD_FILES+=usr/lib/clang/19/include/__stddef_wint_t.h
+OLD_FILES+=usr/lib/clang/19/include/__wmmintrin_aes.h
+OLD_FILES+=usr/lib/clang/19/include/__wmmintrin_pclmul.h
+OLD_FILES+=usr/lib/clang/19/include/adcintrin.h
+OLD_FILES+=usr/lib/clang/19/include/adxintrin.h
+OLD_FILES+=usr/lib/clang/19/include/altivec.h
+OLD_FILES+=usr/lib/clang/19/include/ammintrin.h
+OLD_FILES+=usr/lib/clang/19/include/amxcomplexintrin.h
+OLD_FILES+=usr/lib/clang/19/include/amxfp16intrin.h
+OLD_FILES+=usr/lib/clang/19/include/amxintrin.h
+OLD_FILES+=usr/lib/clang/19/include/arm64intr.h
+OLD_FILES+=usr/lib/clang/19/include/arm_acle.h
+OLD_FILES+=usr/lib/clang/19/include/arm_bf16.h
+OLD_FILES+=usr/lib/clang/19/include/arm_cde.h
+OLD_FILES+=usr/lib/clang/19/include/arm_cmse.h
+OLD_FILES+=usr/lib/clang/19/include/arm_fp16.h
+OLD_FILES+=usr/lib/clang/19/include/arm_mve.h
+OLD_FILES+=usr/lib/clang/19/include/arm_neon.h
+OLD_FILES+=usr/lib/clang/19/include/arm_neon_sve_bridge.h
+OLD_FILES+=usr/lib/clang/19/include/arm_sme.h
+OLD_FILES+=usr/lib/clang/19/include/arm_sve.h
+OLD_FILES+=usr/lib/clang/19/include/arm_vector_types.h
+OLD_FILES+=usr/lib/clang/19/include/armintr.h
+OLD_FILES+=usr/lib/clang/19/include/avx2intrin.h
+OLD_FILES+=usr/lib/clang/19/include/avx512bf16intrin.h
+OLD_FILES+=usr/lib/clang/19/include/avx512bitalgintrin.h
+OLD_FILES+=usr/lib/clang/19/include/avx512bwintrin.h
+OLD_FILES+=usr/lib/clang/19/include/avx512cdintrin.h
+OLD_FILES+=usr/lib/clang/19/include/avx512dqintrin.h
+OLD_FILES+=usr/lib/clang/19/include/avx512fintrin.h
+OLD_FILES+=usr/lib/clang/19/include/avx512fp16intrin.h
+OLD_FILES+=usr/lib/clang/19/include/avx512ifmaintrin.h
+OLD_FILES+=usr/lib/clang/19/include/avx512ifmavlintrin.h
+OLD_FILES+=usr/lib/clang/19/include/avx512vbmi2intrin.h
+OLD_FILES+=usr/lib/clang/19/include/avx512vbmiintrin.h
+OLD_FILES+=usr/lib/clang/19/include/avx512vbmivlintrin.h
+OLD_FILES+=usr/lib/clang/19/include/avx512vlbf16intrin.h
+OLD_FILES+=usr/lib/clang/19/include/avx512vlbitalgintrin.h
+OLD_FILES+=usr/lib/clang/19/include/avx512vlbwintrin.h
+OLD_FILES+=usr/lib/clang/19/include/avx512vlcdintrin.h
+OLD_FILES+=usr/lib/clang/19/include/avx512vldqintrin.h
+OLD_FILES+=usr/lib/clang/19/include/avx512vlfp16intrin.h
+OLD_FILES+=usr/lib/clang/19/include/avx512vlintrin.h
+OLD_FILES+=usr/lib/clang/19/include/avx512vlvbmi2intrin.h
+OLD_FILES+=usr/lib/clang/19/include/avx512vlvnniintrin.h
+OLD_FILES+=usr/lib/clang/19/include/avx512vlvp2intersectintrin.h
+OLD_FILES+=usr/lib/clang/19/include/avx512vnniintrin.h
+OLD_FILES+=usr/lib/clang/19/include/avx512vp2intersectintrin.h
+OLD_FILES+=usr/lib/clang/19/include/avx512vpopcntdqintrin.h
+OLD_FILES+=usr/lib/clang/19/include/avx512vpopcntdqvlintrin.h
+OLD_FILES+=usr/lib/clang/19/include/avxifmaintrin.h
+OLD_FILES+=usr/lib/clang/19/include/avxintrin.h
+OLD_FILES+=usr/lib/clang/19/include/avxneconvertintrin.h
+OLD_FILES+=usr/lib/clang/19/include/avxvnniint16intrin.h
+OLD_FILES+=usr/lib/clang/19/include/avxvnniint8intrin.h
+OLD_FILES+=usr/lib/clang/19/include/avxvnniintrin.h
+OLD_FILES+=usr/lib/clang/19/include/bmi2intrin.h
+OLD_FILES+=usr/lib/clang/19/include/bmiintrin.h
+OLD_FILES+=usr/lib/clang/19/include/builtins.h
+OLD_FILES+=usr/lib/clang/19/include/cet.h
+OLD_FILES+=usr/lib/clang/19/include/cetintrin.h
+OLD_FILES+=usr/lib/clang/19/include/cldemoteintrin.h
+OLD_FILES+=usr/lib/clang/19/include/clflushoptintrin.h
+OLD_FILES+=usr/lib/clang/19/include/clwbintrin.h
+OLD_FILES+=usr/lib/clang/19/include/clzerointrin.h
+OLD_FILES+=usr/lib/clang/19/include/cmpccxaddintrin.h
+OLD_FILES+=usr/lib/clang/19/include/cpuid.h
+OLD_FILES+=usr/lib/clang/19/include/crc32intrin.h
+OLD_FILES+=usr/lib/clang/19/include/cuda_wrappers/algorithm
+OLD_FILES+=usr/lib/clang/19/include/cuda_wrappers/bits/basic_string.h
+OLD_FILES+=usr/lib/clang/19/include/cuda_wrappers/bits/basic_string.tcc
+OLD_FILES+=usr/lib/clang/19/include/cuda_wrappers/bits/shared_ptr_base.h
+OLD_DIRS+=usr/lib/clang/19/include/cuda_wrappers/bits
+OLD_FILES+=usr/lib/clang/19/include/cuda_wrappers/cmath
+OLD_FILES+=usr/lib/clang/19/include/cuda_wrappers/complex
+OLD_FILES+=usr/lib/clang/19/include/cuda_wrappers/new
+OLD_DIRS+=usr/lib/clang/19/include/cuda_wrappers
+OLD_FILES+=usr/lib/clang/19/include/emmintrin.h
+OLD_FILES+=usr/lib/clang/19/include/enqcmdintrin.h
+OLD_FILES+=usr/lib/clang/19/include/f16cintrin.h
+OLD_FILES+=usr/lib/clang/19/include/float.h
+OLD_FILES+=usr/lib/clang/19/include/fma4intrin.h
+OLD_FILES+=usr/lib/clang/19/include/fmaintrin.h
+OLD_FILES+=usr/lib/clang/19/include/fuzzer/FuzzedDataProvider.h
+OLD_DIRS+=usr/lib/clang/19/include/fuzzer
+OLD_FILES+=usr/lib/clang/19/include/fxsrintrin.h
+OLD_FILES+=usr/lib/clang/19/include/gfniintrin.h
+OLD_FILES+=usr/lib/clang/19/include/hexagon_circ_brev_intrinsics.h
+OLD_FILES+=usr/lib/clang/19/include/hexagon_protos.h
+OLD_FILES+=usr/lib/clang/19/include/hexagon_types.h
+OLD_FILES+=usr/lib/clang/19/include/hlsl/hlsl_basic_types.h
+OLD_FILES+=usr/lib/clang/19/include/hlsl/hlsl_intrinsics.h
+OLD_DIRS+=usr/lib/clang/19/include/hlsl
+OLD_FILES+=usr/lib/clang/19/include/hlsl.h
+OLD_FILES+=usr/lib/clang/19/include/hresetintrin.h
+OLD_FILES+=usr/lib/clang/19/include/htmintrin.h
+OLD_FILES+=usr/lib/clang/19/include/htmxlintrin.h
+OLD_FILES+=usr/lib/clang/19/include/hvx_hexagon_protos.h
+OLD_FILES+=usr/lib/clang/19/include/ia32intrin.h
+OLD_FILES+=usr/lib/clang/19/include/immintrin.h
+OLD_FILES+=usr/lib/clang/19/include/intrin.h
+OLD_FILES+=usr/lib/clang/19/include/intrin0.h
+OLD_FILES+=usr/lib/clang/19/include/inttypes.h
+OLD_FILES+=usr/lib/clang/19/include/invpcidintrin.h
+OLD_FILES+=usr/lib/clang/19/include/iso646.h
+OLD_FILES+=usr/lib/clang/19/include/keylockerintrin.h
+OLD_FILES+=usr/lib/clang/19/include/larchintrin.h
+OLD_FILES+=usr/lib/clang/19/include/lasxintrin.h
+OLD_FILES+=usr/lib/clang/19/include/limits.h
+OLD_FILES+=usr/lib/clang/19/include/lsxintrin.h
+OLD_FILES+=usr/lib/clang/19/include/lwpintrin.h
+OLD_FILES+=usr/lib/clang/19/include/lzcntintrin.h
+OLD_FILES+=usr/lib/clang/19/include/mm3dnow.h
+OLD_FILES+=usr/lib/clang/19/include/mm_malloc.h
+OLD_FILES+=usr/lib/clang/19/include/mmintrin.h
+OLD_FILES+=usr/lib/clang/19/include/module.modulemap
+OLD_FILES+=usr/lib/clang/19/include/movdirintrin.h
+OLD_FILES+=usr/lib/clang/19/include/msa.h
+OLD_FILES+=usr/lib/clang/19/include/mwaitxintrin.h
+OLD_FILES+=usr/lib/clang/19/include/nmmintrin.h
+OLD_FILES+=usr/lib/clang/19/include/omp-tools.h
+OLD_FILES+=usr/lib/clang/19/include/omp.h
+OLD_FILES+=usr/lib/clang/19/include/ompt.h
+OLD_FILES+=usr/lib/clang/19/include/opencl-c-base.h
+OLD_FILES+=usr/lib/clang/19/include/opencl-c.h
+OLD_FILES+=usr/lib/clang/19/include/openmp_wrappers/__clang_openmp_device_functions.h
+OLD_FILES+=usr/lib/clang/19/include/openmp_wrappers/cmath
+OLD_FILES+=usr/lib/clang/19/include/openmp_wrappers/complex
+OLD_FILES+=usr/lib/clang/19/include/openmp_wrappers/complex.h
+OLD_FILES+=usr/lib/clang/19/include/openmp_wrappers/complex_cmath.h
+OLD_FILES+=usr/lib/clang/19/include/openmp_wrappers/math.h
+OLD_FILES+=usr/lib/clang/19/include/openmp_wrappers/new
+OLD_DIRS+=usr/lib/clang/19/include/openmp_wrappers
+OLD_FILES+=usr/lib/clang/19/include/orc_rt/c_api.h
+OLD_DIRS+=usr/lib/clang/19/include/orc_rt
+OLD_FILES+=usr/lib/clang/19/include/pconfigintrin.h
+OLD_FILES+=usr/lib/clang/19/include/pkuintrin.h
+OLD_FILES+=usr/lib/clang/19/include/pmmintrin.h
+OLD_FILES+=usr/lib/clang/19/include/popcntintrin.h
+OLD_FILES+=usr/lib/clang/19/include/ppc_wrappers/bmi2intrin.h
+OLD_FILES+=usr/lib/clang/19/include/ppc_wrappers/bmiintrin.h
+OLD_FILES+=usr/lib/clang/19/include/ppc_wrappers/emmintrin.h
+OLD_FILES+=usr/lib/clang/19/include/ppc_wrappers/immintrin.h
+OLD_FILES+=usr/lib/clang/19/include/ppc_wrappers/mm_malloc.h
+OLD_FILES+=usr/lib/clang/19/include/ppc_wrappers/mmintrin.h
+OLD_FILES+=usr/lib/clang/19/include/ppc_wrappers/nmmintrin.h
+OLD_FILES+=usr/lib/clang/19/include/ppc_wrappers/pmmintrin.h
+OLD_FILES+=usr/lib/clang/19/include/ppc_wrappers/smmintrin.h
+OLD_FILES+=usr/lib/clang/19/include/ppc_wrappers/tmmintrin.h
+OLD_FILES+=usr/lib/clang/19/include/ppc_wrappers/x86gprintrin.h
+OLD_FILES+=usr/lib/clang/19/include/ppc_wrappers/x86intrin.h
+OLD_FILES+=usr/lib/clang/19/include/ppc_wrappers/xmmintrin.h
+OLD_DIRS+=usr/lib/clang/19/include/ppc_wrappers
+OLD_FILES+=usr/lib/clang/19/include/prfchiintrin.h
+OLD_FILES+=usr/lib/clang/19/include/prfchwintrin.h
+OLD_FILES+=usr/lib/clang/19/include/profile/InstrProfData.inc
+OLD_FILES+=usr/lib/clang/19/include/profile/MemProfData.inc
+OLD_DIRS+=usr/lib/clang/19/include/profile
+OLD_FILES+=usr/lib/clang/19/include/ptrauth.h
+OLD_FILES+=usr/lib/clang/19/include/ptwriteintrin.h
+OLD_FILES+=usr/lib/clang/19/include/raointintrin.h
+OLD_FILES+=usr/lib/clang/19/include/rdpruintrin.h
+OLD_FILES+=usr/lib/clang/19/include/rdseedintrin.h
+OLD_FILES+=usr/lib/clang/19/include/riscv_bitmanip.h
+OLD_FILES+=usr/lib/clang/19/include/riscv_crypto.h
+OLD_FILES+=usr/lib/clang/19/include/riscv_ntlh.h
+OLD_FILES+=usr/lib/clang/19/include/riscv_vector.h
+OLD_FILES+=usr/lib/clang/19/include/rtmintrin.h
+OLD_FILES+=usr/lib/clang/19/include/s390intrin.h
+OLD_FILES+=usr/lib/clang/19/include/sanitizer/allocator_interface.h
+OLD_FILES+=usr/lib/clang/19/include/sanitizer/asan_interface.h
+OLD_FILES+=usr/lib/clang/19/include/sanitizer/common_interface_defs.h
+OLD_FILES+=usr/lib/clang/19/include/sanitizer/coverage_interface.h
+OLD_FILES+=usr/lib/clang/19/include/sanitizer/dfsan_interface.h
+OLD_FILES+=usr/lib/clang/19/include/sanitizer/hwasan_interface.h
+OLD_FILES+=usr/lib/clang/19/include/sanitizer/linux_syscall_hooks.h
+OLD_FILES+=usr/lib/clang/19/include/sanitizer/lsan_interface.h
+OLD_FILES+=usr/lib/clang/19/include/sanitizer/memprof_interface.h
+OLD_FILES+=usr/lib/clang/19/include/sanitizer/msan_interface.h
+OLD_FILES+=usr/lib/clang/19/include/sanitizer/netbsd_syscall_hooks.h
+OLD_FILES+=usr/lib/clang/19/include/sanitizer/scudo_interface.h
+OLD_FILES+=usr/lib/clang/19/include/sanitizer/tsan_interface.h
+OLD_FILES+=usr/lib/clang/19/include/sanitizer/tsan_interface_atomic.h
+OLD_FILES+=usr/lib/clang/19/include/sanitizer/ubsan_interface.h
+OLD_DIRS+=usr/lib/clang/19/include/sanitizer
+OLD_FILES+=usr/lib/clang/19/include/serializeintrin.h
+OLD_FILES+=usr/lib/clang/19/include/sgxintrin.h
+OLD_FILES+=usr/lib/clang/19/include/sha512intrin.h
+OLD_FILES+=usr/lib/clang/19/include/shaintrin.h
+OLD_FILES+=usr/lib/clang/19/include/sifive_vector.h
+OLD_FILES+=usr/lib/clang/19/include/sm3intrin.h
+OLD_FILES+=usr/lib/clang/19/include/sm4intrin.h
+OLD_FILES+=usr/lib/clang/19/include/smmintrin.h
+OLD_FILES+=usr/lib/clang/19/include/stdalign.h
+OLD_FILES+=usr/lib/clang/19/include/stdarg.h
+OLD_FILES+=usr/lib/clang/19/include/stdatomic.h
+OLD_FILES+=usr/lib/clang/19/include/stdbool.h
+OLD_FILES+=usr/lib/clang/19/include/stdckdint.h
+OLD_FILES+=usr/lib/clang/19/include/stddef.h
+OLD_FILES+=usr/lib/clang/19/include/stdint.h
+OLD_FILES+=usr/lib/clang/19/include/stdnoreturn.h
+OLD_FILES+=usr/lib/clang/19/include/tbmintrin.h
+OLD_FILES+=usr/lib/clang/19/include/tgmath.h
+OLD_FILES+=usr/lib/clang/19/include/tmmintrin.h
+OLD_FILES+=usr/lib/clang/19/include/tsxldtrkintrin.h
+OLD_FILES+=usr/lib/clang/19/include/uintrintrin.h
+OLD_FILES+=usr/lib/clang/19/include/unwind.h
+OLD_FILES+=usr/lib/clang/19/include/usermsrintrin.h
+OLD_FILES+=usr/lib/clang/19/include/vadefs.h
+OLD_FILES+=usr/lib/clang/19/include/vaesintrin.h
+OLD_FILES+=usr/lib/clang/19/include/varargs.h
+OLD_FILES+=usr/lib/clang/19/include/vecintrin.h
+OLD_FILES+=usr/lib/clang/19/include/velintrin.h
+OLD_FILES+=usr/lib/clang/19/include/velintrin_approx.h
+OLD_FILES+=usr/lib/clang/19/include/velintrin_gen.h
+OLD_FILES+=usr/lib/clang/19/include/vpclmulqdqintrin.h
+OLD_FILES+=usr/lib/clang/19/include/waitpkgintrin.h
+OLD_FILES+=usr/lib/clang/19/include/wasm_simd128.h
+OLD_FILES+=usr/lib/clang/19/include/wbnoinvdintrin.h
+OLD_FILES+=usr/lib/clang/19/include/wmmintrin.h
+OLD_FILES+=usr/lib/clang/19/include/x86gprintrin.h
+OLD_FILES+=usr/lib/clang/19/include/x86intrin.h
+OLD_FILES+=usr/lib/clang/19/include/xmmintrin.h
+OLD_FILES+=usr/lib/clang/19/include/xopintrin.h
+OLD_FILES+=usr/lib/clang/19/include/xray/xray_interface.h
+OLD_FILES+=usr/lib/clang/19/include/xray/xray_log_interface.h
+OLD_FILES+=usr/lib/clang/19/include/xray/xray_records.h
+OLD_DIRS+=usr/lib/clang/19/include/xray
+OLD_FILES+=usr/lib/clang/19/include/xsavecintrin.h
+OLD_FILES+=usr/lib/clang/19/include/xsaveintrin.h
+OLD_FILES+=usr/lib/clang/19/include/xsaveoptintrin.h
+OLD_FILES+=usr/lib/clang/19/include/xsavesintrin.h
+OLD_FILES+=usr/lib/clang/19/include/xtestintrin.h
+OLD_FILES+=usr/lib/clang/19/include/yvals_core.h
+OLD_DIRS+=usr/lib/clang/19/include
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.asan-aarch64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.asan-aarch64.so
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.asan-arm.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.asan-arm.so
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.asan-armhf.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.asan-armhf.so
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.asan-i386.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.asan-i386.so
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.asan-powerpc64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.asan-powerpc64.so
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.asan-powerpc64le.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.asan-powerpc64le.so
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.asan-preinit-arm.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.asan-preinit-armhf.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.asan-preinit-i386.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.asan-preinit-powerpc64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.asan-preinit-powerpc64le.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.asan-preinit-riscv64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.asan-riscv64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.asan-riscv64.so
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.asan-x86_64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.asan-x86_64.so
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.asan_cxx-arm.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.asan_cxx-armhf.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.asan_cxx-i386.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.asan_cxx-powerpc64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.asan_cxx-powerpc64le.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.asan_cxx-riscv64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.asan_static-aarch64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.asan_static-i386.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.asan_static-powerpc64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.asan_static-powerpc64le.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.asan_static-x86_64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.cfi-aarch64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.cfi-arm.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.cfi-armhf.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.cfi-i386.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.cfi-x86_64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.cfi_diag-arm.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.cfi_diag-armhf.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.cfi_diag-i386.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.dd-aarch64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.dd-x86_64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.fuzzer-aarch64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.fuzzer-x86_64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.fuzzer_interceptors-aarch64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.fuzzer_interceptors-x86_64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.msan-aarch64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.msan-powerpc64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.msan-powerpc64le.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.msan-x86_64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.msan_cxx-powerpc64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.msan_cxx-powerpc64le.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.profile-aarch64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.profile-arm.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.profile-armhf.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.profile-i386.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.profile-powerpc.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.profile-powerpc64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.profile-powerpc64le.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.profile-riscv64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.profile-x86_64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.safestack-aarch64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.safestack-i386.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.safestack-x86_64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.stats-aarch64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.stats-arm.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.stats-armhf.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.stats-i386.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.stats-powerpc64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.stats-powerpc64le.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.stats-riscv64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.stats-x86_64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.stats_client-aarch64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.stats_client-arm.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.stats_client-armhf.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.stats_client-i386.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.stats_client-powerpc64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.stats_client-powerpc64le.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.stats_client-riscv64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.stats_client-x86_64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.tsan-aarch64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.tsan-powerpc64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.tsan-powerpc64le.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.tsan-x86_64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.tsan_cxx-powerpc64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.tsan_cxx-powerpc64le.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.ubsan_minimal-powerpc64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.ubsan_minimal-powerpc64le.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.ubsan_minimal-riscv64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.ubsan_standalone-powerpc64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.ubsan_standalone-powerpc64le.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.ubsan_standalone-riscv64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.ubsan_standalone_cxx-powerpc64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.ubsan_standalone_cxx-powerpc64le.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.ubsan_standalone_cxx-riscv64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.xray-aarch64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.xray-arm.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.xray-armhf.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.xray-basic-aarch64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.xray-basic-arm.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.xray-basic-armhf.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.xray-basic-powerpc64le.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.xray-basic-x86_64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.xray-fdr-arm.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.xray-fdr-armhf.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.xray-fdr-powerpc64le.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.xray-powerpc64le.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.xray-profiling-arm.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.xray-profiling-armhf.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.xray-profiling-powerpc64le.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
+OLD_FILES+=usr/lib/clang/19/lib/freebsd/libclang_rt.xray-x86_64.a
+OLD_DIRS+=usr/lib/clang/19/lib/freebsd
+OLD_DIRS+=usr/lib/clang/19/lib
+OLD_FILES+=usr/lib/clang/19/share/asan_ignorelist.txt
+OLD_FILES+=usr/lib/clang/19/share/cfi_ignorelist.txt
+OLD_FILES+=usr/lib/clang/19/share/msan_ignorelist.txt
+OLD_DIRS+=usr/lib/clang/19/share
+OLD_DIRS+=usr/lib/clang/19
+
# 20260420: remove perfmon
OLD_FILES+=boot/kernel/perfmon.ko
OLD_FILES+=usr/share/man/man4/perfmon.4.gz
diff --git a/contrib/llvm-project/libcxx/include/__cxx03/__config b/contrib/llvm-project/libcxx/include/__cxx03/__config
index ef47327d9635..535c2f26d01c 100644
--- a/contrib/llvm-project/libcxx/include/__cxx03/__config
+++ b/contrib/llvm-project/libcxx/include/__cxx03/__config
@@ -404,7 +404,8 @@ typedef __char32_t char32_t;
# define _LIBCPP_TEMPLATE_VIS
# endif
-# if !defined(_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS) && __has_attribute(__type_visibility__)
+# if !defined(_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS) && __has_attribute(__type_visibility__) && \
+ _LIBCPP_CLANG_VER >= 1500 // FreeBSD customization
# define _LIBCPP_TYPE_VISIBILITY_DEFAULT __attribute__((__type_visibility__("default")))
# else
# define _LIBCPP_TYPE_VISIBILITY_DEFAULT
diff --git a/contrib/llvm-project/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp b/contrib/llvm-project/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp
index 3995bc002cfe..3fab768b7cc2 100644
--- a/contrib/llvm-project/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp
+++ b/contrib/llvm-project/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp
@@ -94,7 +94,9 @@
#include "lldb/Utility/StringList.h"
#include "Plugins/LanguageRuntime/ObjC/ObjCLanguageRuntime.h"
+#ifdef LLDB_ENABLE_ALL
#include "Plugins/Platform/MacOSX/PlatformDarwin.h"
+#endif // LLDB_ENABLE_ALL
#include "lldb/Utility/XcodeSDK.h"
#include <cctype>
diff --git a/etc/mtree/BSD.debug.dist b/etc/mtree/BSD.debug.dist
index 8c333be48201..b12f402126f1 100644
--- a/etc/mtree/BSD.debug.dist
+++ b/etc/mtree/BSD.debug.dist
@@ -30,7 +30,7 @@
..
lib
clang
- 19
+ 21
lib
freebsd
..
diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
index 97f2194a3fa1..ce37d803c2a9 100644
--- a/etc/mtree/BSD.include.dist
+++ b/etc/mtree/BSD.include.dist
@@ -19,6 +19,8 @@
__algorithm
..
__atomic
+ support
+ ..
..
__bit
..
@@ -36,6 +38,70 @@
..
__coroutine
..
+ __cstddef
+ ..
+ __cxx03
+ __algorithm
+ ..
+ __atomic
+ ..
+ __bit
+ ..
+ __chrono
+ ..
+ __condition_variable
+ ..
+ __configuration
+ ..
+ __debug_utils
+ ..
+ __exception
+ ..
+ __functional
+ ..
+ __fwd
+ ..
+ __ios
+ ..
+ __iterator
+ ..
+ __locale_dir
+ locale_base_api
+ ..
+ ..
+ __math
+ ..
+ __memory
+ ..
+ __mutex
+ ..
+ __numeric
+ ..
+ __ostream
+ ..
+ __random
+ ..
+ __string
+ ..
+ __system_error
+ ..
+ __thread
+ support
+ ..
+ ..
+ __tuple
+ ..
+ __type_traits
+ ..
+ __utility
+ ..
+ __variant
+ ..
+ experimental
+ ..
+ ext
+ ..
+ ..
__debug_utils
..
__exception
@@ -44,6 +110,10 @@
..
__filesystem
..
+ __flat_map
+ ..
+ __flat_set
+ ..
__format
..
__functional
@@ -57,6 +127,10 @@
__locale_dir
locale_base_api
..
+ support
+ no_locale
+ ..
+ ..
..
__math
..
@@ -68,6 +142,8 @@
..
__mutex
..
+ __new
+ ..
__numeric
..
__ostream
@@ -100,6 +176,8 @@
..
__variant
..
+ __vector
+ ..
experimental
__simd
..
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index 120b961d230c..d580cbceb062 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -42,7 +42,7 @@
..
lib
clang
- 19
+ 21
include
cuda_wrappers
bits
diff --git a/lib/clang/clang.build.mk b/lib/clang/clang.build.mk
index 6949e391a1fa..571a35f5a0ec 100644
--- a/lib/clang/clang.build.mk
+++ b/lib/clang/clang.build.mk
@@ -8,7 +8,6 @@
CFLAGS+= -I${CLANG_SRCS}/include
.if ${MK_CLANG_FULL} != "no"
-CFLAGS+= -DCLANG_ENABLE_ARCMT
CFLAGS+= -DCLANG_ENABLE_STATIC_ANALYZER
.endif
diff --git a/lib/clang/headers/Makefile b/lib/clang/headers/Makefile
index 6e9a4b6d3020..b37ebdd9db41 100644
--- a/lib/clang/headers/Makefile
+++ b/lib/clang/headers/Makefile
@@ -4,7 +4,7 @@
.PATH: ${CLANG_SRCS}/lib/Headers
INCSGROUPS+= INCS
-INCSDIR= ${LIBDIR}/clang/19/include
+INCSDIR= ${LIBDIR}/clang/21/include
INCS+= __clang_cuda_builtin_vars.h
INCS+= __clang_cuda_cmath.h
INCS+= __clang_cuda_complex_builtins.h
@@ -20,6 +20,7 @@ INCS+= __clang_hip_libdevice_declares.h
INCS+= __clang_hip_math.h
INCS+= __clang_hip_runtime_wrapper.h
INCS+= __clang_hip_stdlib.h
+INCS+= __clang_spirv_builtins.h
INCS+= __stdarg___gnuc_va_list.h
INCS+= __stdarg___va_copy.h
INCS+= __stdarg_header_macro.h
@@ -42,15 +43,40 @@ INCS+= __wmmintrin_pclmul.h
INCS+= adcintrin.h
INCS+= adxintrin.h
INCS+= altivec.h
+INCS+= amdgpuintrin.h
INCS+= ammintrin.h
+INCS+= amxavx512intrin.h
+INCS+= amxbf16transposeintrin.h
INCS+= amxcomplexintrin.h
+INCS+= amxcomplextransposeintrin.h
INCS+= amxfp16intrin.h
+INCS+= amxfp16transposeintrin.h
+INCS+= amxfp8intrin.h
INCS+= amxintrin.h
+INCS+= amxmovrsintrin.h
+INCS+= amxmovrstransposeintrin.h
+INCS+= amxtf32intrin.h
+INCS+= amxtf32transposeintrin.h
+INCS+= amxtransposeintrin.h
+INCS+= andes_vector.h
INCS+= arm64intr.h
INCS+= arm_acle.h
INCS+= arm_cmse.h
INCS+= arm_neon_sve_bridge.h
INCS+= armintr.h
+INCS+= avx10_2_512bf16intrin.h
+INCS+= avx10_2_512convertintrin.h
+INCS+= avx10_2_512minmaxintrin.h
+INCS+= avx10_2_512niintrin.h
+INCS+= avx10_2_512satcvtdsintrin.h
+INCS+= avx10_2_512satcvtintrin.h
+INCS+= avx10_2bf16intrin.h
+INCS+= avx10_2convertintrin.h
+INCS+= avx10_2copyintrin.h
+INCS+= avx10_2minmaxintrin.h
+INCS+= avx10_2niintrin.h
+INCS+= avx10_2satcvtdsintrin.h
+INCS+= avx10_2satcvtintrin.h
INCS+= avx2intrin.h
INCS+= avx512bf16intrin.h
INCS+= avx512bitalgintrin.h
@@ -103,6 +129,7 @@ INCS+= fma4intrin.h
INCS+= fmaintrin.h
INCS+= fxsrintrin.h
INCS+= gfniintrin.h
+INCS+= gpuintrin.h
INCS+= hexagon_circ_brev_intrinsics.h
INCS+= hexagon_protos.h
INCS+= hexagon_types.h
@@ -125,9 +152,13 @@ INCS+= mm_malloc.h
INCS+= mmintrin.h
INCS+= module.modulemap
INCS+= movdirintrin.h
+INCS+= movrs_avx10_2_512intrin.h
+INCS+= movrs_avx10_2intrin.h
+INCS+= movrsintrin.h
INCS+= msa.h
INCS+= mwaitxintrin.h
INCS+= nmmintrin.h
+INCS+= nvptxintrin.h
INCS+= opencl-c-base.h
INCS+= opencl-c.h
INCS+= pconfigintrin.h
@@ -142,6 +173,7 @@ INCS+= raointintrin.h
INCS+= rdpruintrin.h
INCS+= rdseedintrin.h
INCS+= riscv_bitmanip.h
+INCS+= riscv_corev_alu.h
INCS+= riscv_crypto.h
INCS+= riscv_ntlh.h
INCS+= rtmintrin.h
@@ -152,9 +184,11 @@ INCS+= sha512intrin.h
INCS+= shaintrin.h
INCS+= sifive_vector.h
INCS+= sm3intrin.h
+INCS+= sm4evexintrin.h
INCS+= sm4intrin.h
INCS+= smmintrin.h
INCS+= stdckdint.h
+INCS+= stdcountof.h
INCS+= tbmintrin.h
INCS+= tmmintrin.h
INCS+= tsxldtrkintrin.h
@@ -214,12 +248,18 @@ INCSGROUPS+= CUDB
CUDBDIR= ${INCSDIR}/cuda_wrappers/bits
CUDB+= cuda_wrappers/bits/basic_string.h
CUDB+= cuda_wrappers/bits/basic_string.tcc
+CUDB+= cuda_wrappers/bits/c++config.h
CUDB+= cuda_wrappers/bits/shared_ptr_base.h
INCSGROUPS+= HLSL
HLSLDIR= ${INCSDIR}/hlsl
+HLSL+= hlsl/hlsl_alias_intrinsics.h
HLSL+= hlsl/hlsl_basic_types.h
+HLSL+= hlsl/hlsl_compat_overloads.h
+HLSL+= hlsl/hlsl_detail.h
+HLSL+= hlsl/hlsl_intrinsic_helpers.h
HLSL+= hlsl/hlsl_intrinsics.h
+HLSL+= hlsl/hlsl_spirv.h
INCSGROUPS+= OMP
OMPDIR= ${INCSDIR}/openmp_wrappers
@@ -230,6 +270,8 @@ OMP+= openmp_wrappers/complex.h
OMP+= openmp_wrappers/complex_cmath.h
OMP+= openmp_wrappers/math.h
OMP+= openmp_wrappers/new
+OMP+= openmp_wrappers/stdlib.h
+OMP+= openmp_wrappers/time.h
INCSGROUPS+= PPC
PPCDIR= ${INCSDIR}/ppc_wrappers
diff --git a/lib/clang/include/Plugins/Plugins.def b/lib/clang/include/Plugins/Plugins.def
index 272e1f3aa5ee..39908bf20b85 100644
--- a/lib/clang/include/Plugins/Plugins.def
+++ b/lib/clang/include/Plugins/Plugins.def
@@ -72,8 +72,8 @@ LLDB_SCRIPT_PLUGIN(ScriptInterpreterLua)
LLDB_PLUGIN(SymbolFileBreakpad)
LLDB_PLUGIN(SymbolFileDWARF)
LLDB_PLUGIN(SymbolFileSymtab)
-LLDB_PLUGIN(SymbolLocatorDefault)
LLDB_PLUGIN(SymbolLocatorDebuginfod)
+LLDB_PLUGIN(SymbolLocatorDefault)
LLDB_PLUGIN(SymbolVendorELF)
LLDB_PLUGIN(TypeSystemClang)
LLDB_PLUGIN(UnwindAssemblyInstEmulation)
diff --git a/lib/clang/include/VCSVersion.inc b/lib/clang/include/VCSVersion.inc
index a18ba351aaab..6d19824e75e7 100644
--- a/lib/clang/include/VCSVersion.inc
+++ b/lib/clang/include/VCSVersion.inc
@@ -1,8 +1,8 @@
-#define LLVM_REVISION "llvmorg-19.1.7-0-gcd708029e0b2"
+#define LLVM_REVISION "llvmorg-21-init-19288-gface93e724f4"
#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git"
-#define CLANG_REVISION "llvmorg-19.1.7-0-gcd708029e0b2"
+#define CLANG_REVISION "llvmorg-21-init-19288-gface93e724f4"
#define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git"
-#define LLDB_REVISION "llvmorg-19.1.7-0-gcd708029e0b2"
+#define LLDB_REVISION "llvmorg-21-init-19288-gface93e724f4"
#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
index 92e55f9316cf..2f9b09d2f59c 100644
--- a/lib/clang/include/clang/Basic/Version.inc
+++ b/lib/clang/include/clang/Basic/Version.inc
@@ -1,8 +1,9 @@
-#define CLANG_VERSION 19.1.7
-#define CLANG_VERSION_STRING "19.1.7"
-#define CLANG_VERSION_MAJOR 19
-#define CLANG_VERSION_MAJOR_STRING "19"
-#define CLANG_VERSION_MINOR 1
-#define CLANG_VERSION_PATCHLEVEL 7
+#define CLANG_VERSION 21.0.0git
+#define CLANG_VERSION_STRING "21.0.0git"
+#define CLANG_VERSION_MAJOR 21
+#define CLANG_VERSION_MAJOR_STRING "21"
+#define CLANG_VERSION_MINOR 0
+#define CLANG_VERSION_PATCHLEVEL 0
+#define MAX_CLANG_ABI_COMPAT_VERSION 21
#define CLANG_VENDOR "FreeBSD "
diff --git a/lib/clang/include/clang/Config/config.h b/lib/clang/include/clang/Config/config.h
index 4895c820620c..64ee8fd0d3e7 100644
--- a/lib/clang/include/clang/Config/config.h
+++ b/lib/clang/include/clang/Config/config.h
@@ -76,7 +76,6 @@
#define PPC_LINUX_DEFAULT_IEEELONGDOUBLE 0
/* Enable each functionality of modules */
-/* #undef CLANG_ENABLE_ARCMT */
/* #undef CLANG_ENABLE_OBJC_REWRITER */
/* #undef CLANG_ENABLE_STATIC_ANALYZER */
diff --git a/lib/clang/include/lld/Common/Version.inc b/lib/clang/include/lld/Common/Version.inc
index 0def3da7469c..ce423b4acfc9 100644
--- 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 1600000
-#define LLD_VERSION_STRING "19.1.7 (FreeBSD llvmorg-19.1.7-0-gcd708029e0b2-" __XSTRING(LLD_FREEBSD_VERSION) ")"
+#define LLD_VERSION_STRING "21.0.0 (FreeBSD llvmorg-21-init-19288-gface93e724f4-" __XSTRING(LLD_FREEBSD_VERSION) ")"
diff --git a/lib/clang/include/lldb/API/SBLanguages.h b/lib/clang/include/lldb/API/SBLanguages.h
index 115dd4145b42..9f1a921ae456 100644
--- a/lib/clang/include/lldb/API/SBLanguages.h
+++ b/lib/clang/include/lldb/API/SBLanguages.h
@@ -9,6 +9,8 @@
#ifndef LLDB_API_SBLANGUAGE_H
#define LLDB_API_SBLANGUAGE_H
+#include <cstdint>
+
namespace lldb {
/// Used by \ref SBExpressionOptions.
/// These enumerations use the same language enumerations as the DWARF
@@ -94,6 +96,8 @@ enum SBSourceLanguageName : uint16_t {
eLanguageNameMove = 0x0027,
/// Hylo.
eLanguageNameHylo = 0x0028,
+ /// Metal.
+ eLanguageNameMetal = 0x002c,
};
} // namespace lldb
diff --git a/lib/clang/include/lldb/Host/Config.h b/lib/clang/include/lldb/Host/Config.h
index 20783dd62c39..4d573ec41acd 100644
--- a/lib/clang/include/lldb/Host/Config.h
+++ b/lib/clang/include/lldb/Host/Config.h
@@ -23,9 +23,7 @@
#define HAVE_NR_PROCESS_VM_READV 0
-#ifndef HAVE_LIBCOMPRESSION
-/* #undef HAVE_LIBCOMPRESSION */
-#endif
+#define HAVE_LIBCOMPRESSION 0
#define LLDB_ENABLE_POSIX 1
@@ -33,6 +31,8 @@
#define LLDB_ENABLE_LZMA 1
+#define LLVM_ENABLE_CURL 0
+
#define LLDB_ENABLE_CURSES 1
#define CURSES_HAVE_NCURSES_CURSES_H 0
diff --git a/lib/clang/include/lldb/Version/Version.inc b/lib/clang/include/lldb/Version/Version.inc
index 02d44970ff54..189498011837 100644
--- a/lib/clang/include/lldb/Version/Version.inc
+++ b/lib/clang/include/lldb/Version/Version.inc
@@ -1,6 +1,6 @@
-#define LLDB_VERSION 19.1.7
-#define LLDB_VERSION_STRING "19.1.7"
-#define LLDB_VERSION_MAJOR 19
-#define LLDB_VERSION_MINOR 1
-#define LLDB_VERSION_PATCH 7
+#define LLDB_VERSION 21.0.0git
+#define LLDB_VERSION_STRING "21.0.0git"
+#define LLDB_VERSION_MAJOR 21
+#define LLDB_VERSION_MINOR 0
+#define LLDB_VERSION_PATCH 0
/* #undef LLDB_FULL_VERSION_STRING */
diff --git a/lib/clang/include/llvm/Config/Targets.h b/lib/clang/include/llvm/Config/Targets.h
new file mode 100644
index 000000000000..ce9bffebe10f
--- /dev/null
+++ b/lib/clang/include/llvm/Config/Targets.h
@@ -0,0 +1,118 @@
+/*===------- llvm/Config/Targets.h - LLVM target checks -----------*- C -*-===*/
+/* */
+/* Part of the LLVM Project, under the Apache License v2.0 with LLVM */
+/* Exceptions. */
+/* See https://llvm.org/LICENSE.txt for license information. */
+/* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception */
+/* */
+/*===----------------------------------------------------------------------===*/
+
+/* This file enables clients to know whether specific targets are enabled. */
+
+#ifndef LLVM_CONFIG_TARGETS_H
+#define LLVM_CONFIG_TARGETS_H
+
+/* 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
*** 11511 LINES SKIPPED ***