summaryrefslogtreecommitdiff
path: root/gnu/packages/patches/clang-runtime-3.8-libsanitizer-mode-field.patch
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/packages/patches/clang-runtime-3.8-libsanitizer-mode-field.patch')
-rw-r--r--gnu/packages/patches/clang-runtime-3.8-libsanitizer-mode-field.patch50
1 files changed, 0 insertions, 50 deletions
diff --git a/gnu/packages/patches/clang-runtime-3.8-libsanitizer-mode-field.patch b/gnu/packages/patches/clang-runtime-3.8-libsanitizer-mode-field.patch
deleted file mode 100644
index f4bca3ecb1..0000000000
--- a/gnu/packages/patches/clang-runtime-3.8-libsanitizer-mode-field.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Adjust libsanitizer to ABI change in glibc 2.31.
-
-Adapted to 3.x from this upstream commit:
-https://github.com/llvm/llvm-project/commit/947f9692440836dcb8d88b74b69dd379d85974ce
-
-diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
---- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-@@ -1130,8 +1130,9 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, cgid);
- #ifndef __GLIBC_PREREQ
- #define __GLIBC_PREREQ(x, y) 0
- #endif
--#if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21)
--/* On aarch64 glibc 2.20 and earlier provided incorrect mode field. */
-+#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31)
-+/* glibc 2.30 and earlier provided 16-bit mode field instead of 32-bit
-+ on many architectures. */
- CHECK_SIZE_AND_OFFSET(ipc_perm, mode);
- #endif
-
-diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/lib/sanitizer_common/sanitizer_platform_limits_posix.h
---- a/lib/sanitizer_common/sanitizer_platform_limits_posix.h
-+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.h
-@@ -188,17 +188,16 @@ namespace __sanitizer {
- unsigned __seq;
- u64 __unused1;
- u64 __unused2;
--#elif defined(__mips__) || defined(__aarch64__)
-- unsigned int mode;
-- unsigned short __seq;
-- unsigned short __pad1;
-- unsigned long __unused1;
-- unsigned long __unused2;
-+#elif defined(__sparc__)
-+ unsigned mode;
-+ unsigned short __pad2;
-+ unsigned short __seq;
-+ unsigned long long __unused1;
-+ unsigned long long __unused2;
- #else
-- unsigned short mode;
-- unsigned short __pad1;
-- unsigned short __seq;
-- unsigned short __pad2;
-+ unsigned int mode;
-+ unsigned short __seq;
-+ unsigned short __pad2;
- #if defined(__x86_64__) && !defined(_LP64)
- u64 __unused1;
- u64 __unused2;