diff --git a/compiler-rt/.footprint b/compiler-rt/.footprint
index a36cd7d02..45b514369 100644
--- a/compiler-rt/.footprint
+++ b/compiler-rt/.footprint
@@ -2,20 +2,135 @@ drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/clang/
 drwxr-xr-x	root/root	usr/lib/clang/18/
+drwxr-xr-x	root/root	usr/lib/clang/18/bin/
+-rwxr-xr-x	root/root	usr/lib/clang/18/bin/hwasan_symbolize
 drwxr-xr-x	root/root	usr/lib/clang/18/include/
+drwxr-xr-x	root/root	usr/lib/clang/18/include/fuzzer/
+-rw-r--r--	root/root	usr/lib/clang/18/include/fuzzer/FuzzedDataProvider.h
+drwxr-xr-x	root/root	usr/lib/clang/18/include/orc/
+-rw-r--r--	root/root	usr/lib/clang/18/include/orc/c_api.h
+drwxr-xr-x	root/root	usr/lib/clang/18/include/profile/
+-rw-r--r--	root/root	usr/lib/clang/18/include/profile/InstrProfData.inc
+-rw-r--r--	root/root	usr/lib/clang/18/include/profile/instr_prof_interface.h
 drwxr-xr-x	root/root	usr/lib/clang/18/include/sanitizer/
+-rw-r--r--	root/root	usr/lib/clang/18/include/sanitizer/allocator_interface.h
+-rw-r--r--	root/root	usr/lib/clang/18/include/sanitizer/asan_interface.h
+-rw-r--r--	root/root	usr/lib/clang/18/include/sanitizer/common_interface_defs.h
+-rw-r--r--	root/root	usr/lib/clang/18/include/sanitizer/coverage_interface.h
+-rw-r--r--	root/root	usr/lib/clang/18/include/sanitizer/dfsan_interface.h
+-rw-r--r--	root/root	usr/lib/clang/18/include/sanitizer/hwasan_interface.h
+-rw-r--r--	root/root	usr/lib/clang/18/include/sanitizer/linux_syscall_hooks.h
+-rw-r--r--	root/root	usr/lib/clang/18/include/sanitizer/lsan_interface.h
 -rw-r--r--	root/root	usr/lib/clang/18/include/sanitizer/memprof_interface.h
+-rw-r--r--	root/root	usr/lib/clang/18/include/sanitizer/msan_interface.h
+-rw-r--r--	root/root	usr/lib/clang/18/include/sanitizer/netbsd_syscall_hooks.h
+-rw-r--r--	root/root	usr/lib/clang/18/include/sanitizer/scudo_interface.h
+-rw-r--r--	root/root	usr/lib/clang/18/include/sanitizer/tsan_interface.h
+-rw-r--r--	root/root	usr/lib/clang/18/include/sanitizer/tsan_interface_atomic.h
+-rw-r--r--	root/root	usr/lib/clang/18/include/sanitizer/ubsan_interface.h
+drwxr-xr-x	root/root	usr/lib/clang/18/include/xray/
+-rw-r--r--	root/root	usr/lib/clang/18/include/xray/xray_interface.h
+-rw-r--r--	root/root	usr/lib/clang/18/include/xray/xray_log_interface.h
+-rw-r--r--	root/root	usr/lib/clang/18/include/xray/xray_records.h
 drwxr-xr-x	root/root	usr/lib/clang/18/lib/
 drwxr-xr-x	root/root	usr/lib/clang/18/lib/linux/
 -rw-r--r--	root/root	usr/lib/clang/18/lib/linux/clang_rt.crtbegin-i386.o
 -rw-r--r--	root/root	usr/lib/clang/18/lib/linux/clang_rt.crtbegin-x86_64.o
 -rw-r--r--	root/root	usr/lib/clang/18/lib/linux/clang_rt.crtend-i386.o
 -rw-r--r--	root/root	usr/lib/clang/18/lib/linux/clang_rt.crtend-x86_64.o
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.asan-i386.a
+-rwxr-xr-x	root/root	usr/lib/clang/18/lib/linux/libclang_rt.asan-i386.so
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.asan-preinit-i386.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.asan-preinit-x86_64.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.asan-x86_64.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.asan-x86_64.a.syms
+-rwxr-xr-x	root/root	usr/lib/clang/18/lib/linux/libclang_rt.asan-x86_64.so
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.asan_cxx-i386.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.asan_cxx-x86_64.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.asan_cxx-x86_64.a.syms
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.asan_static-i386.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.asan_static-x86_64.a
 -rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.builtins-i386.a
 -rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.builtins-x86_64.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.cfi-i386.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.cfi-x86_64.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.cfi_diag-i386.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.cfi_diag-x86_64.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.dd-x86_64.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.dfsan-x86_64.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.dfsan-x86_64.a.syms
+-rwxr-xr-x	root/root	usr/lib/clang/18/lib/linux/libclang_rt.dyndd-x86_64.so
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.fuzzer-i386.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.fuzzer-x86_64.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.fuzzer_interceptors-i386.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.fuzzer_interceptors-x86_64.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.fuzzer_no_main-i386.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.fuzzer_no_main-x86_64.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.gwp_asan-i386.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.gwp_asan-x86_64.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.hwasan-preinit-x86_64.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.hwasan-x86_64.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.hwasan-x86_64.a.syms
+-rwxr-xr-x	root/root	usr/lib/clang/18/lib/linux/libclang_rt.hwasan-x86_64.so
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.hwasan_aliases-x86_64.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.hwasan_aliases-x86_64.a.syms
+-rwxr-xr-x	root/root	usr/lib/clang/18/lib/linux/libclang_rt.hwasan_aliases-x86_64.so
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.hwasan_aliases_cxx-x86_64.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.hwasan_aliases_cxx-x86_64.a.syms
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.hwasan_cxx-x86_64.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.hwasan_cxx-x86_64.a.syms
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.lsan-i386.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.lsan-x86_64.a
 -rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.memprof-preinit-x86_64.a
 -rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.memprof-x86_64.a
 -rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.memprof-x86_64.a.syms
 -rwxr-xr-x	root/root	usr/lib/clang/18/lib/linux/libclang_rt.memprof-x86_64.so
 -rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.memprof_cxx-x86_64.a
 -rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.memprof_cxx-x86_64.a.syms
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.msan-x86_64.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.msan-x86_64.a.syms
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.msan_cxx-x86_64.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.msan_cxx-x86_64.a.syms
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.profile-i386.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.profile-x86_64.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.safestack-i386.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.safestack-x86_64.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.scudo_standalone-i386.a
+-rwxr-xr-x	root/root	usr/lib/clang/18/lib/linux/libclang_rt.scudo_standalone-i386.so
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.scudo_standalone-x86_64.a
+-rwxr-xr-x	root/root	usr/lib/clang/18/lib/linux/libclang_rt.scudo_standalone-x86_64.so
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.scudo_standalone_cxx-i386.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.scudo_standalone_cxx-x86_64.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.stats-i386.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.stats-x86_64.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.stats_client-i386.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.stats_client-x86_64.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.tsan-x86_64.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.tsan-x86_64.a.syms
+-rwxr-xr-x	root/root	usr/lib/clang/18/lib/linux/libclang_rt.tsan-x86_64.so
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.tsan_cxx-x86_64.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.tsan_cxx-x86_64.a.syms
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.ubsan_minimal-i386.a
+-rwxr-xr-x	root/root	usr/lib/clang/18/lib/linux/libclang_rt.ubsan_minimal-i386.so
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.ubsan_minimal-x86_64.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.ubsan_minimal-x86_64.a.syms
+-rwxr-xr-x	root/root	usr/lib/clang/18/lib/linux/libclang_rt.ubsan_minimal-x86_64.so
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.ubsan_standalone-i386.a
+-rwxr-xr-x	root/root	usr/lib/clang/18/lib/linux/libclang_rt.ubsan_standalone-i386.so
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.ubsan_standalone-x86_64.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.ubsan_standalone-x86_64.a.syms
+-rwxr-xr-x	root/root	usr/lib/clang/18/lib/linux/libclang_rt.ubsan_standalone-x86_64.so
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.ubsan_standalone_cxx-i386.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.ubsan_standalone_cxx-x86_64.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.ubsan_standalone_cxx-x86_64.a.syms
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.xray-basic-x86_64.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.xray-fdr-x86_64.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.xray-profiling-x86_64.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/libclang_rt.xray-x86_64.a
+-rw-r--r--	root/root	usr/lib/clang/18/lib/linux/liborc_rt-x86_64.a
+drwxr-xr-x	root/root	usr/lib/clang/18/share/
+-rw-r--r--	root/root	usr/lib/clang/18/share/asan_ignorelist.txt
+-rw-r--r--	root/root	usr/lib/clang/18/share/cfi_ignorelist.txt
+-rw-r--r--	root/root	usr/lib/clang/18/share/dfsan_abilist.txt
+-rw-r--r--	root/root	usr/lib/clang/18/share/hwasan_ignorelist.txt
+-rw-r--r--	root/root	usr/lib/clang/18/share/msan_ignorelist.txt
diff --git a/compiler-rt/.signature b/compiler-rt/.signature
index d14910a34..7dda4a905 100644
--- a/compiler-rt/.signature
+++ b/compiler-rt/.signature
@@ -1,7 +1,8 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/f8falKgA20gee+WBA2/mJxvW+YM18KHxR01wHbJhOyq0IUWLqPodvCBtMcmsxTsT57ppGYyfu54ohuxvNpBLw0=
-SHA256 (Pkgfile) = e98efc8dda27e05d20232174edabcb08fe0556625ad0027704ae303ef12e2685
-SHA256 (.footprint) = 2411e6d275537a72920880c86209f2e0103d240ec8217be7e56a6817e6329c55
-SHA256 (compiler-rt-18.1.1.src.tar.xz) = 037b1fbbc6ea90c9ef299caab8a751b435ca6ede2d1972db15b30646636ee057
-SHA256 (llvm-18.1.1.src.tar.xz) = ab0508d02b2d126ceb98035c28638a9d7b1e7fa5ef719396236e72f59a02e1ac
-SHA256 (cmake-18.1.1.src.tar.xz) = 5308023d1c1e9feb264c14f58db35c53061123300a7eb940364f46d574c8b2d6
+RWSE3ohX2g5d/daLEK6XkGV5kJ35JosO0f+ywyp9EfzTFtRKOH+Ja1CSYso16h3fcgOGtaHDdTYwJYRmLPUHFYC9UFSEfJIwyQ0=
+SHA256 (Pkgfile) = 6154e2de258428bf31798e41a098dd2f497281533158f78304a5fb582a4d1b61
+SHA256 (.footprint) = 84bb3f3ad5a657004a0ce908f95855bf5bb77e4bd91a51f90b5f7a6296ca72ab
+SHA256 (compiler-rt-18.1.2.src.tar.xz) = 81b6a9e0bdcf72bc808ad2e5186cf7c84b21ead015884cce95a284ea9a6dab0c
+SHA256 (llvm-18.1.2.src.tar.xz) = 13ef90fa598a239222ecadd64a63d81e4db59813aa5f255cbb5e9d3e0cf927d0
+SHA256 (cmake-18.1.2.src.tar.xz) = b55a1eed9fe9c5d86c9f73c8aabde3e2407e603e737e1555545c3d136655955b
+SHA256 (libsanitizer-timebits.diff) = f88d5c03b835d411cc1b244ea52a5621b089ccd540efb46631b86ef8781e6262
diff --git a/compiler-rt/Pkgfile b/compiler-rt/Pkgfile
index 403fb7b05..e6860ef4a 100644
--- a/compiler-rt/Pkgfile
+++ b/compiler-rt/Pkgfile
@@ -5,33 +5,35 @@
 # Optional: clang
 
 name=compiler-rt
-version=18.1.1
-release=1
+version=18.1.2
+release=2
 source=(https://github.com/llvm/llvm-project/releases/download/llvmorg-$version/compiler-rt-$version.src.tar.xz
 	https://github.com/llvm/llvm-project/releases/download/llvmorg-$version/llvm-$version.src.tar.xz
-	https://github.com/llvm/llvm-project/releases/download/llvmorg-$version/cmake-$version.src.tar.xz)
+	https://github.com/llvm/llvm-project/releases/download/llvmorg-$version/cmake-$version.src.tar.xz
+	libsanitizer-timebits.diff)
 
 build() {
 	mv llvm-$version.src llvm
 	mv cmake-$version.src cmake
 
 	if prt-get isinst clang; then
-		export CC=clang
-		export CXX=clang++
+		if ! /usr/bin/ldd /usr/bin/clang | grep -q -E '.*not found'; then
+			export CC=clang
+			export CXX=clang++
+		fi
 	fi
 
+	patch -Np2 -d $name-$version.src -i $SRC/libsanitizer-timebits.diff
+
 	cmake -S $name-$version.src -B build -G Ninja \
 		-D CMAKE_INSTALL_PREFIX=/usr \
 		-D CMAKE_BUILD_TYPE=Release \
 		-D CMAKE_C_FLAGS_RELEASE="$CFLAGS" \
 		-D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
 		-D COMPILER_RT_INSTALL_PATH=/usr/lib/clang/${version:0:2} \
-		-D COMPILER_RT_BUILD_LIBFUZZER=OFF \
-		-D COMPILER_RT_BUILD_ORC=OFF \
-		-D COMPILER_RT_BUILD_PROFILE=OFF \
-		-D COMPILER_RT_BUILD_SANITIZERS=OFF \
-		-D COMPILER_RT_BUILD_XRAY=OFF \
+		-D Python3_EXECUTABLE=/usr/bin/python3 \
+		-D COMPILER_RT_INCLUDE_TESTS=OFF \
 		-Wno-dev
-	cmake --build build
+	cmake --build build -j ${JOBS:-1}
 	DESTDIR=$PKG cmake --install build
 }
diff --git a/compiler-rt/libsanitizer-timebits.diff b/compiler-rt/libsanitizer-timebits.diff
new file mode 100644
index 000000000..f5ee919ab
--- /dev/null
+++ b/compiler-rt/libsanitizer-timebits.diff
@@ -0,0 +1,22 @@
+# DP: Add another #undef for _TIME_BITS
+
+--- a/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_solaris.cpp
++++ b/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_solaris.cpp
+@@ -11,6 +11,7 @@
+ 
+ // Before Solaris 11.4, <procfs.h> doesn't work in a largefile environment.
+ #undef _FILE_OFFSET_BITS
++#undef _TIME_BITS
+ #include "sanitizer_platform.h"
+ #if SANITIZER_SOLARIS
+ #  include <fcntl.h>
+#--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
+#+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
+#@@ -18,6 +18,7 @@
+# // depends on _FILE_OFFSET_BITS setting.
+# // To get this "true" dirent definition, we undefine _FILE_OFFSET_BITS below.
+# #undef _FILE_OFFSET_BITS
+#+#undef _TIME_BITS
+# #endif
+# 
+# // Must go after undef _FILE_OFFSET_BITS.