Merge remote-tracking branch 'origin/17' into 17

debian/changelog

@@ -2,8 +2,15 @@ llvm-toolchain-17 (1:17.0.6-8) unstable; urgency=medium
 
   [ Matthias Klose ]
   * Make libclang-common-17-dev architecture dependent.
+<<<<<<< HEAD
 
  -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 08 Mar 2024 15:52:58 +0100
+=======
+  * Fix sanitizer build on 32bit time_t64 architectures.
+  * Enable compiler-rt runtime again for 32bit time_t64 architectures.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 08 Mar 2024 14:52:29 +0100
+>>>>>>> origin/17
 
 llvm-toolchain-17 (1:17.0.6-7) unstable; urgency=medium
 

debian/patches/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.

debian/patches/series

@@ -152,3 +152,4 @@ libclang-major-version-only.diff
 D148945-revert.diff
 arm32-defaults.diff
 mips/D154390-pre-R6.diff
+libsanitizer-timebits.diff