From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2153) id 7332739878F1; Thu, 17 Sep 2020 16:39:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7332739878F1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1600360746; bh=cyKHz5x8Yekw+AZKzm9nJOH9ZLCLufg+yhiHJ4XxzK8=; h=From:To:Subject:Date:From; b=KJj+3aPymArzRlFHgfwejjR2ydEL2I0GUgRtAM2Sbb8iUun877qYTd2ZPlmUTHWa4 TiyzpomAqGYO+ec+egqaU6oUOkmEZZteM7fzxsryJXqWsvfRORagGkwsKpatk9/dtW 2VkRRc4xKu1wNWH8NJL7CycGwbMDnE3a1/9BDD/s= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Jakub Jelinek 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) X-Act-Checkin: gcc X-Git-Author: Jakub Jelinek X-Git-Refname: refs/vendors/redhat/heads/gcc-8-branch X-Git-Oldrev: 87acd2d3c18da11630165ec667c7d3cf888f360e X-Git-Newrev: 8f59542594a629069c6040abb44444ff2e0bd43c Message-Id: <20200917163906.7332739878F1@sourceware.org> Date: Thu, 17 Sep 2020 16:39:06 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Sep 2020 16:39:06 -0000 https://gcc.gnu.org/g:8f59542594a629069c6040abb44444ff2e0bd43c commit 8f59542594a629069c6040abb44444ff2e0bd43c Author: Jakub Jelinek 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 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 + + Backported from mainline + 2019-10-22 Tamar Christina + + 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