From 9e57632befb687e0d5306af47dabcec19cb5d50e Mon Sep 17 00:00:00 2001
From: Chris Johns <chrisj@rtems.org>
Date: Fri, 24 Nov 2023 15:32:58 +1100
Subject: 6: Fix gcc-13 support for MacOS

Update #4921
---
 bare/config/devel/gmp-6.2.1.cfg                   | 11 +++++++++-
 bare/config/devel/gmp-6.3.0.cfg                   | 18 ++++++++++++++++
 rtems/config/6/rtems-default.bset                 |  2 +-
 rtems/config/tools/rtems-gcc-13.2-newlib-head.cfg |  2 +-
 source-builder/config/gcc-13.cfg                  | 26 +++++++++++++++++++++++
 source-builder/config/gmp.cfg                     | 17 +++++++++------
 6 files changed, 67 insertions(+), 9 deletions(-)
 create mode 100644 bare/config/devel/gmp-6.3.0.cfg
 create mode 100644 source-builder/config/gcc-13.cfg

diff --git a/bare/config/devel/gmp-6.2.1.cfg b/bare/config/devel/gmp-6.2.1.cfg
index 1ab620c..19c5930 100644
--- a/bare/config/devel/gmp-6.2.1.cfg
+++ b/bare/config/devel/gmp-6.2.1.cfg
@@ -8,8 +8,17 @@
 
 %include %{_configdir}/base.cfg
 
+%define gmp_url https://gcc.gnu.org/pub/gcc/infrastructure
 %define gmp_version 6.2.1
-%hash sha512 gmp-%{gmp_version}.tar.bz2 8904334a3bcc5c896ececabc75cda9dec642e401fb5397c4992c4fabea5e962c9ce8bd44e8e4233c34e55c8010cc28db0545f5f750cbdbb5f00af538dc763be9
+%hash sha512 gmp-%{gmp_version}.tar.bz2 \
+        iQQzSjvMXIluzsq8dc2p3sZC5AH7U5fEmSxPq+peliyc6L1E6OQjPDTlXIAQzCjbBUX191DL27XwCvU43HY76Q==
+
+#
+# Do not use assembler if MacOS AARCH64
+#
+%if %{_host_os} == darwin && %{_host_arch} == arm64
+ %define gmp_extra_options --disable-assembly
+%endif
 
 #
 # The GMP build instructions.
diff --git a/bare/config/devel/gmp-6.3.0.cfg b/bare/config/devel/gmp-6.3.0.cfg
new file mode 100644
index 0000000..09e85b6
--- /dev/null
+++ b/bare/config/devel/gmp-6.3.0.cfg
@@ -0,0 +1,18 @@
+#
+# GMP 6.3.0
+#
+
+%if %{release} == %{nil}
+%define release 1
+%endif
+
+%include %{_configdir}/base.cfg
+
+%define gmp_version 6.3.0
+%hash sha512 gmp-%{gmp_version}.tar.bz2 \
+       O2hMm8ue3it+VNC6TJdkv6F8INTzAAAXxVO28eE1tTaUlYD/NzQWgMJdwjbP4LoduM/f5hnOATZWGJ7whxuJ+A==
+
+#
+# The GMP build instructions.
+#
+%include %{_configdir}/gmp.cfg
diff --git a/rtems/config/6/rtems-default.bset b/rtems/config/6/rtems-default.bset
index b702275..2d7a223 100644
--- a/rtems/config/6/rtems-default.bset
+++ b/rtems/config/6/rtems-default.bset
@@ -11,7 +11,7 @@
 #
 %defineifnot with_rtems_dtc      devel/dtc-1.6.1-1
 %defineifnot with_rtems_expat    devel/expat-2.5.0-1
-%defineifnot with_rtems_gmp      devel/gmp-6.2.1
+%defineifnot with_rtems_gmp      devel/gmp-6.3.0
 %defineifnot with_rtems_gdb      tools/rtems-gdb-13.2
 %defineifnot with_rtems_binutils tools/rtems-binutils-2.41
 %defineifnot with_rtems_gcc      tools/rtems-gcc-13.2-newlib-head
diff --git a/rtems/config/tools/rtems-gcc-13.2-newlib-head.cfg b/rtems/config/tools/rtems-gcc-13.2-newlib-head.cfg
index 86e0135..a8d729f 100644
--- a/rtems/config/tools/rtems-gcc-13.2-newlib-head.cfg
+++ b/rtems/config/tools/rtems-gcc-13.2-newlib-head.cfg
@@ -17,4 +17,4 @@
 %define with_plugin 0
 %define with_iconv 1
 
-%include %{_configdir}/gcc-12.cfg
+%include %{_configdir}/gcc-13.cfg
diff --git a/source-builder/config/gcc-13.cfg b/source-builder/config/gcc-13.cfg
new file mode 100644
index 0000000..19b514a
--- /dev/null
+++ b/source-builder/config/gcc-13.cfg
@@ -0,0 +1,26 @@
+#
+# GCC 13
+#
+# This configuration file configure's, make's and install's gcc. It uses
+# newlib, ISL, MPFR and MPC in a one-tree build configuration.
+#
+
+%define isl_version 0.24
+%hash sha512 isl-%{isl_version}.tar.bz2 \
+        qrO929qWuAHQ9W0oaflDFXqtUqb25qYXRe3XQCNMY1w4IxryC8PxoI1Bal6XOpDhgkkHjtjkri8dXeV2WHOOlQ==
+# See #4657
+%patch add isl -p1 https://devel.rtems.org/raw-attachment/ticket/4657/fix-mac-arm64-isl-config.patch
+%hash sha512 fix-mac-arm64-isl-config.patch \
+        wH/bYFplINGUNYUEcx5jtUAhHvaAOD8cpOxltKxDridodTT9fYGWpNvoOg7PLEKkJUxx5gnuSEp2FFc7xJmi6A==
+
+%define mpfr_version 4.2.1
+%define mpfr_url https://ftp.gnu.org/gnu/mpfr
+%hash sha512 mpfr-%{mpfr_version}.tar.bz2 \
+        yBhCUy7MZjNI3rdADZEa1xkz07Ulovnlrc0EJlycD90fIuyiKfSCcDrH8iLvIJ/J4zndH6R9cq5X9/cLIzanbw==
+
+%define mpc_version 1.3.1
+%define mpc_url https://ftp.gnu.org/gnu/mpc
+%hash sha512 mpc-%{mpc_version}.tar.gz \
+        S6tO9gdvjF39yZ2BC1EQjO1h6ilCugwcky1iQ2ClRz3yDTKzAPx28rpKoql+Hydcn9SUobqfB8TLKtfOrrGulw==
+
+%include %{_configdir}/gcc-common-1.cfg
diff --git a/source-builder/config/gmp.cfg b/source-builder/config/gmp.cfg
index 4e8d674..352caef 100644
--- a/source-builder/config/gmp.cfg
+++ b/source-builder/config/gmp.cfg
@@ -15,17 +15,22 @@ Release:   %{release}
 URL: 	   https://gmplib.org/
 
 #
-# Source
+# Allow the user to override the UURL
 #
-%source set gmp https://gcc.gnu.org/pub/gcc/infrastructure/gmp-%{gmp_version}.tar.bz2
+%if %{!defined gmp_url}
+ %define gmp_url https://gmplib.org/download/gmp
+%endif
 
-%define gmp_extra_options %{nil}
+#
+# Source
+#
+%source set gmp %{gmp_url}/gmp-%{gmp_version}.tar.bz2
 
 #
-# Do not use assembler if MacOS AARCH64
+# Allow extra options
 #
-%if %{_host_os} == darwin && %{_host_arch} == arm64
- %define gmp_extra_options %{gmp_extra_options} --disable-assembly
+%if %{!defined gmp_extra_options}
+  %define gmp_extra_options %{nil}
 %endif
 
 #
-- 
cgit v1.2.3