[PATCH 2/2] 5: Use in-tree ISL libraries for GCC

[Sebastian Huber]

Close #3577.
---
 ...ib-08eab6396f678cf5e5968acaed0bae9fd129983b.cfg | 11 +---------
 ...ib-08eab6396f678cf5e5968acaed0bae9fd129983b.cfg |  6 ++++++
 source-builder/config/gcc-9.cfg                    | 24 ++++++++++++++++++++++
 3 files changed, 31 insertions(+), 10 deletions(-)
 create mode 100644 source-builder/config/gcc-9.cfg

diff --git a/rtems/config/tools/rtems-gcc-62cab5089882f91865e9040672f7932ae8d09db1-newlib-08eab6396f678cf5e5968acaed0bae9fd129983b.cfg b/rtems/config/tools/rtems-gcc-62cab5089882f91865e9040672f7932ae8d09db1-newlib-08eab6396f678cf5e5968acaed0bae9fd129983b.cfg
index 70967f8..5bbaabc 100644
--- a/rtems/config/tools/rtems-gcc-62cab5089882f91865e9040672f7932ae8d09db1-newlib-08eab6396f678cf5e5968acaed0bae9fd129983b.cfg
+++ b/rtems/config/tools/rtems-gcc-62cab5089882f91865e9040672f7932ae8d09db1-newlib-08eab6396f678cf5e5968acaed0bae9fd129983b.cfg
@@ -13,17 +13,8 @@
 %source set newlib --rsb-file=newlib-%{newlib_version}.tar.gz https://codeload.github.com/RTEMS/sourceware-mirror-newlib-cygwin/tar.gz/%{newlib_version}
 %hash sha512 newlib-%{newlib_version}.tar.gz c156de6e120ffa9f96c0ce9ea6fa84444d4be9ac12a5ce3b14bc9acbae9a882f49b055d1150dfa89fa50d9749e8da608694ca4ce24c43326e274a044ecdbd66c
 
-%define mpfr_version 3.1.4
-%hash sha512 mpfr-%{mpfr_version}.tar.bz2 51066066ff2c12ed2198605ecf68846b0c96b548adafa5b80e0c786d0df488411a5e8973358fce7192dc977ad4e68414cf14500e3c39746de62465eb145bb819
-
-%define mpc_version 1.0.3
-%hash sha512 mpc-%{mpc_version}.tar.gz 0028b76df130720c1fad7de937a0d041224806ce5ef76589f19c7b49d956071a683e2f20d154c192a231e69756b19e48208f2889b0c13950ceb7b3cfaf059a43
-
-%define gmp_version 6.1.0
-%hash sha512 gmp-%{gmp_version}.tar.bz2 3c82aeab9c1596d4da8afac2eec38e429e84f3211e1a572cf8fd2b546493c44c039b922a1133eaaa48bd7f3e11dbe795a384e21ed95cbe3ecc58d7ac02246117
-
 %define with_threads 1
 %define with_plugin 0
 %define with_iconv 1
 
-%include %{_configdir}/gcc-7.2-1.cfg
+%include %{_configdir}/gcc-9.cfg
diff --git a/rtems/config/tools/rtems-gcc-7.3.0-newlib-08eab6396f678cf5e5968acaed0bae9fd129983b.cfg b/rtems/config/tools/rtems-gcc-7.3.0-newlib-08eab6396f678cf5e5968acaed0bae9fd129983b.cfg
index ab0e92c..ec8b6d9 100644
--- a/rtems/config/tools/rtems-gcc-7.3.0-newlib-08eab6396f678cf5e5968acaed0bae9fd129983b.cfg
+++ b/rtems/config/tools/rtems-gcc-7.3.0-newlib-08eab6396f678cf5e5968acaed0bae9fd129983b.cfg
@@ -18,6 +18,12 @@
 %source set newlib --rsb-file=newlib-%{newlib_version}.tar.gz https://codeload.github.com/RTEMS/sourceware-mirror-newlib-cygwin/tar.gz/%{newlib_version}
 %hash sha512 newlib-%{newlib_version}.tar.gz c156de6e120ffa9f96c0ce9ea6fa84444d4be9ac12a5ce3b14bc9acbae9a882f49b055d1150dfa89fa50d9749e8da608694ca4ce24c43326e274a044ecdbd66c
 
+%define cloog_version 0.18.1
+%hash sha512 cloog-%{cloog_version}.tar.gz 0b12d9f3c39a2425e28e1d7c0a2b3787287fe3e6e3052f094d2ab6cffeb205ce19044100cbfd805659b3e6b3d21ac2f5a3c92848f476de54edfe6b1cbd2172e9
+
+%define isl_version 0.16.1
+%hash sha512 isl-%{isl_version}.tar.bz2 c188667a84dc5bdddb4ab7c35f89c91bf15a8171f4fcaf41301cf285fb7328846d9a367c096012fec4cc69d244f0bc9e95d84c09ec097394cd4093076f2a041b
+
 %define mpfr_version 3.1.4
 %hash sha512 mpfr-%{mpfr_version}.tar.bz2 51066066ff2c12ed2198605ecf68846b0c96b548adafa5b80e0c786d0df488411a5e8973358fce7192dc977ad4e68414cf14500e3c39746de62465eb145bb819
 
diff --git a/source-builder/config/gcc-9.cfg b/source-builder/config/gcc-9.cfg
new file mode 100644
index 0000000..b4b7f62
--- /dev/null
+++ b/source-builder/config/gcc-9.cfg
@@ -0,0 +1,24 @@
+#
+# GCC 9
+#
+# This configuration file configure's, make's and install's gcc. It uses
+# newlib, ISL, MPFR, MPC, and GMP in a one-tree build configuration.
+#
+
+%define isl_version 0.18
+%hash sha512 isl-%{isl_version}.tar.bz2 c188667a84dc5bdddb4ab7c35f89c91bf15a8171f4fcaf41301cf285fb7328846d9a367c096012fec4cc69d244f0bc9e95d84c09ec097394cd4093076f2a041b
+
+%define mpfr_version 3.1.4
+%hash sha512 mpfr-3.1.4.tar.bz2 51066066ff2c12ed2198605ecf68846b0c96b548adafa5b80e0c786d0df488411a5e8973358fce7192dc977ad4e68414cf14500e3c39746de62465eb145bb819
+
+%define mpc_version 1.0.3
+%hash sha512 mpc-1.0.3.tar.gz 0028b76df130720c1fad7de937a0d041224806ce5ef76589f19c7b49d956071a683e2f20d154c192a231e69756b19e48208f2889b0c13950ceb7b3cfaf059a43
+
+%define gmp_version 6.1.0
+%hash sha512 gmp-6.1.0.tar.bz2 3c82aeab9c1596d4da8afac2eec38e429e84f3211e1a572cf8fd2b546493c44c039b922a1133eaaa48bd7f3e11dbe795a384e21ed95cbe3ecc58d7ac02246117
+
+%source set mpc https://ftp.gnu.org/gnu/mpc/mpc-%{mpc_version}.tar.gz
+%source set gmp https://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
+%source set mpfr https://ftp.gnu.org/gnu/mpfr/mpfr-%{mpfr_version}.tar.bz2
+
+%include %{_configdir}/gcc-common-1.cfg
-- 
2.16.4