[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

5 files changed, 154 insertions, 77 deletions

diff --git a/libre/aarch64-linux-gnu-binutils/PKGBUILD b/libre/aarch64-linux-gnu-binutils/PKGBUILD
index d9321ccf9..de2c4ac78 100644
--- a/libre/aarch64-linux-gnu-binutils/PKGBUILD
+++ b/libre/aarch64-linux-gnu-binutils/PKGBUILD
@@ -1,16 +1,17 @@
+# Maintainer (arch): Anatol Pomozov <anatol.pomozov@gmail.com>
 # Maintainer: David P. <megver83@parabola.nu>
 
 _target=aarch64-linux-gnu
 pkgname=$_target-binutils
-pkgver=2.34
+pkgver=2.38
 pkgrel=1
 pkgdesc='A set of programs to assemble and manipulate binary and object files for the aarch64 target'
-arch=('x86_64' 'i686' 'armv7h')
+arch=(armv7h i686 x86_64)
 url='https://www.gnu.org/software/binutils/'
 license=(GPL)
-depends=(zlib)
+depends=(zlib libelf)
 source=(https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.bz2{,.sig})
-sha512sums=('f47e7304e102c7bbc97958a08093e27796b9051d1567ce4fbb723d39ef3e29efa325ee14a1bdcc462a925a7f9bbbc9aee28294c6dc23850f371030f3835a8067'
+sha512sums=('7690b4158bd6587a85c6b98903980b9ac6f16b47f7fd1e60986b0a70388bedcfdc05d75597aa49c81fec1609ce24bed6c26583f76fd2471a9d63394fd9798afc'
             'SKIP')
 validpgpkeys=('EAF1C276A747E9ED86210CBAC3126D3B4AE55E93'  # Tristan Gingold <gingold@adacore.com>
               '3A24BC1E8FB409FA9F14371813FCEF89DD9E3C4F') # Nick Clifton (Chief Binutils Maintainer) <nickc@redhat.com>
@@ -23,7 +24,8 @@ prepare() {
 build() {
   cd binutils-$pkgver
 
-  if [ "${CARCH}" != "i686" ]; then
+  if [ "${CARCH}" != "i686" ];
+  then
     # enabling gold linker at i686 makes the install fail
     enable_gold='--enable-gold'
   fi
@@ -45,10 +47,10 @@ build() {
 
 check() {
   cd binutils-$pkgver
-  
+
   # unset LDFLAGS as testsuite makes assumptions about which ones are active
   # do not abort on errors - manually check log files
-  make LDFLAGS="" -k check || true
+  make -k LDFLAGS="" check || true
 }
 
 package() {
@@ -58,6 +60,7 @@ package() {
 
   # Remove file conflicting with host binutils and manpages for MS Windows tools
   rm "$pkgdir"/usr/share/man/man1/$_target-{dlltool,windres,windmc}*
+  rm "$pkgdir"/usr/lib/bfd-plugins/libdep.so
 
   # Remove info documents that conflict with host version
   rm -r "$pkgdir"/usr/share/info
diff --git a/libre/aarch64-linux-gnu-gcc-initial/PKGBUILD b/libre/aarch64-linux-gnu-gcc-initial/PKGBUILD
index 5991c0034..774420c7f 100644
--- a/libre/aarch64-linux-gnu-gcc-initial/PKGBUILD
+++ b/libre/aarch64-linux-gnu-gcc-initial/PKGBUILD
@@ -1,12 +1,14 @@
+# 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-initial
 _pkgver=9.3.0
 pkgver=$_pkgver
-_islver=0.22
+_islver=0.24
 pkgrel=1
-pkgrel+=parabola1
+pkgrel+=.parabola1
 pkgdesc='The GNU Compiler Collection - cross compiler for aarch64 target'
 arch=(x86_64 i686 armv7h)
 url='http://gcc.gnu.org/'
@@ -18,10 +20,10 @@ conflicts+=("${_target}-gcc")
 replaces+=("${_target}-gcc")
 options=(!emptydirs !strip)
 source=(https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgver/gcc-$_pkgver.tar.xz{,.sig}
-        http://isl.gforge.inria.fr/isl-$_islver.tar.bz2)
+        https://gcc.gnu.org/pub/gcc/infrastructure/isl-${_islver}.tar.bz2)
 sha512sums=('4b9e3639eef6e623747a22c37a904b4750c93b6da77cf3958d5047e9b5ebddb7eebe091cc16ca0a227c0ecbd2bf3b984b221130f269a97ee4cc18f9cf6c444de'
             'SKIP'
-            'fc2c9796979610dd51143dcefe4f5c989c4354571cc5a1fcc6b932fd41f42a54f6b43adfd289af61be7bd06f3a523fa6a7d7ee56680e32d8036beb4c188fa668')
+            'aab3bddbda96b801d0f56d2869f943157aad52a6f6e6a61745edd740234c635c38231af20bc3f1a08d416a5e973a90e18249078ed8e4ae2f1d5de57658738e95')
 validpgpkeys=(33C235A34C46AA3FFB293709A328C3A2C3C45C06) # Jakub Jelinek <jakub@redhat.com>
 
 if [ -n "$_snapshot" ]; then
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
 }
diff --git a/libre/aarch64-linux-gnu-glibc/PKGBUILD b/libre/aarch64-linux-gnu-glibc/PKGBUILD
new file mode 100644
index 000000000..35a056338
--- /dev/null
+++ b/libre/aarch64-linux-gnu-glibc/PKGBUILD
@@ -0,0 +1,75 @@
+# 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-glibc
+pkgver=2.35
+pkgrel=1
+pkgdesc="GNU C Library ARM64 target"
+arch=(any)
+url='https://www.gnu.org/software/libc/'
+license=('GPL' 'LGPL')
+depends=($_target-gcc $_target-linux-api-headers)
+makedepends=(python)
+options=(!buildflags !strip staticlibs)
+source=(https://ftp.gnu.org/gnu/libc/glibc-$pkgver.tar.xz{,.sig})
+sha256sums=('5123732f6b67ccd319305efd399971d58592122bcc2a6518a1bd2510dd0cf52e'
+            'SKIP')
+validpgpkeys=(7273542B39962DF7B299931416792B4EA25340F8  # "Carlos O'Donell <carlos@systemhalted.org>"
+              BC7C7372637EC10C57D7AA6579C43DFBF1CF2187) # Siddhesh Poyarekar
+
+prepare() {
+  mkdir -p glibc-build
+}
+
+build() {
+  cd glibc-build
+
+  echo "slibdir=/lib" >> configparms
+  echo "rtlddir=/lib" >> configparms
+  echo "sbindir=/bin" >> configparms
+  echo "rootsbindir=/bin" >> configparms
+
+  # remove hardening options for building libraries
+  export CFLAGS="-U_FORTIFY_SOURCE -mlittle-endian -O2"
+  export CPPFLAGS="-U_FORTIFY_SOURCE -O2"
+  unset LD_LIBRARY_PATH
+
+  export BUILD_CC=gcc
+  export CC=${_target}-gcc
+  export CXX=${_target}-g++
+  export AR=${_target}-ar
+  export RANLIB=${_target}-ranlib
+
+  ../glibc-$pkgver/configure \
+      --prefix=/usr \
+      --target=$_target \
+      --host=$_target \
+      --build=$CHOST \
+      --includedir=/include \
+      --libdir=/lib \
+      --libexecdir=/lib \
+      --with-headers=/usr/$_target/include \
+      --with-bugurl=https://bugs.archlinux.org/ \
+      --enable-add-ons \
+      --enable-obsolete-rpc \
+      --enable-kernel=2.6.32 \
+      --enable-bind-now \
+      --disable-profile \
+      --enable-stackguard-randomization \
+      --enable-lock-elision \
+      --enable-multi-arch \
+      --disable-werror
+
+  echo "build-programs=no" >> configparms
+  make
+}
+
+package() {
+  cd glibc-build
+
+  make install_root="$pkgdir"/usr/$_target install
+
+  rm -r "$pkgdir"/usr/$_target/{etc,usr/share,var}
+}
diff --git a/libre/aarch64-linux-gnu-linux-libre-api-headers/PKGBUILD b/libre/aarch64-linux-gnu-linux-libre-api-headers/PKGBUILD
index a0d76b2d5..7377f951f 100644
--- a/libre/aarch64-linux-gnu-linux-libre-api-headers/PKGBUILD
+++ b/libre/aarch64-linux-gnu-linux-libre-api-headers/PKGBUILD
@@ -1,10 +1,10 @@
+# Maintainer (arch): Anatol Pomozov <anatol.pomozov@gmail.com>
 # Maintainer: David P. <megver83@parabola.nu>
-# Maintainer (Arch): Anatol Pomozov <anatol.pomozov@gmail.com>
 
 _target_arch=arm64
 _target=aarch64-linux-gnu
 pkgname=$_target-linux-libre-api-headers
-_pkgver=4.19-gnu
+_pkgver=5.18-gnu
 
 _srcver=${_pkgver%-*}
 pkgver=${_pkgver//-/_}
@@ -16,18 +16,12 @@ license=(GPL2)
 provides=("$_target-linux-api-headers=${_srcver}")
 conflicts=("$_target-linux-api-headers")
 replaces=("$_target-linux-api-headers")
+makedepends=(rsync)
 source=("https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/linux-libre-${_pkgver}.tar.xz"{,.sign})
-sha512sums=('5bc800b3beff43a8c15bd5515f4e0babe2beb5fa600491b7b37110e22d9b739d293f1e38753ed681be289c51390e0e64b3e60ce0db0a3bfe1f94ee5c014579a3'
+sha512sums=('13be3762fffd74c63eeb23b0d34b994a3e5198bfdbda4f013b38f8d3edd24b9bbebe5a4bfde0f5191aa1cf2678e4517f3b5540a40b30ebc05da1f6708cbb98bb'
             'SKIP')
 validpgpkeys=('474402C8C582DAFBE389C427BCB7CF877E7D47A7') # Alexandre Oliva
 
-build() {
-  cd linux-$_srcver
-
-  make ARCH=$_target_arch mrproper
-  make ARCH=$_target_arch headers_check
-}
-
 package() {
   cd linux-$_srcver