Merge #23 and #24

core/gcc/build

@@ -1,15 +1,19 @@
 #!/bin/sh -e
 
+# Make sure gmp is built with generic options.
+cp -v gcc/gmp/configfsf.guess gcc/gmp/config.guess
+cp -v gcc/gmp/configfsf.sub gcc/gmp/config.sub
+
+# Use lib not lib64 by default.
+sed -i '/m64=/s/lib64/lib/' gcc/gcc/config/i386/t-linux64
+sed -i 's/lib64/lib/' gcc/gcc/config/i386/linux64.h
+
 # Build must happen outside of gcc source.
 mkdir -p gcc-build
 cd gcc-build
 
 export libat_cv_have_ifunc=no
 
-# Unset CFLAGS/CXXFLAGS to make 'gcc' build as generic.
-export CFLAGS=-pipe
-export CXXFLAGS=-pipe
-
 ../gcc/configure \
     --prefix=/usr \
     --disable-multilib \

core/gcc/checksums

@@ -1,2 +1,5 @@
 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0  gcc-9.1.0.tar.xz
+87b565e89a9a684fe4ebeeddb8399dce2599f9c9049854ca8c0dfbdea0e21912  gmp-6.1.2.tar.xz
+1d3be708604eae0e42d578ba93b390c2a145f17743a744d8f3f8c2ad5855a38a  mpfr-4.0.2.tar.xz
+6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e  mpc-1.1.0.tar.gz
 765614b3396d70bca3fa0ae4a813632486c6dca320e2bd13c8c39dca52be4a4c  c99

core/gcc/depends

@@ -1,8 +1,5 @@
 bison
 flex
-gmp
-mpfr
-mpc1
 zlib
 linux-headers
 binutils

core/gcc/sources

@@ -1,2 +1,5 @@
 https://gcc.gnu.org/pub/gcc/releases/gcc-9.1.0/gcc-9.1.0.tar.xz gcc
+https://gmplib.org/download/gmp/gmp-6.1.2.tar.xz gcc/gmp
+http://www.mpfr.org/mpfr-4.0.2/mpfr-4.0.2.tar.xz gcc/mpfr
+https://ftp.gnu.org/gnu/mpc/mpc-1.1.0.tar.gz gcc/mpc
 files/c99

core/gcc/version

@@ -1 +1 @@
-9.1.0 7
+9.1.0 8