Update to 6.2.1-1

1 files changed, 38 insertions, 148 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 436dbe4812f1..4ad9682dd990 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,173 +1,63 @@
-# Maintainer: Márcio Silva (Parabola) <coadde@parabola.nu>
 # Maintainer (Arch): Allan McRae <allan@archlinux.org>
+# Maintainer: André Silva <emulatorman@parabola.nu>
+# Maintainer: Márcio Silva <coadde@parabola.nu>
 
-# 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)
-# ->binutils(host system)->gcc(host system)->binutils(host system)->glibc(host system)
-# ->binutils(cross)->gcc(cross)
-# ->kernel-api-headers(target system)->glibc(target system)
-# ->binutils(target system)->gcc(target system)->binutils(target system)
-# ->glibc(target system)
-
-# NOTE: libtool requires rebuilt with each new gcc version
-
-#--------------------------------------------------------------------------------
-#  cross-compile table
-#--------------------------------------------------------------------------------
-
-# +-------------+-------------+-----------------------------------------------------------------------------------------------------+-----------+---------+
-# | -march      | CARCH       | CTARGET (_CTARGET)                                                                                  | Multilib  | QEMU    |
-# +-------------+-------------+-------------+-----------+---------------------------------------------------------------------------+-----------+---------+
-# | _march      | CARCH       | _arch       | <machine> | _os_target (GNU/*)                                                        | _multilib | -       |
-# +-------------+-------------+-------------+-----------+---------------------------------------------------------------------------+-----------+---------+
-# | x86_64      | x86_64      | x86_64      | unknown   | {linux,kfreebsd,kopenbsd,knetbsd,kdragonflybsd,kopensolaris}-gnu|elf      | yes       | bin/sys |
-# | i[3-7]86    | i[3-7]86    | i[3-7]86    | pc        | gnu|{linux,kfreebsd,kopenbsd,knetbsd,kopensolaris}-gnu|elf                | no        | bin/sys |
-# | armv8-a     | aarch64     | aarch64     | unknown   | {linux,kfreebsd,knetbsd}-gnu|elf                                          | no        | bin/sys |
-# | armv8-a     | aarch64_be  | aarch64_be  | unknown   | {linux,kfreebsd,knetbsd}-gnu|elf                                          | no        | bin/sys |
-# | armv7-a     | armv7h      | armv7l      | unknown   | {linux,kfreebsd,kopenbsd,knetbsd,kopensolaris}-gnueabihf|elf              | no        | bin/sys |
-# | armv6       | armv6h      | armv6l      | unknown   | {linux,kfreebsd,kopenbsd,knetbsd,kopensolaris}-gnueabihf|elf              | no        | bin/sys |
-# | armv5te     | arm         | armv5tel    | unknown   | {linux,kfreebsd,kopenbsd,knetbsd,kopensolaris}-gnueabi                    | no        | bin/sys |
-# | *           | arm         | arm         | unknown   | eabi                                                                      | no        | bin/sys |
-# | arm         | armeb       | armeb       | unknown   | {linux,kfreebsd,kopenbsd,knetbsd}-gnueabi|eabi                            | no        | bin     |
-# | mips64el    | mips64el    | mips64el    | unknown   | {linux,kfreebsd,kopenbsd,knetbsd}-gnu|elf                                 | no        | bin/sys |
-# | mips64      | mips64      | mips64      | unknown   | {linux,kfreebsd,kopenbsd,knetbsd}-gnu|elf                                 | no        | bin/sys |
-# | *           | mipsel      | mipsel      | unknown   | {linux,kfreebsd,kopenbsd,knetbsd}-gnu|elf                                 | no        | bin/sys |
-# | *           | mips        | mips        | unknown   | {linux,kfreebsd,kopenbsd,knetbsd}-gnu|elf                                 | no        | bin/sys |
-#v| powerpc64   | powerpc64   | powerpc64   | unknown   | {linux,kfreebsd,kopenbsd,knetbsd}-gnu{,eabi}|{elf,eabi}                   | no        | bin/sys |x|eabi
-#x| powerpc64le | powerpc64le | powerpc64le | unknown   | {linux,kfreebsd,kopenbsd,knetbsd}-gnu{,eabi}|{elf,eabi}                   | no        | bin     |
-# | powerpc     | powerpc     | powerpc     | unknown   | {linux,kfreebsd,kopenbsd,knetbsd}-gnu{,eabi}|{elf,eabi}                   | no        | bin/sys |
-# | powerpcle   | powerpcle   | powerpcle   | unknown   | {linux,kfreebsd,kopenbsd,knetbsd}-gnu{,eabi}|{elf,eabi}                   | no        | -       |
-# | -           | spu         | spu         | unknown   | elf                                                                       | no        | -       |
-# | -           | sh64        | sh64        | unknown   | {linux,kopenbsd,knetbsd}-gnu|elf                                          | no        | -       |
-# | -           | sh64le      | sh64le      | unknown   | {linux,kopenbsd,knetbsd}-gnu|elf                                          | no        | -       |
-# | -           | sh4         | sh4         | unknown   | {linux,kopenbsd,knetbsd}-gnu|elf                                          | no        | bin/sys |
-# | -           | sh4le       | sh4le       | unknown   | {linux,kopenbsd,knetbsd}-gnu|elf                                          | no        | bin/sys |
-# | -           | sh          | sh          | unknown   | {linux,kopenbsd,knetbsd}-gnu|elf                                          | no        | - @     |
-# | -           | shle        | shle        | unknown   | {linux,kopenbsd,knetbsd}-gnu|elf                                          | no        | - @     |
-# | -           | m68k        | m68k        | unknown   | gnu|{linux,knetbsd}-gnu|elf                                               | no        | bin/sys |
-# | -           | avr         | avr         | unknown   | linux-gnu|elf                                                             | no        | -       |
-# | -           | xtensa      | xtensa      | unknown   | linux-gnu|elf                                                             | no        | sys     |
-# | -           | lm32        | lm32        | unknown   | linux-gnu|elf                                                             | no        | sys     |
-# | -           | or32        | or32        | unknown   | linux-gnu|elf                                                             | no        | bin/sys |x|linux-gnu
-# +-------------+-------------+-------------+-----------+---------------------------------------------------------------------------+-----------+---------+
-
-# For "Wine, Darling and DOSBox"
-# +-------------+-------------+-------------+-----------+---------------------------------------------------------------------------+-----------+---------+
-# | x86_64      | x86_64      | x86_64      | unknown   | mingw64(Wine)|darwin                                                      | yes       | bin/sys |
-# | i[3-7]86    | i[3-7]86    | i[3-7]86    | pc        | mingw32(Wine)|msdosdjgpp(DOSBox)|darwin                                   | no        | bin/sys |
-# | armv7-a     | armv7h      | armv7l      | unknown   | mingw-arm(Wine)|darwin                                                    | no        | bin/sys |
-# | powerpc     | powerpc     | powerpc     | unknown   | darwin                                                                    | no        | bin/sys |
-# +-------------+-------------+-------------+-----------+---------------------------------------------------------------------------+-----------+---------+
-
-# opt : Multilib is optional
-# * : Any supported by architecture.
-# - : None.
-# @ : bin/sys (Only sh4 and sh4l support)
-# < : experimental support. (future)
-
-#--------------------------------------------------------------------------------
-# options
-#--------------------------------------------------------------------------------
-
-# Hardware architecture:
-
-# options: "same", "x86_64", "i686", "armv7l" or "xtensa"
-_arch_target=xtensa
-
-# OS target:
-
-# system: <os> or <kernel>-<os>
-# options: "gnu", "linux-gnu", "linux-gnueabihf" or "elf"
-_os_target=elf
-
-#--------------------------------------------------------------------------------
-# variables
-#--------------------------------------------------------------------------------
-
-# set the default values if it's not added
-[[ -z $_arch_target ]] && _arch_target=same
-[[ -z $_os_target ]] && _os_target=linux-gnu
-
-# set the value on _arch variable 
-if [[ $_arch_target == same ]]; then
-  _arch=$CARCH
-else
-  _arch=$_arch_target
-fi
-
-# set the value on _target variable
-if [[ $_arch == i686 ]]; then
-  _target=$_arch-pc-$_os_target
-else
-  _target=$_arch-unknown-$_os_target
-fi
-
-#--------------------------------------------------------------------------------
-
-_pkgname=gcc
-pkgname=$_target-$_pkgname
-pkgver=6.1.1
+pkgname=xtensa-unknown-elf-gcc
+pkgver=6.2.1
+_pkgverpatch=$pkgver
 _pkgver=6
 _islver=0.16.1
-pkgrel=4
-_commit=c8454ab1
+pkgrel=1
+_commit=c2103c17
 pkgdesc="The GNU Compiler Collection"
-arch=('i686' 'x86_64' 'armv7h' 'aarch64' 'mips64el')
+arch=('i686' 'x86_64' 'armv7h')
 license=('GPL' 'LGPL' 'FDL' 'custom')
-url="http://$_pkgname.gnu.org"
+url="http://gcc.gnu.org"
 makedepends=('binutils>=2.26' 'libmpc' 'doxygen' 'git')
 checkdepends=('dejagnu' 'inetutils')
 options=('!emptydirs')
-source=(git://$_pkgname.gnu.org/git/$_pkgname.git#commit=${_commit}
+source=(git://gcc.gnu.org/git/gcc.git#commit=${_commit}
         http://isl.gforge.inria.fr/isl-${_islver}.tar.bz2
-        $_pkgname-xtensa.patch::https://raw.githubusercontent.com/qca/open-ath9k-htc-firmware/1.3.2/local/patches/$_pkgname.patch
-        mips-kfreebsd-gnu.patch)
+        https://repo.parabola.nu/other/gcc/$_pkgverpatch/gcc-xtensa.patch)
 md5sums=('SKIP'
          'ac1f25a0677912952718a51f5bc20f32'
-         '81372ee980289a9f6df01dad31c64a63'
-         '43282cddb2080b1180f7b76d3a8a832c')
+         '5e0f13db1555fd3f70da9642ab180386')
 
 # gcc-6.0 forces a changed triplet - need to address in pacman/devtools
 [[ $CARCH == "x86_64" ]] && CHOST=x86_64-pc-linux-gnu
 
-_libdir="usr/lib/$_pkgname/$_target/$pkgver"
+_libdir="usr/lib/gcc/xtensa-unknown-elf/$pkgver"
 
 prepare() {
-  cd ${srcdir}/${_pkgname}
+  cd ${srcdir}/gcc
 
   # link isl for in-tree build
   ln -s ../isl-${_islver} isl
 
   # Do not run fixincludes
-  sed -i 's@\./fixinc\.sh@-c true@' $_pkgname/Makefile.in
+  sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
 
   # Parabola installs x86_64 libraries /lib
-  [[ $CARCH == "x86_64" ]] && sed -i '/m64=/s/lib64/lib/' $_pkgname/config/i386/t-linux64
+  [[ $CARCH == "x86_64" ]] && sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64
 
   # hack! - some configure tests for header files using "$CPP $CPPFLAGS"
-  sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,$_pkgname}/configure
+  sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure
 
-  # open-ath9k-htc-firmware patch on xtensa-unknown-elf
-  [[ $_target == xtensa-unknown-elf ]] && patch -p1 -i ${srcdir}/$_pkgname-xtensa.patch
+  # open-ath9k-htc-firmware patch
+  patch -p1 -i ${srcdir}/gcc-xtensa.patch
 
-  # mips patch on kfreebsd-gnu
-  [[ $_target == mips64el-unknown-kfreebsd-gnu ]] && \
-    patch -p1 -i ${srcdir}/mips-kfreebsd-gnu.patch
-
-  mkdir ${srcdir}/$_pkgname-build
+  mkdir ${srcdir}/gcc-build
 }
 
 build() {
-  cd ${srcdir}/$_pkgname-build
+  cd ${srcdir}/gcc-build
 
   # using -pipe causes spurious test-suite failures
   # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48565
   CFLAGS=${CFLAGS/-pipe/}
   CXXFLAGS=${CXXFLAGS/-pipe/}
 
-  ${srcdir}/${_pkgname}/configure --prefix=/usr \
+  ${srcdir}/gcc/configure --prefix=/usr \
       --libdir=/usr/lib --libexecdir=/usr/lib \
       --mandir=/usr/share/man \
       --with-bugurl=https://labs.parabola.nu/ \
@@ -181,38 +71,38 @@ build() {
       --with-linker-hash-style=gnu --enable-gnu-indirect-function \
       --disable-multilib --disable-werror \
       --enable-checking=release --disable-nls \
-      --target=$_target
-  make all-$_pkgname
+      --target=xtensa-unknown-elf
+  make all-gcc
 }
 
 package() {
   pkgdesc="The GNU Compiler Collection - C and C++ frontends"
-  depends=("$_target-binutils>=2.26" 'libmpc')
+  depends=("xtensa-unknown-elf-binutils>=2.26" 'libmpc')
   groups=('cross-devel')
   options=('staticlibs')
 
-  cd ${srcdir}/$_pkgname-build
+  cd ${srcdir}/gcc-build
 
-  make -C $_pkgname DESTDIR=${pkgdir} install-driver install-cpp install-$_pkgname-ar \
+  make -C gcc DESTDIR=${pkgdir} install-driver install-cpp install-gcc-ar \
     c++.install-common install-headers install-plugin install-lto-wrapper
 
-  install -m755 $_pkgname/gcov $pkgdir/usr/bin/$_target-gcov
-  install -m755 -t $pkgdir/${_libdir}/ $_pkgname/{cc1,cc1plus,collect2,lto1}
+  install -m755 gcc/gcov $pkgdir/usr/bin/xtensa-unknown-elf-gcov
+  install -m755 -t $pkgdir/${_libdir}/ gcc/{cc1,cc1plus,collect2,lto1}
 
   make DESTDIR=${pkgdir} install-fixincludes
-  make -C $_pkgname DESTDIR=${pkgdir} install-mkheaders
+  make -C gcc DESTDIR=${pkgdir} install-mkheaders
   make -C lto-plugin DESTDIR=${pkgdir} install
 
-  make -C $_pkgname DESTDIR=${pkgdir} install-man
+  make -C gcc DESTDIR=${pkgdir} install-man
 
   make -C libcpp DESTDIR=${pkgdir} install
-  make -C $_pkgname DESTDIR=${pkgdir} install-po
+  make -C gcc DESTDIR=${pkgdir} install-po
 
   # many packages expect this symlink
-  ln -s $_target-$_pkgname ${pkgdir}/usr/bin/$_target-cc
+  ln -s xtensa-unknown-elf-gcc ${pkgdir}/usr/bin/xtensa-unknown-elf-cc
 
   # POSIX conformance launcher scripts for c89 and c99
-  cat > $pkgdir/usr/bin/$_target-c89 <<"EOF"
+  cat > $pkgdir/usr/bin/xtensa-unknown-elf-c89 <<"EOF"
 #!/bin/sh
 fl="-std=c89"
 for opt; do
@@ -224,9 +114,9 @@ for opt; do
 done
 exec gcc $fl ${1+"$@"}
 EOF
-sed -i "s|exec gcc|exec $_target-gcc|" $pkgdir/usr/bin/$_target-c89
+sed -i "s|exec gcc|exec xtensa-unknown-elf-gcc|" $pkgdir/usr/bin/xtensa-unknown-elf-c89
 
-  cat > $pkgdir/usr/bin/$_target-c99 <<"EOF"
+  cat > $pkgdir/usr/bin/xtensa-unknown-elf-c99 <<"EOF"
 #!/bin/sh
 fl="-std=c99"
 for opt; do
@@ -238,9 +128,9 @@ for opt; do
 done
 exec gcc $fl ${1+"$@"}
 EOF
-sed -i "s|exec gcc|exec $_target-gcc|" $pkgdir/usr/bin/$_target-c99
+sed -i "s|exec gcc|exec xtensa-unknown-elf-gcc|" $pkgdir/usr/bin/xtensa-unknown-elf-c99
 
-  chmod 755 $pkgdir/usr/bin/$_target-c{8,9}9
+  chmod 755 $pkgdir/usr/bin/xtensa-unknown-elf-c{8,9}9
 
   # Remove man documents that conflict with host version
   rm -rf ${pkgdir}/usr/share/man/man7