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 6AC74138334 for ; Wed, 15 Aug 2018 21:57:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6468BE08B0; Wed, 15 Aug 2018 21:57:20 +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 203AEE08B0 for ; Wed, 15 Aug 2018 21:57:19 +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 9DF12335D03 for ; Wed, 15 Aug 2018 21:57:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B11012BA for ; Wed, 15 Aug 2018 21:57:15 +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: <1534370202.5cb03e85d374381c390032b0b737c8d408f5cdfd.slyfox@gentoo> Subject: [gentoo-commits] proj/gcc-patches:master commit in: 6.4.0/gentoo/ X-VCS-Repository: proj/gcc-patches X-VCS-Files: 6.4.0/gentoo/98_all_libsanitizer-avoidustat.h-glibc-2.28-part-1.patch 6.4.0/gentoo/99_all_libsanitizer-avoidustat.h-glibc-2.28-part-2.patch 6.4.0/gentoo/README.history X-VCS-Directories: 6.4.0/gentoo/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 5cb03e85d374381c390032b0b737c8d408f5cdfd X-VCS-Branch: master Date: Wed, 15 Aug 2018 21:57:15 +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-Archives-Salt: a5801586-b423-4c78-883a-3328b14a9603 X-Archives-Hash: 31ab9faa0ce0571c327f3aa2dd6eac9e commit: 5cb03e85d374381c390032b0b737c8d408f5cdfd Author: Sergei Trofimovich gentoo org> AuthorDate: Wed Aug 15 21:56:42 2018 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Wed Aug 15 21:56:42 2018 +0000 URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=5cb03e85 6.4.0: fix building against glibc-2.28 (ustat.h) All patches are taken as-is from gcc-7-branch. Signed-off-by: Sergei Trofimovich gentoo.org> ...bsanitizer-avoidustat.h-glibc-2.28-part-1.patch | 67 ++++++++++++++++++++++ ...bsanitizer-avoidustat.h-glibc-2.28-part-2.patch | 32 +++++++++++ 6.4.0/gentoo/README.history | 3 + 3 files changed, 102 insertions(+) diff --git a/6.4.0/gentoo/98_all_libsanitizer-avoidustat.h-glibc-2.28-part-1.patch b/6.4.0/gentoo/98_all_libsanitizer-avoidustat.h-glibc-2.28-part-1.patch new file mode 100644 index 0000000..a2da9b1 --- /dev/null +++ b/6.4.0/gentoo/98_all_libsanitizer-avoidustat.h-glibc-2.28-part-1.patch @@ -0,0 +1,67 @@ +From 61f38c64c01a15560026115a157b7021ec67bd3b Mon Sep 17 00:00:00 2001 +From: hjl +Date: Thu, 24 May 2018 20:21:54 +0000 +Subject: [PATCH] libsanitizer: Use pre-computed size of struct ustat for Linux + +Cherry-pick compiler-rt revision 333213: + + has been removed from glibc 2.28 by: + +commit cf2478d53ad7071e84c724a986b56fe17f4f4ca7 +Author: Adhemerval Zanella +Date: Sun Mar 18 11:28:59 2018 +0800 + + Deprecate ustat syscall interface + +This patch uses pre-computed size of struct ustat for Linux. + + PR sanitizer/85835 + * sanitizer_common/sanitizer_platform_limits_posix.cc: Don't + include for Linux. + (SIZEOF_STRUCT_USTAT): New. + (struct_ustat_sz): Use SIZEOF_STRUCT_USTAT for Linux. + + + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@260688 138bc75d-0d04-0410-961f-82ee72b054a4 +--- + libsanitizer/ChangeLog | 8 ++++++++ + .../sanitizer_platform_limits_posix.cc | 15 +++++++++++++-- + 2 files changed, 21 insertions(+), 2 deletions(-) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +index 31a5e697eae..8017afd21c5 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -154,7 +154,6 @@ typedef struct user_fpregs elf_fpregset_t; + # include + #endif + #include +-#include + #include + #include + #include +@@ -247,7 +246,19 @@ namespace __sanitizer { + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + + #if SANITIZER_LINUX && !SANITIZER_ANDROID +- unsigned struct_ustat_sz = sizeof(struct ustat); ++ // Use pre-computed size of struct ustat to avoid which ++ // has been removed from glibc 2.28. ++#if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \ ++ || defined(__powerpc64__) || defined(__arch64__) || defined(__sparcv9) \ ++ || defined(__x86_64__) ++#define SIZEOF_STRUCT_USTAT 32 ++#elif defined(__arm__) || defined(__i386__) || defined(__mips__) \ ++ || defined(__powerpc__) || defined(__s390__) ++#define SIZEOF_STRUCT_USTAT 20 ++#else ++#error Unknown size of struct ustat ++#endif ++ unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT; + unsigned struct_rlimit64_sz = sizeof(struct rlimit64); + unsigned struct_statvfs64_sz = sizeof(struct statvfs64); + #endif // SANITIZER_LINUX && !SANITIZER_ANDROID +-- +2.18.0 + diff --git a/6.4.0/gentoo/99_all_libsanitizer-avoidustat.h-glibc-2.28-part-2.patch b/6.4.0/gentoo/99_all_libsanitizer-avoidustat.h-glibc-2.28-part-2.patch new file mode 100644 index 0000000..e9b5c8f --- /dev/null +++ b/6.4.0/gentoo/99_all_libsanitizer-avoidustat.h-glibc-2.28-part-2.patch @@ -0,0 +1,32 @@ +From 6a7c93905151724f7169612d64a5c8ce45dff9fb Mon Sep 17 00:00:00 2001 +From: doko +Date: Thu, 31 May 2018 09:59:35 +0000 +Subject: [PATCH] 2018-05-31 Matthias Klose + + PR sanitizer/86012 + * sanitizer_common/sanitizer_platform_limits_posix.cc: Define + SIZEOF_STRUCT_USTAT for 32bit sparc. + + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@260992 138bc75d-0d04-0410-961f-82ee72b054a4 +--- + libsanitizer/ChangeLog | 6 ++++++ + .../sanitizer_common/sanitizer_platform_limits_posix.cc | 2 +- + 2 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +index 8017afd21c5..97eae3fc7bc 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -253,7 +253,7 @@ namespace __sanitizer { + || defined(__x86_64__) + #define SIZEOF_STRUCT_USTAT 32 + #elif defined(__arm__) || defined(__i386__) || defined(__mips__) \ +- || defined(__powerpc__) || defined(__s390__) ++ || defined(__powerpc__) || defined(__s390__) || defined(__sparc__) + #define SIZEOF_STRUCT_USTAT 20 + #else + #error Unknown size of struct ustat +-- +2.18.0 + diff --git a/6.4.0/gentoo/README.history b/6.4.0/gentoo/README.history index 1cd9ae7..d72dc88 100644 --- a/6.4.0/gentoo/README.history +++ b/6.4.0/gentoo/README.history @@ -1,3 +1,6 @@ +1.5 TODO + + 98_all_libsanitizer-avoidustat.h-glibc-2.28-part-1.patch + + 99_all_libsanitizer-avoidustat.h-glibc-2.28-part-2.patch 1.4 03 Maj 2018 U 13_all_default-ssp-fix.patch 1.3 12 Jan 2018