public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Jakub Jelinek <jakub@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc(refs/vendors/redhat/heads/gcc-8-branch)] backport: re PR sanitizer/92154 (new glibc breaks arm bootstrap due to libsanitizer)
Date: Thu, 17 Sep 2020 16:39:06 +0000 (GMT)	[thread overview]
Message-ID: <20200917163906.7332739878F1@sourceware.org> (raw)

https://gcc.gnu.org/g:8f59542594a629069c6040abb44444ff2e0bd43c

commit 8f59542594a629069c6040abb44444ff2e0bd43c
Author: Jakub Jelinek <jakub@redhat.com>
Date:   Fri Feb 14 12:33:27 2020 +0100

    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.

Diff:
---
 libsanitizer/ChangeLog                                           | 9 +++++++++
 libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc | 6 +++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
index e9e4fc51828..70056ab8aec 100644
--- a/libsanitizer/ChangeLog
+++ b/libsanitizer/ChangeLog
@@ -1,3 +1,12 @@
+2020-02-14  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-02-22  Release Manager
 
 	* GCC 8.3.0 released.
diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
index a915d37cdfe..e85aaf51928 100644
--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
@@ -1147,8 +1147,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


             reply	other threads:[~2020-09-17 16:39 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-17 16:39 Jakub Jelinek [this message]
2020-09-17 16:39 Jakub Jelinek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200917163906.7332739878F1@sourceware.org \
    --to=jakub@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).