diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2019-11-08 19:53:18 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2019-11-08 19:53:18 +0100 |
| commit | ce9568e9e9cf6094be30e748821421e703754ffc (patch) | |
| tree | aadf1fa042849a2d960bb29a9220a862df604563 /libsanitizer | |
| parent | 9d4f74f3c3ae9ebf305495177ae96b2173cfabcc (diff) | |
backport: re PR sanitizer/92154 (new glibc breaks arm bootstrap due to libsanitizer)
Backported from mainline
2019-10-22 Tamar Christina <tamar.christina@arm.com>
PR sanitizer/92154
* sanitizer_common/sanitizer_platform_limits_posix.cc:
Cherry-pick compiler-rt revision r375220.
From-SVN: r277981
Diffstat (limited to 'libsanitizer')
| -rw-r--r-- | libsanitizer/ChangeLog | 9 | ||||
| -rw-r--r-- | libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc | 6 |
2 files changed, 14 insertions, 1 deletions
diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index b797761bc43..82b7b112d94 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,3 +1,12 @@ +2019-11-08 Jakub Jelinek <jakub@redhat.com> + + Backported from mainline + 2019-10-22 Tamar Christina <tamar.christina@arm.com> + + PR sanitizer/92154 + * sanitizer_common/sanitizer_platform_limits_posix.cc: + Cherry-pick compiler-rt revision r375220. + 2019-08-18 Iain Sandoe <iain@sandoe.co.uk> Backport from mainline diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc index 6cd4a5bac8b..06a605ff467 100644 --- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc @@ -1156,8 +1156,12 @@ 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) +#if (!defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21)) && \ + !defined(__arm__) /* On aarch64 glibc 2.20 and earlier provided incorrect mode field. */ +/* On Arm glibc 2.31 and later provide a different mode field, this field is + never used by libsanitizer so we can simply ignore this assert for all glibc + versions. */ CHECK_SIZE_AND_OFFSET(ipc_perm, mode); #endif |