From 903cab33cc8f513b307185a1394f3619519ae306 Mon Sep 17 00:00:00 2001
From: Muhammad Herdiansyah <herdiansyah@netc.eu>
Date: Mon, 15 Jul 2019 06:54:58 +0700
Subject: [PATCH 1/3] gcc: bundle gmp/mpfr/mpc build

---
 core/gcc/build     | 4 ++++
 core/gcc/checksums | 3 +++
 core/gcc/depends   | 3 ---
 core/gcc/sources   | 3 +++
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/core/gcc/build b/core/gcc/build
index 3c6daecd..88b4c7af 100755
--- a/core/gcc/build
+++ b/core/gcc/build
@@ -1,5 +1,9 @@
 #!/bin/sh -e
 
+# Make sure gmp is built with generic options.
+cp -v gmp/configfsf.guess gmp/config.guess
+cp -v gmp/configfsf.sub gmp/config.sub
+
 # Build must happen outside of gcc source.
 mkdir -p gcc-build
 cd gcc-build
diff --git a/core/gcc/checksums b/core/gcc/checksums
index 9e90df50..6a83ea2a 100644
--- a/core/gcc/checksums
+++ b/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
diff --git a/core/gcc/depends b/core/gcc/depends
index 3454ba8d..810b445d 100644
--- a/core/gcc/depends
+++ b/core/gcc/depends
@@ -1,8 +1,5 @@
 bison
 flex
-gmp
-mpfr
-mpc1
 zlib
 linux-headers
 binutils
diff --git a/core/gcc/sources b/core/gcc/sources
index 355da179..bf5899b3 100644
--- a/core/gcc/sources
+++ b/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

From d6c56f85878b3bb86459a19249f6c39c0c232b92 Mon Sep 17 00:00:00 2001
From: Muhammad Herdiansyah <herdiansyah@netc.eu>
Date: Mon, 15 Jul 2019 06:57:52 +0700
Subject: [PATCH 2/3] gcc: use lib and not lib64 by default

---
 core/gcc/build   | 4 ++++
 core/gcc/version | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/gcc/build b/core/gcc/build
index 88b4c7af..75124419 100755
--- a/core/gcc/build
+++ b/core/gcc/build
@@ -14,6 +14,10 @@ export libat_cv_have_ifunc=no
 export CFLAGS=-pipe
 export CXXFLAGS=-pipe
 
+# Use lib not lib64 by default.
+sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64
+sed -i 's/lib64/lib/' gcc/config/i386/linux64.h
+
 ../gcc/configure \
     --prefix=/usr \
     --disable-multilib \
diff --git a/core/gcc/version b/core/gcc/version
index abec7419..9c4e0d67 100644
--- a/core/gcc/version
+++ b/core/gcc/version
@@ -1 +1 @@
-9.1.0 7
+9.1.0 8

From 80f188be02777e64c1bbc90617963cdcc74f9111 Mon Sep 17 00:00:00 2001
From: Muhammad Herdiansyah <herdiansyah@netc.eu>
Date: Mon, 15 Jul 2019 10:02:52 +0700
Subject: [PATCH 3/3] gcc: various fixes

---
 core/gcc/build | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/core/gcc/build b/core/gcc/build
index 75124419..fa8b1bcc 100755
--- a/core/gcc/build
+++ b/core/gcc/build
@@ -1,8 +1,12 @@
 #!/bin/sh -e
 
 # Make sure gmp is built with generic options.
-cp -v gmp/configfsf.guess gmp/config.guess
-cp -v gmp/configfsf.sub gmp/config.sub
+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
@@ -10,14 +14,6 @@ cd gcc-build
 
 export libat_cv_have_ifunc=no
 
-# Unset CFLAGS/CXXFLAGS to make 'gcc' build as generic.
-export CFLAGS=-pipe
-export CXXFLAGS=-pipe
-
-# Use lib not lib64 by default.
-sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64
-sed -i 's/lib64/lib/' gcc/config/i386/linux64.h
-
 ../gcc/configure \
     --prefix=/usr \
     --disable-multilib \