gcc: Fix gcc 5.5 FTBFS on glibc>=2.28 .

component/gcc/buildout.cfg

@@ -3,6 +3,7 @@
 [buildout]
 extends =
   ../gmp/buildout.cfg
+  ../patch/buildout.cfg
   ../perl/buildout.cfg
   ../tar/buildout.cfg
   ../xz-utils/buildout.cfg
@@ -17,6 +18,9 @@ url = http://ftp.gnu.org/gnu/gcc/gcc-5.5.0/gcc-5.5.0.tar.gz
 md5sum = 781bc0195edeb0ceaace8428f63ae63d
 # make install does not work when several core are used
 make-targets = install -j1
+patch-options = -p1
+patches =
+  ${:_profile_base_location_}/libsanitizer_Use_pre-computed_size_of_struct_ustat_for_Linux.patch#1e5f33e89f9fe1ca3e406eabcc621762
 
 [gcc]
 <= gcc-common

component/gcc/libsanitizer_Use_pre-computed_size_of_struct_ustat_for_Linux.patch

+From 15f0e921f47a9b81c4a30295c8685ad37d3ff4e0 Mon Sep 17 00:00:00 2001
+From: hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Thu, 24 May 2018 19:52:32 +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/trunk@260684 138bc75d-0d04-0410-961f-82ee72b054a4
+---
+ libsanitizer/ChangeLog                                    |  8 ++++++++
+ .../sanitizer_common/sanitizer_platform_limits_posix.cc   | 15 +++++++++++++--
+ 2 files changed, 21 insertions(+), 2 deletions(-)
+
+# Hunk commented-out as this does not apply on gcc 5.5 .
+#diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
+#index 2ec1a9a..286b789 100644
+#--- a/libsanitizer/ChangeLog
+#+++ b/libsanitizer/ChangeLog
+#@@ -1,3 +1,11 @@
+#+2018-05-24  H.J. Lu  <hongjiu.lu@intel.com>
+#+
+#+	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.
+#+
+# 2018-04-26  Hans-Peter Nilsson  <hp@axis.com>
+# 
+# 	* configure.tgt <mips*-*-linux*>: Enable build, excluding
+diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
+index 858bb21..de18e56 100644
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
+@@ -157,7 +157,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>
+@@ -250,7 +249,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.9.3
+