From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BEEDF138350 for ; Sat, 21 Mar 2020 14:09:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F11E0E0921; Sat, 21 Mar 2020 14:09:35 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CA3ACE0921 for ; Sat, 21 Mar 2020 14:09:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F138A34F093 for ; Sat, 21 Mar 2020 14:09:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4433D18E for ; Sat, 21 Mar 2020 14:09:31 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1584798729.5bc00b95169b79afd35918186196900b5ac7e9b8.slyfox@gentoo> Subject: [gentoo-commits] proj/gcc-patches:master commit in: 6.5.0/gentoo/ X-VCS-Repository: proj/gcc-patches X-VCS-Files: 6.5.0/gentoo/24_all_libsanitizer-p1.patch 6.5.0/gentoo/25_all_libsanitizer-p2.patch 6.5.0/gentoo/README.history X-VCS-Directories: 6.5.0/gentoo/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 5bc00b95169b79afd35918186196900b5ac7e9b8 X-VCS-Branch: master Date: Sat, 21 Mar 2020 14:09:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: dadeb50c-fbd2-4240-a228-7da9695e3c3e X-Archives-Hash: d4da14e154a3ab0095fc4300e3a414b1 commit: 5bc00b95169b79afd35918186196900b5ac7e9b8 Author: Sergei Trofimovich gentoo org> AuthorDate: Sat Mar 21 13:52:09 2020 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Mar 21 13:52:09 2020 +0000 URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=5bc00b95 6.5.0: backport glibc-2.31 libsanitizer fixes Signed-off-by: Sergei Trofimovich gentoo.org> 6.5.0/gentoo/24_all_libsanitizer-p1.patch | 33 ++++++++++++++++ 6.5.0/gentoo/25_all_libsanitizer-p2.patch | 63 +++++++++++++++++++++++++++++++ 6.5.0/gentoo/README.history | 4 ++ 3 files changed, 100 insertions(+) diff --git a/6.5.0/gentoo/24_all_libsanitizer-p1.patch b/6.5.0/gentoo/24_all_libsanitizer-p1.patch new file mode 100644 index 0000000..9bc5426 --- /dev/null +++ b/6.5.0/gentoo/24_all_libsanitizer-p1.patch @@ -0,0 +1,33 @@ +From 54d87ffe4b34052f159ac5b72b250129ce813b2a Mon Sep 17 00:00:00 2001 +From: Jakub Jelinek +Date: Fri, 14 Feb 2020 12:33:27 +0100 +Subject: [PATCH] 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. +--- +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -1128,12 +1128,16 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, gid); + CHECK_SIZE_AND_OFFSET(ipc_perm, cuid); + CHECK_SIZE_AND_OFFSET(ipc_perm, cgid); + #ifndef __GLIBC_PREREQ + #define __GLIBC_PREREQ(x, y) 0 + #endif +-#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 + + CHECK_TYPE_SIZE(shmid_ds); + CHECK_SIZE_AND_OFFSET(shmid_ds, shm_perm); diff --git a/6.5.0/gentoo/25_all_libsanitizer-p2.patch b/6.5.0/gentoo/25_all_libsanitizer-p2.patch new file mode 100644 index 0000000..dea9073 --- /dev/null +++ b/6.5.0/gentoo/25_all_libsanitizer-p2.patch @@ -0,0 +1,63 @@ +From dbdf86838aaaef76620c00c53096cfe157d5af6e Mon Sep 17 00:00:00 2001 +From: Jakub Jelinek +Date: Fri, 14 Feb 2020 12:38:30 +0100 +Subject: [PATCH] backport: re PR sanitizer/92154 (new glibc breaks arm + bootstrap due to libsanitizer) + + Backported from mainline + 2019-11-26 Jakub Jelinek + + PR sanitizer/92154 + * sanitizer_common/sanitizer_platform_limits_posix.h: Cherry-pick + llvm-project revision 947f9692440836dcb8d88b74b69dd379d85974ce. + * sanitizer_common/sanitizer_platform_limits_posix.cc: Likewise. +--- +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -1128,16 +1128,13 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, gid); + CHECK_SIZE_AND_OFFSET(ipc_perm, cuid); + CHECK_SIZE_AND_OFFSET(ipc_perm, cgid); + #ifndef __GLIBC_PREREQ + #define __GLIBC_PREREQ(x, y) 0 + #endif +-#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. */ ++#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31) ++/* glibc 2.30 and earlier provided 16-bit mode field instead of 32-bit ++ on many architectures. */ + CHECK_SIZE_AND_OFFSET(ipc_perm, mode); + #endif + + CHECK_TYPE_SIZE(shmid_ds); + CHECK_SIZE_AND_OFFSET(shmid_ds, shm_perm); +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +@@ -210,20 +210,13 @@ namespace __sanitizer { + unsigned long __unused1; + unsigned long __unused2; + #elif defined(__sparc__) +-# if defined(__arch64__) + unsigned mode; +- unsigned short __pad1; +-# else +- unsigned short __pad1; +- unsigned short mode; + unsigned short __pad2; +-# endif + unsigned short __seq; + unsigned long long __unused1; + unsigned long long __unused2; + #else +- unsigned short mode; +- unsigned short __pad1; ++ unsigned int mode; + unsigned short __seq; + unsigned short __pad2; + #if defined(__x86_64__) && !defined(_LP64) +-- +2.25.2 + diff --git a/6.5.0/gentoo/README.history b/6.5.0/gentoo/README.history index 1b13a25..28a78e6 100644 --- a/6.5.0/gentoo/README.history +++ b/6.5.0/gentoo/README.history @@ -1,3 +1,7 @@ +3 TODO + + 24_all_libsanitizer-p1.patch + + 25_all_libsanitizer-p2.patch + 2 1 Jun 2019 + 23_all_std_pair_ABI.patch