diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2024-11-02 20:32:18 +0100 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2024-11-02 20:15:19 +0000 |
| commit | 705907b2fef316a30f30c3997c9b49189898652b (patch) | |
| tree | 9da3782284929ff8ff131d12b9aa4ab638b08301 | |
| parent | Revert "15.0.0: respin patchset 2 to drop 72 revert patch" (diff) | |
| download | gcc-patches-705907b2fef316a30f30c3997c9b49189898652b.tar.gz gcc-patches-705907b2fef316a30f30c3997c9b49189898652b.tar.bz2 gcc-patches-705907b2fef316a30f30c3997c9b49189898652b.zip | |
14.2.0: Backport a sanitizer fix for -D_TIME_BITS=64
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Closes: https://github.com/gentoo/gcc-patches/pull/5
Signed-off-by: Sam James <sam@gentoo.org>
| -rw-r--r-- | 14.2.0/gentoo/79_all_sanitizer_time64.patch | 29 | ||||
| -rw-r--r-- | 14.2.0/gentoo/README.history | 4 |
2 files changed, 33 insertions, 0 deletions
diff --git a/14.2.0/gentoo/79_all_sanitizer_time64.patch b/14.2.0/gentoo/79_all_sanitizer_time64.patch new file mode 100644 index 0000000..2a9cf9f --- /dev/null +++ b/14.2.0/gentoo/79_all_sanitizer_time64.patch @@ -0,0 +1,29 @@ +From 47b42e967d5238a8cdb99b4a45f048f4b8393e94 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> +Date: Sat, 2 Nov 2024 20:30:22 +0100 +Subject: [PATCH] Fix sanitizer_procmaps_solaris.cpp with -D_TIME_BITS=64 + +This is backport of upstream LLVM commit: +https://github.com/llvm/llvm-project/commit/a1217020da219386b29c1a5a4a217904ecf07d7d +--- + libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp b/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp +index eeb49e2af..80b8158f4 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp ++++ b/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp +@@ -11,6 +11,10 @@ + + // Before Solaris 11.4, <procfs.h> doesn't work in a largefile environment. + #undef _FILE_OFFSET_BITS ++ ++// Avoid conflict between `_TIME_BITS` defined vs. `_FILE_OFFSET_BITS` ++// undefined in some Linux configurations. ++#undef _TIME_BITS + #include "sanitizer_platform.h" + #if SANITIZER_SOLARIS + # include <fcntl.h> +-- +2.47.0 + diff --git a/14.2.0/gentoo/README.history b/14.2.0/gentoo/README.history index f60b1a9..adbcc3e 100644 --- a/14.2.0/gentoo/README.history +++ b/14.2.0/gentoo/README.history @@ -1,3 +1,7 @@ +3 2 Nov 2024 + + + 79_all_sanitizer_time64.patch + 2 1 Nov 2024 + 31_all_time64.patch |