summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/gcc/gcc-9.2/0037-Fix-up-libsanitizer-build-with-master-glibc.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-9.2/0037-Fix-up-libsanitizer-build-with-master-glibc.patch')
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.2/0037-Fix-up-libsanitizer-build-with-master-glibc.patch70
1 files changed, 0 insertions, 70 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0037-Fix-up-libsanitizer-build-with-master-glibc.patch b/meta/recipes-devtools/gcc/gcc-9.2/0037-Fix-up-libsanitizer-build-with-master-glibc.patch
deleted file mode 100644
index abe074c289..0000000000
--- a/meta/recipes-devtools/gcc/gcc-9.2/0037-Fix-up-libsanitizer-build-with-master-glibc.patch
+++ /dev/null
@@ -1,70 +0,0 @@
1From 7ed24d12664319f34625a12fd8c0f729a0e71f5c Mon Sep 17 00:00:00 2001
2From: Auto Builder <ab@rdk>
3Date: Sun, 22 Dec 2019 02:58:24 +0000
4Subject: [PATCH] Fix up libsanitizer build with master glibc
5
62019-11-26 Jakub Jelinek <jakub@redhat.com>
7
8 PR sanitizer/92154
9 * sanitizer_common/sanitizer_platform_limits_posix.h: Cherry-pick
10 llvm-project revision 947f9692440836dcb8d88b74b69dd379d85974ce.
11 * sanitizer_common/sanitizer_platform_limits_posix.cpp: Likewise.
12
13Upstream-Status: Backport [https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=b02486e0951bc0ed38310a03be73e479fc6f3e7a;hp=3feeac76ffc38427de2d7d086e2928e63eee2d44]
14Signed-off-by: Auto Builder <ab@rdk>
15---
16 .../sanitizer_platform_limits_posix.cc | 5 +++--
17 .../sanitizer_platform_limits_posix.h | 15 +--------------
18 2 files changed, 4 insertions(+), 16 deletions(-)
19
20diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
21index 6cd4a5bac..d823a1219 100644
22--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
23+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
24@@ -1156,8 +1156,9 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid);
25 CHECK_SIZE_AND_OFFSET(ipc_perm, gid);
26 CHECK_SIZE_AND_OFFSET(ipc_perm, cuid);
27 CHECK_SIZE_AND_OFFSET(ipc_perm, cgid);
28-#if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21)
29-/* On aarch64 glibc 2.20 and earlier provided incorrect mode field. */
30+#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31)
31+/* glibc 2.30 and earlier provided 16-bit mode field instead of 32-bit
32+ on many architectures. */
33 CHECK_SIZE_AND_OFFSET(ipc_perm, mode);
34 #endif
35
36diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
37index 73af92af1..6a673a7c9 100644
38--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
39+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
40@@ -211,26 +211,13 @@ namespace __sanitizer {
41 u64 __unused1;
42 u64 __unused2;
43 #elif defined(__sparc__)
44-#if defined(__arch64__)
45 unsigned mode;
46- unsigned short __pad1;
47-#else
48- unsigned short __pad1;
49- unsigned short mode;
50 unsigned short __pad2;
51-#endif
52 unsigned short __seq;
53 unsigned long long __unused1;
54 unsigned long long __unused2;
55-#elif defined(__mips__) || defined(__aarch64__) || defined(__s390x__)
56- unsigned int mode;
57- unsigned short __seq;
58- unsigned short __pad1;
59- unsigned long __unused1;
60- unsigned long __unused2;
61 #else
62- unsigned short mode;
63- unsigned short __pad1;
64+ unsigned int mode;
65 unsigned short __seq;
66 unsigned short __pad2;
67 #if defined(__x86_64__) && !defined(_LP64)
68--
692.17.1
70