| rev |
line source |
|
shann@25785
|
1 From ce9568e9e9cf6094be30e748821421e703754ffc Mon Sep 17 00:00:00 2001
|
|
shann@25785
|
2 From: Jakub Jelinek <jakub@redhat.com>
|
|
shann@25785
|
3 Date: Fri, 8 Nov 2019 19:53:18 +0100
|
|
shann@25785
|
4 Subject: [PATCH] backport: re PR sanitizer/92154 (new glibc breaks arm
|
|
shann@25785
|
5 bootstrap due to libsanitizer)
|
|
shann@25785
|
6
|
|
shann@25785
|
7 Backported from mainline
|
|
shann@25785
|
8 2019-10-22 Tamar Christina <tamar.christina@arm.com>
|
|
shann@25785
|
9
|
|
shann@25785
|
10 PR sanitizer/92154
|
|
shann@25785
|
11 * sanitizer_common/sanitizer_platform_limits_posix.cc:
|
|
shann@25785
|
12 Cherry-pick compiler-rt revision r375220.
|
|
shann@25785
|
13
|
|
shann@25785
|
14 From-SVN: r277981
|
|
shann@25785
|
15 ---
|
|
shann@25785
|
16 libsanitizer/ChangeLog | 9 +++++++++
|
|
shann@25785
|
17 .../sanitizer_common/sanitizer_platform_limits_posix.cc | 6 +++++-
|
|
shann@25785
|
18 2 files changed, 14 insertions(+), 1 deletion(-)
|
|
shann@25785
|
19
|
|
shann@25785
|
20 diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
|
|
shann@25785
|
21 index 6cd4a5bac8b0..06a605ff4670 100644
|
|
shann@25785
|
22 --- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
|
|
shann@25785
|
23 +++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
|
|
shann@25785
|
24 @@ -1156,8 +1156,12 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid);
|
|
shann@25785
|
25 CHECK_SIZE_AND_OFFSET(ipc_perm, gid);
|
|
shann@25785
|
26 CHECK_SIZE_AND_OFFSET(ipc_perm, cuid);
|
|
shann@25785
|
27 CHECK_SIZE_AND_OFFSET(ipc_perm, cgid);
|
|
shann@25785
|
28 -#if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21)
|
|
shann@25785
|
29 +#if (!defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21)) && \
|
|
shann@25785
|
30 + !defined(__arm__)
|
|
shann@25785
|
31 /* On aarch64 glibc 2.20 and earlier provided incorrect mode field. */
|
|
shann@25785
|
32 +/* On Arm glibc 2.31 and later provide a different mode field, this field is
|
|
shann@25785
|
33 + never used by libsanitizer so we can simply ignore this assert for all glibc
|
|
shann@25785
|
34 + versions. */
|
|
shann@25785
|
35 CHECK_SIZE_AND_OFFSET(ipc_perm, mode);
|
|
shann@25785
|
36 #endif
|
|
shann@25785
|
37
|