[arch-commits] Commit in (2 files)

[Anatol Pomozov]

    Date: Thursday, November 17, 2016 @ 17:37:29
  Author: anatolik
Revision: 196252

More ARM64 cross-comipler cleanup

Modified:
  aarch64-linux-gnu-gcc/trunk/PKGBUILD
  aarch64-linux-gnu-glibc/trunk/PKGBUILD

----------------------------------------+
 aarch64-linux-gnu-gcc/trunk/PKGBUILD   |   62 ++++++++++++++-----------------
 aarch64-linux-gnu-glibc/trunk/PKGBUILD |    9 +---
 2 files changed, 31 insertions(+), 40 deletions(-)

Modified: aarch64-linux-gnu-gcc/trunk/PKGBUILD
===================================================================
--- aarch64-linux-gnu-gcc/trunk/PKGBUILD	2016-11-17 16:50:52 UTC (rev 196251)
+++ aarch64-linux-gnu-gcc/trunk/PKGBUILD	2016-11-17 17:37:29 UTC (rev 196252)
@@ -12,7 +12,7 @@
 license=(GPL LGPL FDL)
 depends=($_target-binutils $_target-glibc libmpc zlib)
 makedepends=(gmp mpfr)
-options=(!emptydirs !strip staticlibs)
+options=(!emptydirs !strip)
 source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-$pkgver.tar.bz2
         ftp://gcc.gnu.org/pub/gcc/snapshots/$_snapshot/gcc-$_snapshot.tar.bz2
         http://isl.gforge.inria.fr/isl-$_islver.tar.bz2)
@@ -33,6 +33,9 @@
 
   echo $pkgver > gcc/BASE-VER
 
+  # Do not run fixincludes
+  sed -i 's@\./fixinc\.sh at -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
 
@@ -43,38 +46,32 @@
 build() {
   cd gcc-build
 
-  export CFLAGS_FOR_TARGET='-O2 -pipe'
+  # using -pipe causes spurious test-suite failures
+  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48565
+  CFLAGS=${CFLAGS/-pipe/}
+  CXXFLAGS=${CXXFLAGS/-pipe/}
 
-  # unfortunately CXXFLAGS_FOR_TARGET is not honored https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53579
-  #export CXXFLAGS_FOR_TARGET='-O2 -pipe'
-  export CXXFLAGS='-O2 -pipe'
-
   $srcdir/$_basedir/configure \
-    --prefix=/usr \
-    --libexecdir=/usr/lib \
-    --target=$_target \
-    --enable-shared \
-    --disable-nls \
-    --enable-threads=posix \
-    --enable-languages=c,c++ \
-    --enable-multilib \
-    --disable-libssp \
-    --disable-libquadmath \
-    --with-system-zlib \
-    --with-sysroot=/usr/$_target \
-    --with-build-sysroot=/usr/$_target \
-    --with-as=/usr/bin/$_target-as \
-    --with-ld=/usr/bin/$_target-ld \
-    --disable-libgomp \
-    --enable-__cxa_atexit \
-    --enable-addons \
-    --with-libelf \
-    --with-host-libstdcxx='-static-libgcc -Wl,-Bstatic,-lstdc++,-Bdynamic -lm' \
-    --with-gmp \
-    --with-mpfr \
-    --with-mpc \
-    --with-isl \
-    --enable-gnu-indirect-function
+      --prefix=/usr \
+      --program-prefix=$_target- \
+      --with-local-prefix=/usr/$_target \
+      --with-sysroot=/usr/$_target \
+      --with-build-sysroot=/usr/$_target \
+      --with-as=/usr/bin/${_target}-as \
+      --with-ld=/usr/bin/${_target}-ld \
+      --libdir=/usr/lib --libexecdir=/usr/lib \
+      --target=$_target --host=$CHOST --build=$CHOST \
+      --disable-nls \
+      --enable-languages=c,c++ \
+      --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
 }
@@ -82,7 +79,7 @@
 package() {
   cd gcc-build
 
-  make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" install-gcc install-target-libgcc install-target-libstdc++-v3 
 
   # 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 '{}' \;
@@ -94,5 +91,4 @@
   rm -r "$pkgdir"/usr/share/man/man7
   rm -r "$pkgdir"/usr/share/info
   rm -r "$pkgdir"/usr/share/gcc-$pkgver
-  rm "$pkgdir"/usr/lib/libcc1.*
 }

Modified: aarch64-linux-gnu-glibc/trunk/PKGBUILD
===================================================================
--- aarch64-linux-gnu-glibc/trunk/PKGBUILD	2016-11-17 16:50:52 UTC (rev 196251)
+++ aarch64-linux-gnu-glibc/trunk/PKGBUILD	2016-11-17 17:37:29 UTC (rev 196252)
@@ -9,7 +9,7 @@
 arch=(any)
 url='http://www.gnu.org/software/libc/'
 license=('GPL' 'LGPL')
-depends=( $_target-gcc $_target-linux-api-headers)
+depends=($_target-gcc $_target-linux-api-headers)
 makedepends=(git)
 options=(!buildflags !strip staticlibs)
 source=(git://sourceware.org/git/glibc.git#commit=$_commit)
@@ -42,6 +42,7 @@
       --prefix=/usr \
       --target=$_target \
       --host=$_target \
+      --build=$CHOST \
       --libdir=/usr/lib \
       --libexecdir=/usr/lib \
       --with-headers=/usr/$_target/include \
@@ -58,12 +59,6 @@
 
   echo "build-programs=no" >> configparms
   make
-
-  # re-enable hardening for programs
-  sed -i "/build-programs=/s#no#yes#" configparms
-
-  echo "CC += -fstack-protector-strong -D_FORTIFY_SOURCE=2" >> configparms
-  echo "CXX += -fstack-protector-strong -D_FORTIFY_SOURCE=2" >> configparms
 }
 
 package() {