Update to 11.1.0, add new mabi32.patch

3 files changed, 47 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e9ffaad98f74..15555db5b0c3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
 pkgbase = mips64-elf-gcc-stage1
 	pkgdesc = The GNU Compiler Collection. Stage 1 for toolchain building (mips64-elf)
-	pkgver = 10.2.0
+	pkgver = 11.1.0
 	pkgrel = 1
 	url = http://www.gnu.org/software/gcc/
 	arch = x86_64
 	license = GPL
 	license = LGPL
 	license = FDL
+	license = custom
 	makedepends = gmp
 	makedepends = mpfr
 	makedepends = mips64-elf-binutils
@@ -14,13 +15,13 @@ pkgbase = mips64-elf-gcc-stage1
 	depends = zstd
 	optdepends = mips64-elf-newlib: Standard C library optimized for embedded systems
 	options = !emptydirs
+	options = !distcc
 	options = !strip
-	source = http://gcc.gnu.org/pub/gcc/releases/gcc-10.2.0/gcc-10.2.0.tar.xz
-	source = http://isl.gforge.inria.fr/isl-0.22.tar.xz
+	source = http://gcc.gnu.org/pub/gcc/releases/gcc-11.1.0/gcc-11.1.0.tar.xz
+	source = http://isl.gforge.inria.fr/isl-0.24.tar.xz
 	source = mabi32.patch
-	sha256sums = b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c
-	sha256sums = 6c8bc56c477affecba9c59e2c9f026967ac8bad01b51bdd07916db40a517b9fa
-	sha256sums = 368e2287adba14718dbd84dc75b2a7a2f65cb907e988b56813640ea8d9d2e951
+	sha256sums = 4c4a6fb8a8396059241c2e674b85b351c26a5d678274007f076957afa1cc9ddf
+	sha256sums = 043105cc544f416b48736fff8caf077fb0663a717d06b1113f16e391ac99ebad
+	sha256sums = 86c06dfb12295e665204441ca17440d4e597da24b6cffad052c94268ec562169
 
 pkgname = mips64-elf-gcc-stage1
-
diff --git a/PKGBUILD b/PKGBUILD
index 4b720c35caff..91d0b0f0da2e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,23 +3,23 @@
 
 _target=mips64-elf
 pkgname=${_target}-gcc-stage1
-pkgver=10.2.0
-_islver=0.22
+pkgver=11.1.0
+_islver=0.24
 pkgrel=1
 pkgdesc="The GNU Compiler Collection. Stage 1 for toolchain building (${_target})"
 arch=('x86_64')
-license=('GPL' 'LGPL' 'FDL')
+license=('GPL' 'LGPL' 'FDL' 'custom')
 url="http://www.gnu.org/software/gcc/"
 depends=('libmpc' 'zstd' )
 makedepends=('gmp' 'mpfr' "${_target}-binutils")
 optdepends=("${_target}-newlib: Standard C library optimized for embedded systems")
-options=('!emptydirs' '!strip' )
+options=('!emptydirs' '!distcc' '!strip')
 source=("http://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.xz"
-		"http://isl.gforge.inria.fr/isl-${_islver}.tar.xz"
-    "mabi32.patch")
-sha256sums=('b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c'
-            '6c8bc56c477affecba9c59e2c9f026967ac8bad01b51bdd07916db40a517b9fa'
-            '368e2287adba14718dbd84dc75b2a7a2f65cb907e988b56813640ea8d9d2e951')
+        "http://isl.gforge.inria.fr/isl-${_islver}.tar.xz"
+        "mabi32.patch")
+sha256sums=('4c4a6fb8a8396059241c2e674b85b351c26a5d678274007f076957afa1cc9ddf'
+            '043105cc544f416b48736fff8caf077fb0663a717d06b1113f16e391ac99ebad'
+            '86c06dfb12295e665204441ca17440d4e597da24b6cffad052c94268ec562169')
 
 prepare() {
   cd gcc-${pkgver}
@@ -27,28 +27,31 @@ prepare() {
   # link isl for in-tree builds
   ln -s ../isl-$_islver isl
 
-  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/" {libiberty,gcc}/configure
 
-  mkdir "${srcdir}"/build-gcc
-
   # patch multilib support for mabi=32
-  patch --strip=2 --input=${srcdir}/mabi32.patch
+  patch --strip=1 --input="${srcdir}"/mabi32.patch
 }
 
 build() {
+  mkdir -p "${srcdir}"/build-gcc
   cd build-gcc
 
   export CFLAGS_FOR_TARGET="-G0 -Os -pipe"
   export CXXFLAGS_FOR_TARGET="-G0 -Os -pipe"
 
+  CFLAGS=${CFLAGS/-Werror=format-security/}
+  CXXFLAGS=${CXXFLAGS/-Werror=format-security/}
+
   "${srcdir}"/gcc-${pkgver}/configure \
     --prefix=/usr \
     --target=${_target} \
-    --host=$CHOST \
-    --build=$CHOST \
+    --host="$CHOST" \
+    --build="$CHOST" \
     --with-arch=from-abi \
     --with-sysroot=/usr/${_target} \
     --libdir=/usr/lib \
diff --git a/mabi32.patch b/mabi32.patch
index 81739892878f..24db8400be2f 100644
--- a/mabi32.patch
+++ b/mabi32.patch
@@ -1,12 +1,27 @@
-diff -aur src.pristine/gcc-9.1.0/gcc/config/mips/t-elf src.new/gcc-9.1.0/gcc/config/mips/t-elf
---- src.pristine/gcc-9.1.0/gcc/config/mips/t-elf	2019-06-18 22:52:15.188659537 -0400
-+++ src.new/gcc-9.1.0/gcc/config/mips/t-elf	2019-06-22 22:19:42.534512297 -0400
+From 033954dcc80fc17abaaebe817a4ba5c807be8e27 Mon Sep 17 00:00:00 2001
+From: Joey Dumont <joey.dumont@gmail.com>
+Date: Wed, 9 Jun 2021 07:59:57 -0400
+Subject: [PATCH] Enable building for the 32-bit ABI, and remove the soft-float
+ variants.
+
+---
+ gcc/config/mips/t-elf | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/gcc/config/mips/t-elf b/gcc/config/mips/t-elf
+index 4df281b62..5acc93782 100644
+--- a/gcc/config/mips/t-elf
++++ b/gcc/config/mips/t-elf
 @@ -18,6 +18,6 @@
  
  # Build the libraries for both hard and soft floating point
  
 -MULTILIB_OPTIONS = msoft-float EL/EB
 -MULTILIB_DIRNAMES = soft-float el eb
-+MULTILIB_OPTIONS = mabi=32 msoft-float EL/EB
-+MULTILIB_DIRNAMES = 32 soft-float el eb
- MULTILIB_MATCHES = EL=mel EB=meb msingle-float=m4650
+-MULTILIB_MATCHES = EL=mel EB=meb msingle-float=m4650
++MULTILIB_OPTIONS = mabi=32 EL/EB
++MULTILIB_DIRNAMES = 32 el eb
++MULTILIB_MATCHES = EL=mel EB=meb
+-- 
+2.32.0
+