aarch64-linux-gnu toolchain: Revert back to gcc 9.1.0

Using more recent gcc resulted in many different build failures
and I didn't have the time to investigate and fix them all.

Both PKGBUILDs now build with makepkg.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>

1 files changed, 47 insertions, 46 deletions

diff --git a/libre/aarch64-linux-gnu-gcc-initial/PKGBUILD b/libre/aarch64-linux-gnu-gcc-initial/PKGBUILD
index 2dcd36f7c..bb4da71e3 100644
--- a/libre/aarch64-linux-gnu-gcc-initial/PKGBUILD
+++ b/libre/aarch64-linux-gnu-gcc-initial/PKGBUILD
@@ -1,32 +1,31 @@
-# Maintainer (arch): Anatol Pomozov <anatol.pomozov@gmail.com>
-# Maintainer (arch): Eli Schwartz <eschwartz@archlinux.org>
-# Maintainer (Parabola): Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
+# Maintainer: David P. <megver83@parabola.nu>
 
 _target=aarch64-linux-gnu
 pkgname=$_target-gcc-initial
-pkgver=9.2.0
+_pkgver=9.1.0
+#_snapshot=8-20180824
+pkgver=$_pkgver${_snapshot/*-/+}
 _islver=0.21
-pkgrel=1
-#_snapshot=8-20190111
-pkgdesc='The GNU Compiler Collection - cross compiler for ARM64 target'
-arch=(armv7h)
-url='https://gcc.gnu.org/'
+pkgrel=2
+pkgdesc='The GNU Compiler Collection - cross compiler for aarch64 target'
+arch=(x86_64 i686 armv7h)
+url='http://gcc.gnu.org/'
 license=(GPL LGPL FDL)
 depends=($_target-binutils libmpc zlib)
 makedepends=(gmp mpfr)
-options=(!emptydirs !strip staticlibs)
-source=(https://ftp.gnu.org/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.xz{,.sig}
+options=(!emptydirs !strip)
+source=(https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgver/gcc-$_pkgver.tar.xz{,.sig}
         #https://gcc.gnu.org/pub/gcc/snapshots/$_snapshot/gcc-$_snapshot.tar.xz
         http://isl.gforge.inria.fr/isl-$_islver.tar.bz2)
-sha256sums=('ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206'
+sha512sums=('b6134df027e734cee5395afd739fcfa4ea319a6017d662e54e89df927dea19d3fff7a6e35d676685383034e3db01c9d0b653f63574c274eeb15a2cb0bc7a1f28'
             'SKIP'
-            'd18ca11f8ad1a39ab6d03d3dcb3365ab416720fcb65b42d69f34f51bf0a0e859')
+            '48f3b8d90550e8ab28837b5757f87bf99cddec67769877e04942abef69bbe526ef4c863951d55dd89a6027dc09df48988c8df6029782f990aa4d5b67e65f6d53')
 validpgpkeys=(33C235A34C46AA3FFB293709A328C3A2C3C45C06) # Jakub Jelinek <jakub@redhat.com>
 
 if [ -n "$_snapshot" ]; then
   _basedir=gcc-$_snapshot
 else
-  _basedir=gcc-$pkgver
+  _basedir=gcc-$_pkgver
 fi
 
 prepare() {
@@ -35,16 +34,12 @@ prepare() {
   # link isl for in-tree builds
   ln -sf ../isl-$_islver isl
 
-  echo $pkgver > gcc/BASE-VER
-
-  # Do not run fixincludes
-  sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
+  echo $_pkgver > gcc/BASE-VER
 
   # hack! - some configure tests for header files using "$CPP $CPPFLAGS"
   sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" "$srcdir"/$_basedir/{libiberty,gcc}/configure
 
-  rm -rf "$srcdir"/gcc-build
-  mkdir "$srcdir"/gcc-build
+  mkdir $srcdir/gcc-build
 }
 
 build() {
@@ -54,38 +49,45 @@ build() {
   # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48565
   CFLAGS=${CFLAGS/-pipe/}
   CXXFLAGS=${CXXFLAGS/-pipe/}
-
-  "$srcdir"/$_basedir/configure \
-      --prefix=/usr \
-      --program-prefix=$_target- \
-      --libdir=/usr/lib --libexecdir=/usr/lib \
-      --target=$_target --host=$CHOST --build=$CHOST \
-      --disable-nls \
-      --enable-languages=c,c++,fortran \
-      --enable-shared --enable-threads=posix \
-      --with-system-zlib --with-isl --enable-__cxa_atexit \
-      --disable-libunwind-exceptions --enable-clocale=gnu \
-      --disable-libstdcxx-pch --disable-libssp \
-      --enable-gnu-unique-object --enable-linker-build-id \
-      --enable-lto --enable-plugin --enable-install-libiberty \
-      --with-linker-hash-style=gnu --enable-gnu-indirect-function \
-      --disable-multilib --disable-werror \
-      --enable-checking=release
-
-  make
+  
+  $srcdir/$_basedir/configure \
+    --target=$_target \
+    --prefix=/usr \
+    --libexecdir=/usr/lib \
+    --enable-languages=c,c++ \
+    --enable-plugins \
+    --enable-shared \
+    --disable-decimal-float \
+    --disable-libffi \
+    --disable-libgomp \
+    --disable-libmudflap \
+    --disable-libquadmath \
+    --disable-libssp \
+    --disable-libstdcxx-pch \
+    --disable-nls \
+    --disable-threads \
+    --disable-tls \
+    --disable-multilib \
+    --with-gnu-as \
+    --with-gnu-ld \
+    --with-system-zlib \
+    --with-gmp \
+    --with-mpfr \
+    --with-mpc \
+    --with-isl \
+    --with-libelf \
+    --enable-gnu-indirect-function
+
+  make $MAKEFLAGS all-gcc
 }
 
 package() {
   cd gcc-build
 
-  make DESTDIR="$pkgdir" install-gcc install-target-{libgcc,libstdc++-v3,libgomp,libgfortran,libquadmath}
+  make DESTDIR="$pkgdir" install-gcc
 
   # strip target binaries
-  find "$pkgdir"/usr/lib/gcc/$_target/ "$pkgdir"/usr/$_target/lib \
-       -type f -and \( -name \*.a -or -name \*.o \) \
-       -exec $_target-objcopy -R .comment -R .note -R .debug_info -R .debug_aranges \
-           -R .debug_pubnames -R .debug_pubtypes -R .debug_abbrev -R .debug_line \
-           -R .debug_str -R .debug_ranges -R .debug_loc '{}' \;
+  find "$pkgdir"/usr/lib/gcc/$_target/ -type f -and \( -name \*.a -or -name \*.o \) -exec $_target-objcopy -R .comment -R .note -R .debug_info -R .debug_aranges -R .debug_pubnames -R .debug_pubtypes -R .debug_abbrev -R .debug_line -R .debug_str -R .debug_ranges -R .debug_loc '{}' \;
 
   # strip host binaries
   find "$pkgdir"/usr/bin/ "$pkgdir"/usr/lib/gcc/$_target/ -type f -and \( -executable \) -exec strip '{}' \;
@@ -93,5 +95,4 @@ package() {
   # Remove files that conflict with host gcc package
   rm -r "$pkgdir"/usr/share/man/man7
   rm -r "$pkgdir"/usr/share/info
-  rm -r "$pkgdir"/usr/share/gcc-$pkgver
 }