* Fix sanitizer build on 32bit time_t64 architectures.

This commit is contained in:
Matthias Klose 2024-03-07 16:57:48 +01:00
parent c3b4008c49
commit 69ac5b7c8c
3 changed files with 25 additions and 1 deletions

3
debian/changelog vendored
View File

@ -10,8 +10,9 @@ llvm-toolchain-17 (1:17.0.6-8) UNRELEASED; urgency=medium
[ 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.
-- Zixing Liu <zixing.liu@canonical.com> Wed, 06 Mar 2024 17:27:22 -0700
-- Matthias Klose <doko@debian.org> Thu, 07 Mar 2024 16:56:50 +0100
llvm-toolchain-17 (1:17.0.6-7) unstable; urgency=medium

View File

@ -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.

View File

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