commit: 591e569f5896eefcfe2094b4f6e444d73dea6359 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Thu Jan 17 18:44:36 2019 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Fri Jan 18 22:04:43 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=591e569f
sys-libs/compiler-rt-sanitizers: Backport fix for sys/ustat.h Closes: https://bugs.gentoo.org/675654 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> .../compiler-rt-sanitizers-4.0.1.ebuild | 4 ++ .../compiler-rt-sanitizers-5.0.2.ebuild | 4 ++ ...se-pre-computed-size-of-struct-ustat-for-.patch | 61 ++++++++++++++++++++++ 3 files changed, 69 insertions(+) diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild index 00662c398d6..b57164e921d 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild @@ -68,6 +68,10 @@ src_prepare() { eapply "${WORKDIR}/${P}-patchset" cmake-utils_src_prepare + # sys/ustat.h removed in glibc 2.28 + # https://bugs.gentoo.org/675654 + eapply "${FILESDIR}"/5.0.2/0001-sanitizer-Use-pre-computed-size-of-struct-ustat-for-.patch + if use test; then # remove tests that are broken by new glibc # (disabled in 6.0.0+, r313069) diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.2.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.2.ebuild index d8168a231aa..2862cd5c871 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.2.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.2.ebuild @@ -72,6 +72,10 @@ src_unpack() { src_prepare() { cmake-utils_src_prepare + # sys/ustat.h removed in glibc 2.28 + # https://bugs.gentoo.org/675654 + eapply "${FILESDIR}"/5.0.2/0001-sanitizer-Use-pre-computed-size-of-struct-ustat-for-.patch + if use test; then # remove tests that are broken by new glibc # (disabled in 6.0.0+, r313069) diff --git a/sys-libs/compiler-rt-sanitizers/files/5.0.2/0001-sanitizer-Use-pre-computed-size-of-struct-ustat-for-.patch b/sys-libs/compiler-rt-sanitizers/files/5.0.2/0001-sanitizer-Use-pre-computed-size-of-struct-ustat-for-.patch new file mode 100644 index 00000000000..5a9aa2327b8 --- /dev/null +++ b/sys-libs/compiler-rt-sanitizers/files/5.0.2/0001-sanitizer-Use-pre-computed-size-of-struct-ustat-for-.patch @@ -0,0 +1,61 @@ +From 2e8240309f5ce36eae8f1f9dfcd8c060c040ca5c Mon Sep 17 00:00:00 2001 +From: Craig Topper <[email protected]> +Date: Thu, 24 May 2018 17:59:47 +0000 +Subject: [PATCH] sanitizer: Use pre-computed size of struct ustat for Linux + +<sys/ustat.h> has been removed from glibc 2.28 by: + +commit cf2478d53ad7071e84c724a986b56fe17f4f4ca7 +Author: Adhemerval Zanella <[email protected]> +Date: Sun Mar 18 11:28:59 2018 +0800 + +Deprecate ustat syscall interface +This patch uses pre-computed size of struct ustat for Linux to fix + +https://bugs.llvm.org/show_bug.cgi?id=37418 + +Patch by H.J. Lu. + +Differential Revision: https://reviews.llvm.org/D47281 + +git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@333213 91177308-0d34-0410-b5e6-96231b3b80d8 +--- + .../sanitizer_platform_limits_posix.cc | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +index 83f4fd22f..804abd9e4 100644 +--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -159,7 +159,6 @@ typedef struct user_fpregs elf_fpregset_t; + # include <sys/procfs.h> + #endif + #include <sys/user.h> +-#include <sys/ustat.h> + #include <linux/cyclades.h> + #include <linux/if_eql.h> + #include <linux/if_plip.h> +@@ -252,7 +251,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 <sys/ustat.h> 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.20.1 +
