From b74f7bdca8a1e643aac9cfcff9c774b0811a752f Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Thu, 7 Mar 2024 16:57:48 +0100
Subject: [PATCH]   * Fix sanitizer build on 32bit time_t64 architectures.

---
 debian/changelog                          |  5 +++++
 debian/patches/libsanitizer-timebits.diff | 22 ++++++++++++++++++++++
 debian/patches/series                     |  1 +
 3 files changed, 28 insertions(+)
 create mode 100644 debian/patches/libsanitizer-timebits.diff

diff --git a/debian/changelog b/debian/changelog
index d72d23f4..39ca0a9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,11 @@ llvm-toolchain-16 (1:16.0.6-22) unstable; urgency=medium
   [ Gianfranco Costamagna ]
   * Disable tests on mips64el
 
+  [ Matthias Klose ]
+  * Make libclang-common-18-dev architecture dependent, mark profile and xray
+    include files as optional on armel and armhf.
+  * Fix sanitizer build on 32bit time_t64 architectures.
+
  -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 06 Mar 2024 08:38:53 +0100
 
 llvm-toolchain-16 (1:16.0.6-21) unstable; urgency=medium
diff --git a/debian/patches/libsanitizer-timebits.diff b/debian/patches/libsanitizer-timebits.diff
new file mode 100644
index 00000000..f5ee919a
--- /dev/null
+++ b/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.
diff --git a/debian/patches/series b/debian/patches/series
index d8a86985..87ae970c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -155,3 +155,4 @@ D158066-simd-ppc64el.patch
 
 D142688-loong64.diff
 remove-unused-imp-module.diff
+libsanitizer-timebits.diff