summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoey Dumont2019-06-22 13:11:34 -0400
committerJoey Dumont2019-06-23 19:59:20 -0400
commit2d1fb632edf72be85f14c23be8d7cb658440679a (patch)
tree18f3871f9ccaef865357013697f167c80bf52b65
parent8bbab19c5cde9b0276cdaefe4c92bb0e04a3f3c4 (diff)
downloadaur-2d1fb632edf72be85f14c23be8d7cb658440679a.tar.gz
Added mabi=32 support in multilib.
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD19
-rw-r--r--mabi32.patch12
3 files changed, 32 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9c761af0a83..3bc844c2923 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mips64-elf-gcc-stage1
pkgdesc = The GNU Compiler Collection. Stage 1 for toolchain building (mips64-elf)
- pkgver = 8.2.0
+ pkgver = 9.1.0
pkgrel = 1
url = http://www.gnu.org/software/gcc/
arch = x86_64
@@ -15,10 +15,12 @@ pkgbase = mips64-elf-gcc-stage1
optdepends = mips64-elf-newlib: Standard C library optimized for embedded systems
options = !emptydirs
options = !strip
- 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
+ source = http://gcc.gnu.org/pub/gcc/releases/gcc-9.1.0/gcc-9.1.0.tar.xz
+ source = http://isl.gforge.inria.fr/isl-0.21.tar.xz
+ source = mabi32.patch
+ sha256sums = 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
+ sha256sums = 777058852a3db9500954361e294881214f6ecd4b594c00da5eee974cd6a54960
+ sha256sums = 0e20fd943779a00c6caec8f634c9b87a7a2ebbc43265a423a6c0e7fd83be6007
pkgname = mips64-elf-gcc-stage1
diff --git a/PKGBUILD b/PKGBUILD
index 1c9c8ed9a9b..e21031f7a4e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,10 @@
#Maintainer: Simon Eriksson <simon.eriksson.1187+aur AT gmail.com>
+# Contributor: Joey Dumont <joey.dumont@gmail.com>
_target=mips64-elf
pkgname=${_target}-gcc-stage1
-pkgver=8.2.0
-_islver=0.19
+pkgver=9.1.0
+_islver=0.21
pkgrel=1
pkgdesc="The GNU Compiler Collection. Stage 1 for toolchain building (${_target})"
arch=('x86_64')
@@ -14,9 +15,11 @@ makedepends=('gmp' 'mpfr')
optdepends=("${_target}-newlib: Standard C library optimized for embedded systems")
options=('!emptydirs' '!strip' )
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')
+ "http://isl.gforge.inria.fr/isl-${_islver}.tar.xz"
+ "mabi32.patch")
+sha256sums=('79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0'
+ '777058852a3db9500954361e294881214f6ecd4b594c00da5eee974cd6a54960'
+ '368e2287adba14718dbd84dc75b2a7a2f65cb907e988b56813640ea8d9d2e951')
prepare() {
cd gcc-${pkgver}
@@ -30,6 +33,9 @@ prepare() {
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
}
build() {
@@ -43,6 +49,7 @@ build() {
--target=${_target} \
--host=$CHOST \
--build=$CHOST \
+ --with-arch=from-abi \
--with-sysroot=/usr/${_target} \
--libdir=/usr/lib \
--libexecdir=/usr/lib \
@@ -66,7 +73,7 @@ build() {
--disable-libssp \
--disable-libunwind-exceptions \
--disable-libvtv \
- --disable-multilib \
+ --enable-multilib \
--disable-nls \
--disable-shared \
--disable-threads \
diff --git a/mabi32.patch b/mabi32.patch
new file mode 100644
index 00000000000..81739892878
--- /dev/null
+++ b/mabi32.patch
@@ -0,0 +1,12 @@
+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
+@@ -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