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 <slyfox@gentoo.org>

3 files changed, 102 insertions, 0 deletions

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 <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.zanella@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/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 <doko@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Thu, 31 May 2018 09:59:35 +0000
+Subject: [PATCH] 2018-05-31  Matthias Klose  <doko@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/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