Update to 8.2.0

2 files changed, 31 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a7c7d6d04919..9c761af0a832 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,8 @@
-# Generated by mksrcinfo v8
-# Sat Jun 24 20:34:27 UTC 2017
 pkgbase = mips64-elf-gcc-stage1
 	pkgdesc = The GNU Compiler Collection. Stage 1 for toolchain building (mips64-elf)
-	pkgver = 7.1.0
+	pkgver = 8.2.0
 	pkgrel = 1
 	url = http://www.gnu.org/software/gcc/
-	arch = i686
 	arch = x86_64
 	license = GPL
 	license = LGPL
@@ -18,8 +15,10 @@ pkgbase = mips64-elf-gcc-stage1
 	optdepends = mips64-elf-newlib: Standard C library optimized for embedded systems
 	options = !emptydirs
 	options = !strip
-	source = ftp://gcc.gnu.org/pub/gcc/releases/gcc-7.1.0/gcc-7.1.0.tar.bz2
-	sha256sums = 8a8136c235f64c6fef69cac0d73a46a1a09bb250776a050aec8f9fc880bebc17
+	source = http://gcc.gnu.org/pub/gcc/releases/gcc-8.2.0/gcc-8.2.0.tar.xz
+	source = http://isl.gforge.inria.fr/isl-0.19.tar.xz
+	sha256sums = 196c3c04ba2613f893283977e6011b2345d1cd1af9abeac58e916b1aab3e0080
+	sha256sums = 6d6c1aa00e2a6dfc509fa46d9a9dbe93af0c451e196a670577a148feecf6b8a5
 
 pkgname = mips64-elf-gcc-stage1
 
diff --git a/PKGBUILD b/PKGBUILD
index f5245aee8459..1c9c8ed9a9bb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,37 +2,49 @@
 
 _target=mips64-elf
 pkgname=${_target}-gcc-stage1
-pkgver=7.1.0
+pkgver=8.2.0
+_islver=0.19
 pkgrel=1
 pkgdesc="The GNU Compiler Collection. Stage 1 for toolchain building (${_target})"
-url="http://www.gnu.org/software/gcc/"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 license=('GPL' 'LGPL' 'FDL')
+url="http://www.gnu.org/software/gcc/"
 depends=('libmpc' 'zlib' "${_target}-binutils" )
 makedepends=('gmp' 'mpfr')
 optdepends=("${_target}-newlib: Standard C library optimized for embedded systems")
 options=('!emptydirs' '!strip' )
-source=("ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2")
-sha256sums=('8a8136c235f64c6fef69cac0d73a46a1a09bb250776a050aec8f9fc880bebc17')
+source=("http://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.xz"
+		"http://isl.gforge.inria.fr/isl-${_islver}.tar.xz")
+sha256sums=('196c3c04ba2613f893283977e6011b2345d1cd1af9abeac58e916b1aab3e0080'
+            '6d6c1aa00e2a6dfc509fa46d9a9dbe93af0c451e196a670577a148feecf6b8a5')
 
 prepare() {
   cd gcc-${pkgver}
 
-  # Hack - see native package for details
+  # link isl for in-tree builds
+  ln -s ../isl-$_islver isl
+
+  echo ${pkgver} > gcc/BASE-VER
+
+  # hack! - some configure tests for header files using "$CPP $CPPFLAGS"
   sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure
+
+  mkdir "${srcdir}"/build-gcc
 }
 
 build() {
-  rm -rf build
-  mkdir build && cd build
+  cd build-gcc
 
-  export CFLAGS_FOR_TARGET="-G0 -O2"
-  export CXXFLAGS_FOR_TARGET="-G0 -O2"
+  export CFLAGS_FOR_TARGET="-G0 -Os -pipe"
+  export CXXFLAGS_FOR_TARGET="-G0 -Os -pipe"
 
-  ../gcc-${pkgver}/configure \
-    --target=${_target} \
+  "${srcdir}"/gcc-${pkgver}/configure \
     --prefix=/usr \
+    --target=${_target} \
+    --host=$CHOST \
+    --build=$CHOST \
     --with-sysroot=/usr/${_target} \
+    --libdir=/usr/lib \
     --libexecdir=/usr/lib \
     --with-gnu-as \
     --with-gnu-ld \
@@ -59,15 +71,14 @@ build() {
     --disable-shared \
     --disable-threads \
     --disable-werror \
-    --enable-plugin \
     --enable-lto \
-    --enable-static \
+    --enable-plugin \
 
   make
 }
 
 package() {
-  cd build
+  cd build-gcc
 
   make DESTDIR="${pkgdir}" install -j1