update cross-gcc

2 files changed, 48 insertions, 66 deletions

diff --git a/cross/cross-gcc/PKGBUILD b/cross/cross-gcc/PKGBUILD
index c8a8f3d9a..051cd64b3 100644
--- a/cross/cross-gcc/PKGBUILD
+++ b/cross/cross-gcc/PKGBUILD
@@ -1,10 +1,7 @@
-# $Id: PKGBUILD 105446 2014-02-08 10:44:41Z heftig $
-# Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor (Arch): Allan McRae <allan@archlinux.org>
+# Maintainer (Arch): Allan McRae <allan@archlinux.org>
 # Maintainer: Márcio Silva (Parabola) <coadde@parabola.nu>
 
-# toolchain build order:
-#  {kernel}-api-headers->glibc->binutils->gcc->binutils->glibc
+# toolchain build order: {kernel}-api-headers->glibc->binutils->gcc->binutils->glibc
 
 # toolchain (for cross-compiler) build order:
 #  {kernel}-api-headers(host system)->glibc(host system)
@@ -125,26 +122,30 @@ fi
 
 _pkgname=gcc
 pkgname=$_target-$_pkgname
-makedepends=('binutils>=2.24' 'libmpc' 'cloog' 'doxygen')
-pkgver=4.9.1
+pkgver=4.9.2
 _pkgver=4.9
-pkgrel=2.1
-_snapshot=4.9-20140903
+_islver=0.12.2
+_cloogver=0.18.1
+pkgrel=1
+#_snapshot=4.9-20140903
 pkgdesc="The GNU Compiler Collection"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL' 'custom')
 url="http://$_pkgname.gnu.org"
+makedepends=('binutils>=2.24' 'libmpc' 'doxygen')
 checkdepends=('dejagnu' 'inetutils')
 options=('!emptydirs')
-source=(#ftp://$_pkgname.gnu.org/pub/$_pkgname/releases/$_pkgname-${pkgver}/$_pkgname-${pkgver}.tar.bz2
-        ftp://$_pkgname.gnu.org/pub/$_pkgname/snapshots/${_snapshot}/$_pkgname-${_snapshot}.tar.bz2
+source=(ftp://$_pkgname.gnu.org/pub/$_pkgname/releases/$_pkgname-${pkgver}/$_pkgname-${pkgver}.tar.bz2
+        #ftp://$_pkgname.gnu.org/pub/$_pkgname/snapshots/${_snapshot}/$_pkgname-${_snapshot}.tar.bz2
+        http://isl.gforge.inria.fr/isl-${_islver}.tar.bz2
+        http://www.bastoul.net/cloog/pages/download/cloog-${_cloogver}.tar.gz
         $_pkgname-4.8-filename-output.patch
-        $_pkgname-4.9-isl-0.13-hack.patch
         $_pkgname-xtensa.patch::https://raw.githubusercontent.com/qca/open-ath9k-htc-firmware/1.3.2/local/patches/$_pkgname.patch
         mips-kfreebsd-gnu.patch)
-md5sums=('24dfd67139fda4746d2deff18182611d'
-         '40cb437805e2f7a006aa0d0c3098ab0f'
-         'f26ae06b9cbc8abe86f5ee4dc5737da8'
+md5sums=('4df8ee253b7f3863ad0b86359cd39c43'
+         'e039bfcfb6c2ab039b8ee69bf883e824'
+         'e34fca0540d840e5d0f6427e98c92252'
+         '6810bb9b2252f03e6c98d9a671d94589'
          '81372ee980289a9f6df01dad31c64a63'
          '43282cddb2080b1180f7b76d3a8a832c')
 
@@ -159,6 +160,10 @@ _libdir="usr/lib/$_pkgname/$_target/$pkgver"
 prepare() {
   cd ${srcdir}/${_basedir}
 
+  # link isl/cloog for in-tree builds
+  ln -s ../isl-${_islver} isl
+  ln -s ../cloog-${_cloogver} cloog
+
   # Do not run fixincludes
   sed -i 's@\./fixinc\.sh@-c true@' $_pkgname/Makefile.in
 
@@ -171,11 +176,8 @@ prepare() {
   sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,$_pkgname}/configure
 
   # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57653
-  patch -p0 -i ${srcdir}/$_pkgname-4.8-filename-output.patch
-
-  # isl-0.13 support - mostly header includes and a function rename
-  # (which does not seem right but causes no testsuite failures...)
-  patch -p1 -i ${srcdir}/$_pkgname-4.9-isl-0.13-hack.patch
+  # https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=9140d56f
+  patch -p1 -i ${srcdir}/$_pkgname-4.8-filename-output.patch
 
   # open-ath9k-htc-firmware patch on xtensa-unknown-elf
   [[ $_target == xtensa-unknown-elf ]] && patch -p1 -i ${srcdir}/$_pkgname-xtensa.patch
@@ -195,45 +197,29 @@ build() {
   CFLAGS=${CFLAGS/-pipe/}
   CXXFLAGS=${CXXFLAGS/-pipe/}
 
-  if [[ $_target == xtensa-unknown-elf ]]; then
-    ${srcdir}/${_basedir}/configure --prefix=/usr \
-        --libdir=/usr/lib --libexecdir=/usr/lib \
-        --mandir=/usr/share/man --infodir=/usr/share/info \
-        --with-bugurl=https://labs.parabola.nu/ \
-        --disable-nls \
-        --disable-shared \
-        --disable-threads \
-        --enable-languages=c \
-        --disable-libquadmath \
-        --disable-libssp \
-        --with-newlib \
-        --disable-multilib --disable-werror \
-        --target=$_target --program-prefix=$_target-
-  else
-    ${srcdir}/${_basedir}/configure --prefix=/usr \
-        --libdir=/usr/lib --libexecdir=/usr/lib \
-        --mandir=/usr/share/man --infodir=/usr/share/info \
-        --with-bugurl=https://labs.parabola.nu/ \
-        --enable-languages=c,c++,lto --disable-static \
-        --enable-shared --enable-threads=posix \
-        --with-system-zlib --enable-__cxa_atexit \
-        --disable-libunwind-exceptions --enable-clocale=gnu \
-        --disable-libstdcxx-pch --disable-libssp \
-        --enable-gnu-unique-object --enable-linker-build-id \
-        --enable-cloog-backend=isl \
-        --disable-isl-version-check --disable-cloog-version-check \
-        --enable-lto --enable-plugin --enable-install-libiberty \
-        --with-linker-hash-style=gnu \
-        --disable-multilib --disable-werror \
-        --enable-checking=release --target=$_target --program-prefix=$_target-
-  fi
+  ${srcdir}/${_basedir}/configure --prefix=/usr \
+      --libdir=/usr/lib --libexecdir=/usr/lib \
+      --mandir=/usr/share/man --infodir=/usr/share/info \
+      --with-bugurl=https://labs.parabola.nu/ \
+      --enable-languages=c,c++,lto --disable-static \
+      --enable-shared --enable-threads=posix \
+      --with-system-zlib --enable-__cxa_atexit \
+      --disable-libunwind-exceptions --enable-clocale=gnu \
+      --disable-libstdcxx-pch --disable-libssp \
+      --enable-gnu-unique-object --enable-linker-build-id \
+      --enable-cloog-backend=isl \
+      --enable-lto --enable-plugin --enable-install-libiberty \
+      --with-linker-hash-style=gnu \
+      --disable-multilib --disable-werror \
+      --enable-checking=release --target=$_target --program-prefix=$_target-
   make all-$_pkgname
 }
 
 package() {
   pkgdesc="The GNU Compiler Collection - C and C++ frontends"
-  depends=("$_target-binutils>=2.24" 'libmpc' 'cloog')
+  depends=("$_target-binutils>=2.24" 'libmpc')
   groups=('cross-devel')
+  options=('staticlibs')
   provides=("$_pkgname=$pkgver")
   conflicts=("$_pkgname" "$_pkgname-ada" "$_pkgname-fortran" "$_pkgname-go" "$_pkgname-objc")
   install=$_pkgname.install
@@ -244,11 +230,7 @@ package() {
     c++.install-common install-headers install-plugin install-lto-wrapper
 
   install -m755 $_pkgname/gcov $pkgdir/usr/bin/
-  if [[ $_target == xtensa-unknown-elf ]]; then
-    install -m755 -t $pkgdir/${_libdir}/ $_pkgname/{cc1,collect2,lto1}
-  else
-    install -m755 -t $pkgdir/${_libdir}/ $_pkgname/{cc1,cc1plus,collect2,lto1}
-  fi
+  install -m755 -t $pkgdir/${_libdir}/ $_pkgname/{cc1,cc1plus,collect2,lto1}
 
   make DESTDIR=${pkgdir} install-fixincludes
   make -C $_pkgname DESTDIR=${pkgdir} install-mkheaders
diff --git a/cross/cross-gcc/gcc-4.8-filename-output.patch b/cross/cross-gcc/gcc-4.8-filename-output.patch
index 6951eb239..7c2ee0aa5 100644
--- a/cross/cross-gcc/gcc-4.8-filename-output.patch
+++ b/cross/cross-gcc/gcc-4.8-filename-output.patch
@@ -1,17 +1,17 @@
---- gcc/c-family/c-opts.c       (revision 200330)
-+++ gcc/c-family/c-opts.c       (working copy)
-@@ -1338,10 +1338,14 @@ c_finish_options (void)
-
- /* Give CPP the next file given by -include, if any.  */
+diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c
+index 968b703..3f8e6e6 100644
+--- a/gcc/c-family/c-opts.c
++++ b/gcc/c-family/c-opts.c
+@@ -1438,6 +1438,12 @@ c_finish_options (void)
  static void
  push_command_line_include (void)
  {
-+  // This can happen if disabled by -imacros for example.
++  /* This can happen if disabled by -imacros for example.
++     Punt so that we don't set "<command-line>" as the filename for
++     the header.  */
 +  if (include_cursor > deferred_count)
 +    return;
 +
    if (!done_preinclude)
      {
        done_preinclude = true;
-       if (flag_hosted && std_inc && !cpp_opts->preprocessed)
-        {