commit: 93c6a619de1cea61f0d05a9b37d0efa0be1d1931 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Wed Aug 15 21:36:14 2018 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Wed Aug 15 21:36:14 2018 +0000 URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=93c6a619
7.3.0: fix building against glibc-2.28 (ustat.h) All patches are taken as-is from gcc-7-branch. Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> .../94_all_libgo-remove-ustat.h-glibc-2.28.patch | 171 +++++++++++++++++++++ ...bsanitizer-avoidustat.h-glibc-2.28-part-1.patch | 67 ++++++++ ...bsanitizer-avoidustat.h-glibc-2.28-part-2.patch | 32 ++++ 7.3.0/gentoo/README.history | 4 + 4 files changed, 274 insertions(+) diff --git a/7.3.0/gentoo/94_all_libgo-remove-ustat.h-glibc-2.28.patch b/7.3.0/gentoo/94_all_libgo-remove-ustat.h-glibc-2.28.patch new file mode 100644 index 0000000..ec80018 --- /dev/null +++ b/7.3.0/gentoo/94_all_libgo-remove-ustat.h-glibc-2.28.patch @@ -0,0 +1,171 @@ +From 66c953ac7dd5902346d6c6d09a9efd1eb4fc3a79 Mon Sep 17 00:00:00 2001 +From: ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> +Date: Fri, 22 Jun 2018 14:25:18 +0000 +Subject: [PATCH] syscall: remove Ustat + + glibc 2.28 removes ustat.h and the ustat function entirely, which + breaks syscall.Ustat. + + Updates golang/go#25990 + + Reviewed-on: https://go-review.googlesource.com/120535 + + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@261894 138bc75d-0d04-0410-961f-82ee72b054a4 +--- + libgo/config.h.in | 3 --- + libgo/configure | 33 ------------------------- + libgo/configure.ac | 18 -------------- + libgo/go/syscall/libcall_linux_ustat.go | 12 --------- + libgo/mksysinfo.sh | 14 ----------- + libgo/sysinfo.c | 3 --- + 6 files changed, 83 deletions(-) + delete mode 100644 libgo/go/syscall/libcall_linux_ustat.go + +diff --git a/libgo/config.h.in b/libgo/config.h.in +index a7b1d47ac9b..312da8b2837 100644 +--- a/libgo/config.h.in ++++ b/libgo/config.h.in +@@ -340,9 +340,6 @@ + /* Define to 1 if you have the `unshare' function. */ + #undef HAVE_UNSHARE + +-/* Define to 1 if you have the <ustat.h> header file and it works. */ +-#undef HAVE_USTAT_H +- + /* Define to 1 if you have the `utimensat' function. */ + #undef HAVE_UTIMENSAT + +diff --git a/libgo/configure b/libgo/configure +index 1d3d714fc05..94c42f67e82 100755 +--- a/libgo/configure ++++ b/libgo/configure +@@ -14784,39 +14784,6 @@ fi + done + + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether <ustat.h> can be used" >&5 +-$as_echo_n "checking whether <ustat.h> can be used... " >&6; } +-if test "${libgo_cv_c_ustat_h+set}" = set; then : +- $as_echo_n "(cached) " >&6 +-else +- CFLAGS_hold=$CFLAGS +-CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE $OSCFLAGS" +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-#include <sys/types.h> +-#ifdef HAVE_LINUX_FILTER_H +-#include <linux/filter.h> +-#endif +-#include <ustat.h> +- +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- libgo_cv_c_ustat_h=yes +-else +- libgo_cv_c_ustat_h=no +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-CFLAGS=$CFLAGS_hold +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libgo_cv_c_ustat_h" >&5 +-$as_echo "$libgo_cv_c_ustat_h" >&6; } +-if test $libgo_cv_c_ustat_h = yes; then +- +-$as_echo "#define HAVE_USTAT_H 1" >>confdefs.h +- +-fi +- + if test "$ac_cv_header_sys_mman_h" = yes; then + HAVE_SYS_MMAN_H_TRUE= + HAVE_SYS_MMAN_H_FALSE='#' +diff --git a/libgo/configure.ac b/libgo/configure.ac +index 51b2c161846..0adbadf20d4 100644 +--- a/libgo/configure.ac ++++ b/libgo/configure.ac +@@ -572,24 +572,6 @@ AC_CHECK_HEADERS([linux/filter.h linux/if_addr.h linux/if_ether.h linux/if_tun.h + #endif + ]) + +-AC_CACHE_CHECK([whether <ustat.h> can be used], +-[libgo_cv_c_ustat_h], +-[CFLAGS_hold=$CFLAGS +-CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE $OSCFLAGS" +-AC_COMPILE_IFELSE( +-[AC_LANG_SOURCE([ +-#include <sys/types.h> +-#ifdef HAVE_LINUX_FILTER_H +-#include <linux/filter.h> +-#endif +-#include <ustat.h> +-])], [libgo_cv_c_ustat_h=yes], [libgo_cv_c_ustat_h=no]) +-CFLAGS=$CFLAGS_hold]) +-if test $libgo_cv_c_ustat_h = yes; then +- AC_DEFINE(HAVE_USTAT_H, 1, +- [Define to 1 if you have the <ustat.h> header file and it works.]) +-fi +- + AM_CONDITIONAL(HAVE_SYS_MMAN_H, test "$ac_cv_header_sys_mman_h" = yes) + + AC_CHECK_FUNCS(strerror_r strsignal wait4 mincore setenv unsetenv dl_iterate_phdr) +diff --git a/libgo/go/syscall/libcall_linux_ustat.go b/libgo/go/syscall/libcall_linux_ustat.go +deleted file mode 100644 +index 261f086f47e..00000000000 +--- a/libgo/go/syscall/libcall_linux_ustat.go ++++ /dev/null +@@ -1,12 +0,0 @@ +-// Copyright 2015 The Go Authors. All rights reserved. +-// Use of this source code is governed by a BSD-style +-// license that can be found in the LICENSE file. +- +-// GNU/Linux library ustat call. +-// This is not supported on some kernels, such as arm64. +-// +build !arm64 +- +-package syscall +- +-//sys Ustat(dev int, ubuf *Ustat_t) (err error) +-//ustat(dev _dev_t, ubuf *Ustat_t) _C_int +diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh +index 61d39d7e2dd..2284928ae53 100755 +--- a/libgo/mksysinfo.sh ++++ b/libgo/mksysinfo.sh +@@ -1107,20 +1107,6 @@ grep '^type _sysinfo ' gen-sysinfo.go | \ + -e 's/mem_unit/Unit/' \ + >> ${OUT} + +-# The ustat struct. +-grep '^type _ustat ' gen-sysinfo.go | \ +- sed -e 's/_ustat/Ustat_t/' \ +- -e 's/f_tfree/Tfree/' \ +- -e 's/f_tinode/Tinoe/' \ +- -e 's/f_fname/Fname/' \ +- -e 's/f_fpack/Fpack/' \ +- >> ${OUT} +-# Force it to be defined, as on some older GNU/Linux systems the +-# header file fails when using with <linux/filter.h>. +-if ! grep 'type _ustat ' gen-sysinfo.go >/dev/null 2>&1; then +- echo 'type Ustat_t struct { Tfree int32; Tinoe uint64; Fname [5+1]int8; Fpack [5+1]int8; }' >> ${OUT} +-fi +- + # The utimbuf struct. + grep '^type _utimbuf ' gen-sysinfo.go | \ + sed -e 's/_utimbuf/Utimbuf/' \ +diff --git a/libgo/sysinfo.c b/libgo/sysinfo.c +index a1afc7d119c..7ff721816f9 100644 +--- a/libgo/sysinfo.c ++++ b/libgo/sysinfo.c +@@ -135,9 +135,6 @@ + #if defined(HAVE_SYS_SYSINFO_H) + #include <sys/sysinfo.h> + #endif +-#if defined(HAVE_USTAT_H) +-#include <ustat.h> +-#endif + #if defined(HAVE_UTIME_H) + #include <utime.h> + #endif +-- +2.18.0 + diff --git a/7.3.0/gentoo/95_all_libsanitizer-avoidustat.h-glibc-2.28-part-1.patch b/7.3.0/gentoo/95_all_libsanitizer-avoidustat.h-glibc-2.28-part-1.patch new file mode 100644 index 0000000..a2da9b1 --- /dev/null +++ b/7.3.0/gentoo/95_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 <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> +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: + +<sys/ustat.h> has been removed from glibc 2.28 by: + +commit cf2478d53ad7071e84c724a986b56fe17f4f4ca7 +Author: Adhemerval Zanella <adhemerval.zane...@linaro.org> +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 <sys/ustat.h> 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 <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> +@@ -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 <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.18.0 + diff --git a/7.3.0/gentoo/96_all_libsanitizer-avoidustat.h-glibc-2.28-part-2.patch b/7.3.0/gentoo/96_all_libsanitizer-avoidustat.h-glibc-2.28-part-2.patch new file mode 100644 index 0000000..e9b5c8f --- /dev/null +++ b/7.3.0/gentoo/96_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 <doko@138bc75d-0d04-0410-961f-82ee72b054a4> +Date: Thu, 31 May 2018 09:59:35 +0000 +Subject: [PATCH] 2018-05-31 Matthias Klose <d...@ubuntu.com> + + 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/7.3.0/gentoo/README.history b/7.3.0/gentoo/README.history index 7cc8e55..75814a0 100644 --- a/7.3.0/gentoo/README.history +++ b/7.3.0/gentoo/README.history @@ -1,3 +1,7 @@ +1.5 TODO + + 94_all_libgo-remove-ustat.h-glibc-2.28.patch + + 95_all_libsanitizer-avoidustat.h-glibc-2.28-part-1.patch + + 96_all_libsanitizer-avoidustat.h-glibc-2.28-part-2.patch 1.4 18 May 2018 U 13_all_default-ssp-fix.patch 1.3 16 May 2018
