From 3d4b64df99fd699eb653af597553ff661f0dff1d Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Mon, 11 Mar 2024 22:49:01 +0100 Subject: [PATCH] Uncomment part of sanitizer patch, from --- debian/changelog | 7 +++++++ debian/patches/libsanitizer-timebits.diff | 20 ++++++++++---------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6eae0ba1..a6098d29 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-16 (1:16.0.6-23) unstable; urgency=medium + + [ Matthias Klose ] + * Fix sanitizer build on 32bit time_t64 architectures. + + -- Gianfranco Costamagna Mon, 11 Mar 2024 22:48:48 +0100 + llvm-toolchain-16 (1:16.0.6-22) unstable; urgency=medium [ Gianfranco Costamagna ] diff --git a/debian/patches/libsanitizer-timebits.diff b/debian/patches/libsanitizer-timebits.diff index f5ee919a..9a42afab 100644 --- a/debian/patches/libsanitizer-timebits.diff +++ b/debian/patches/libsanitizer-timebits.diff @@ -10,13 +10,13 @@ #include "sanitizer_platform.h" #if SANITIZER_SOLARIS # include -#--- 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. +--- 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.