[arch-commits] Commit in gcc7/trunk (PKGBUILD deprecate_ustat_syscall_interface.patch)

[Konstantin Gizdov]

    Date: Sunday, March 24, 2019 @ 15:56:45
  Author: kgizdov
Revision: 443347

downgrade to version 7.2.1+20180116 and remove ustat dep

Added:
  gcc7/trunk/deprecate_ustat_syscall_interface.patch
Modified:
  gcc7/trunk/PKGBUILD

-----------------------------------------+
 PKGBUILD                                |   20 ++++++++++++-------
 deprecate_ustat_syscall_interface.patch |   31 ++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-03-24 15:46:57 UTC (rev 443346)
+++ PKGBUILD	2019-03-24 15:56:45 UTC (rev 443347)
@@ -6,11 +6,11 @@
 # NOTE: libtool requires rebuilt with each new gcc version
 
 pkgname=(gcc7 gcc7-libs)
-pkgver=7.4.1+20181207
+pkgver=7.2.1+20180116
 _pkgver=7
 _majorver=${pkgver:0:1}
 _islver=0.18
-pkgrel=2
+pkgrel=1
 pkgdesc='The GNU Compiler Collection (7.x.x)'
 arch=(x86_64)
 license=(GPL LGPL FDL custom)
@@ -20,16 +20,18 @@
 options=(!emptydirs)
 source=(https://sources.archlinux.org/other/gcc/gcc-${pkgver/+/-}.tar.xz{,.sig}
         http://isl.gforge.inria.fr/isl-${_islver}.tar.bz2
-        bz84080.patch)
+        bz84080.patch
+        deprecate_ustat_syscall_interface.patch)
 validpgpkeys=(F3691687D867B81B51CE07D9BBE43771487328A9  # bpiotrowski at archlinux.org
               13975A70E63C361C73AE69EF6EEB81F8981C74C7  # richard.guenther at gmail.com
               8FC15A064950A99DD1BD14DD39E4B877E62EB915) # svenstaro at gmail.com
-sha256sums=('7686fdae9dd09ad38a2c93374396eec4eaadb7df4960f9401d1f544162fd094f'
+sha256sums=('7757097376a0766bbbeed8c90ee08cab93b33d89f3e72358c8bf984401bf69d9'
             'SKIP'
             '6b8b0fd7f81d0a957beb3679c81bbb34ccc7568d5682844d8924424a0dadcb1b'
-            'bce05807443558db55f0d6b4dae37a678ea1bb3388b541c876fe3d110e3717e7')
+            'bce05807443558db55f0d6b4dae37a678ea1bb3388b541c876fe3d110e3717e7'
+            'd18faec408d2e6503e6e8fbdd76c30da4d1657bd2dfd75320dcb011473568b75')
 
-_svnrev=266882
+_svnref=256757
 _svnurl=svn://gcc.gnu.org/svn/gcc/branches/gcc-${_majorver}-branch
 _libdir=usr/lib/gcc/$CHOST/${pkgver%%+*}
 
@@ -56,8 +58,11 @@
   cd gcc
 
   # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84080
-  patch -p0 -i "$srcdir/bz84080.patch"
+  patch -Np0 -i "${srcdir}/bz84080.patch"
 
+  # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85835
+  patch -Np0 -i "${srcdir}/deprecate_ustat_syscall_interface.patch"
+
   # link isl for in-tree build
   ln -s ../isl-${_islver} isl
 
@@ -93,6 +98,7 @@
       --enable-libmpx \
       --with-system-zlib \
       --with-isl \
+      --disable-multilib \
       --enable-__cxa_atexit \
       --disable-libunwind-exceptions \
       --enable-clocale=gnu \

Added: deprecate_ustat_syscall_interface.patch
===================================================================
--- deprecate_ustat_syscall_interface.patch	                        (rev 0)
+++ deprecate_ustat_syscall_interface.patch	2019-03-24 15:56:45 UTC (rev 443347)
@@ -0,0 +1,31 @@
+--- libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc	2018/05/24 20:07:25	260687
++++ libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc	2018/05/24 20:21:54	260688
+@@ -154,7 +154,6 @@ typedef struct user_fpregs elf_fpregset_
+ # 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