diff options
Diffstat (limited to 'gnu/packages/patches/clang-runtime-9-libsanitizer-mode-field.patch')
-rw-r--r-- | gnu/packages/patches/clang-runtime-9-libsanitizer-mode-field.patch | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/gnu/packages/patches/clang-runtime-9-libsanitizer-mode-field.patch b/gnu/packages/patches/clang-runtime-9-libsanitizer-mode-field.patch deleted file mode 100644 index ebb080ed9d..0000000000 --- a/gnu/packages/patches/clang-runtime-9-libsanitizer-mode-field.patch +++ /dev/null @@ -1,60 +0,0 @@ -Adjust libsanitizer to ABI change in glibc 2.31. - -Taken 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 -@@ -1126,8 +1126,9 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid); - CHECK_SIZE_AND_OFFSET(ipc_perm, gid); - CHECK_SIZE_AND_OFFSET(ipc_perm, cuid); - CHECK_SIZE_AND_OFFSET(ipc_perm, cgid); --#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/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/compiler-rt/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 -@@ -203,28 +203,15 @@ namespace __sanitizer { - u64 __unused1; - u64 __unused2; - #elif defined(__sparc__) --#if defined(__arch64__) -- unsigned mode; -- unsigned short __pad1; --#else -- unsigned short __pad1; -- unsigned short mode; -- unsigned short __pad2; --#endif -- unsigned short __seq; -- unsigned long long __unused1; -- unsigned long long __unused2; --#elif defined(__mips__) || defined(__aarch64__) || defined(__s390x__) -- unsigned int mode; -- unsigned short __seq; -- unsigned short __pad1; -- unsigned long __unused1; -- unsigned long __unused2; -+ 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; |