[aarch64-linux-gnu-binutils][aarch64-linux-gnu-gcc-initial][aarch64-linux-gnu-gcc][aarch64-linux-gnu-glibc][aarch64-linux-gnu-linux-libre-api-headers] restore aarch64 cross-compiler for armv7h

1 files changed, 59 insertions, 56 deletions

diff --git a/libre/aarch64-linux-gnu-gcc/PKGBUILD b/libre/aarch64-linux-gnu-gcc/PKGBUILD
index b9573185e..1a07cd27f 100644
--- a/libre/aarch64-linux-gnu-gcc/PKGBUILD
+++ b/libre/aarch64-linux-gnu-gcc/PKGBUILD
@@ -1,44 +1,43 @@
+# Maintainer (arch): Anatol Pomozov <anatol.pomozov@gmail.com>
+# Maintainer (arch): Eli Schwartz <eschwartz@archlinux.org>
 # Maintainers: Parabola hackers <dev@lists.parabola.nu>
 
 _target=aarch64-linux-gnu
 pkgname=$_target-gcc
-_pkgver=9.3.0
-pkgver=$_pkgver
-_islver=0.24
+pkgver=12.1.0
 pkgrel=1
-pkgdesc='The GNU Compiler Collection - cross compiler for aarch64 target'
-arch=(x86_64 i686 armv7h)
-url='http://gcc.gnu.org/'
+#_snapshot=8-20190111
+pkgdesc='The GNU Compiler Collection - cross compiler for ARM64 target'
+arch=(armv7h)
+url='https://gcc.gnu.org/'
 license=(GPL LGPL FDL)
-depends=($_target-binutils libmpc zlib)
+depends=($_target-binutils $_target-glibc libmpc zlib libisl zstd)
 makedepends=(gmp mpfr)
-makedepends+=("${pkgname}-initial")
-options=(!emptydirs !strip)
-source=(https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgver/gcc-$_pkgver.tar.xz{,.sig}
-        https://gcc.gnu.org/pub/gcc/infrastructure/isl-${_islver}.tar.bz2)
-sha512sums=('4b9e3639eef6e623747a22c37a904b4750c93b6da77cf3958d5047e9b5ebddb7eebe091cc16ca0a227c0ecbd2bf3b984b221130f269a97ee4cc18f9cf6c444de'
-            'SKIP'
-            'aab3bddbda96b801d0f56d2869f943157aad52a6f6e6a61745edd740234c635c38231af20bc3f1a08d416a5e973a90e18249078ed8e4ae2f1d5de57658738e95')
-validpgpkeys=(33C235A34C46AA3FFB293709A328C3A2C3C45C06) # Jakub Jelinek <jakub@redhat.com>
+options=(!emptydirs !strip staticlibs !lto)
+source=(https://ftp.gnu.org/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.xz{,.sig})
+        #https://gcc.gnu.org/pub/gcc/snapshots/$_snapshot/gcc-$_snapshot.tar.xz
+sha256sums=('62fd634889f31c02b64af2c468f064b47ad1ca78411c45abe6ac4b5f8dd19c7b'
+            'SKIP')
+validpgpkeys=(D3A93CAD751C2AF4F8C7AD516C35B99309B5FA62  # Jakub Jelinek <jakub@redhat.com>
+              33C235A34C46AA3FFB293709A328C3A2C3C45C06  # Jakub Jelinek <jakub@redhat.com>
+              13975A70E63C361C73AE69EF6EEB81F8981C74C7) # Richard Guenther <richard.guenther@gmail.com>
 
 if [ -n "$_snapshot" ]; then
   _basedir=gcc-$_snapshot
 else
-  _basedir=gcc-$_pkgver
+  _basedir=gcc-$pkgver
 fi
 
 prepare() {
   cd $_basedir
 
-  # link isl for in-tree builds
-  ln -sf ../isl-$_islver isl
+  echo $pkgver > gcc/BASE-VER
 
-  echo $_pkgver > gcc/BASE-VER
+  # Do not run fixincludes
+  sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
 
-  # hack! - some configure tests for header files using "$CPP $CPPFLAGS"
-  sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" "$srcdir"/$_basedir/{libiberty,gcc}/configure
-
-  mkdir $srcdir/gcc-build
+  rm -rf "$srcdir"/gcc-build
+  mkdir "$srcdir"/gcc-build
 }
 
 build() {
@@ -49,49 +48,53 @@ build() {
   CFLAGS=${CFLAGS/-pipe/}
   CXXFLAGS=${CXXFLAGS/-pipe/}
 
-  $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
+  # Credits @allanmcrae
+  # https://github.com/allanmcrae/toolchain/blob/f18604d70c5933c31b51a320978711e4e6791cf1/gcc/PKGBUILD
+  # TODO: properly deal with the build issues resulting from this
+  CFLAGS=${CFLAGS/-Werror=format-security/}
+  CXXFLAGS=${CXXFLAGS/-Werror=format-security/}
+
+  "$srcdir"/$_basedir/configure \
+      --prefix=/usr \
+      --program-prefix=$_target- \
+      --with-local-prefix=/usr/$_target \
+      --with-sysroot=/usr/$_target \
+      --with-build-sysroot=/usr/$_target \
+      --with-native-system-header-dir=/include \
+      --libdir=/usr/lib --libexecdir=/usr/lib \
+      --target=$_target --host=$CHOST --build=$CHOST \
+      --disable-nls --enable-default-pie \
+      --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
 }
 
 package() {
   cd gcc-build
-  make DESTDIR="$pkgdir" install
+
+  make DESTDIR="$pkgdir" install-gcc install-target-{libgcc,libstdc++-v3,libgomp,libgfortran,libquadmath,libatomic}
 
   # strip target binaries
-  find "$pkgdir"/usr/lib/gcc/$_target/$_pkgver "$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/ "$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 '{}' \;
 
   # strip host binaries
-  find "$pkgdir"/usr/bin/ "$pkgdir"/usr/lib/gcc/$_target/$_pkgver -type f -and \( -executable \) -exec strip '{}' \;
+  find "$pkgdir"/usr/bin/ "$pkgdir"/usr/lib/gcc/$_target/ -type f -and \( -executable \) -exec strip '{}' \;
 
   # Remove files that conflict with host gcc package
   rm -r "$pkgdir"/usr/share/man/man7
   rm -r "$pkgdir"/usr/share/info
-  rm "$pkgdir"/usr/lib/libcc1.*
+  rm -r "$pkgdir"/usr/share/gcc-$pkgver
 }