[PATCH] ISL, MPC, MPFR: fix configuration issues on ARM64/Darwin host

[Karel Gardas]

Sponsored-By:	Precidata
---
 rtems/config/tools/rtems-gcc-12-newlib-head.cfg |  7 +++++++
 rtems/patches/fix-mac-arm64-isl-config.patch    | 12 ++++++++++++
 rtems/patches/fix-mac-arm64-mpc-config.patch    | 13 +++++++++++++
 rtems/patches/fix-mac-arm64-mpfr-config.patch   | 12 ++++++++++++
 4 files changed, 44 insertions(+)
 create mode 100644 rtems/patches/fix-mac-arm64-isl-config.patch
 create mode 100644 rtems/patches/fix-mac-arm64-mpc-config.patch
 create mode 100644 rtems/patches/fix-mac-arm64-mpfr-config.patch

diff --git a/rtems/config/tools/rtems-gcc-12-newlib-head.cfg b/rtems/config/tools/rtems-gcc-12-newlib-head.cfg
index 4ea99a0..95b38c6 100644
--- a/rtems/config/tools/rtems-gcc-12-newlib-head.cfg
+++ b/rtems/config/tools/rtems-gcc-12-newlib-head.cfg
@@ -13,6 +13,13 @@
 %patch add newlib -p1 https://devel.rtems.org/raw-attachment/ticket/4510/0001-aarch64-Add-ILP32-ABI-support-in-assembly-v2.patch
 %hash sha512 0001-aarch64-Add-ILP32-ABI-support-in-assembly-v2.patch 7ca237eabfd5b382713186e1fc290dfc999a353315795ecb8dd0d22fcd1ab7f5bf31f4329954adab91ad04c100dcac0e86d406fdbce8f82cf9dc23842c88caf6
 
+%patch add isl -p1 file://fix-mac-arm64-isl-config.patch
+%hash sha512 fix-mac-arm64-isl-config.patch c07fdb605a6520d194358504731e63b540211ef680383f1ca4ec65b4ac43ae27687534fd7d8196a4dbe83a0ecf2c42a4254c71e609ee484a7614573bc499a2e8
+%patch add mpfr -p1 file://fix-mac-arm64-mpfr-config.patch
+%hash sha512 fix-mac-arm64-mpfr-config.patch dc5069df870bd02b7e78ed22c6ad9e9a2bb9ca372ce1a6b7e8fa5b7635dcef35c29f251fe5195c9c2a43513116c12cab1b0e96171cf34bd7fb7d0334c2c740fb
+%patch add mpc -p1 file://fix-mac-arm64-mpc-config.patch
+%hash sha512 fix-mac-arm64-mpc-config.patch 2849b11e360ea98e0b4d708c67723ad2d6c7bac6d1e469673f408b0111cf0278429e8bc38fd2b7538dc2d5bb0cc430c646a0fa7f0b6b105a0482a5455fadc8b9
+
 %define newlib_version 64b2081
 %define newlib_external 1
 %define newlib_expand_name sourceware-mirror-newlib-cygwin-%{newlib_version}
diff --git a/rtems/patches/fix-mac-arm64-isl-config.patch b/rtems/patches/fix-mac-arm64-isl-config.patch
new file mode 100644
index 0000000..6b8f07d
--- /dev/null
+++ b/rtems/patches/fix-mac-arm64-isl-config.patch
@@ -0,0 +1,12 @@
+--- isl/config.sub.orig	2022-05-11 07:19:04.000000000 +0200
++++ isl/config.sub	2022-05-11 07:19:26.000000000 +0200
+@@ -516,6 +516,9 @@
+ 		basic_machine=m68k-apollo
+ 		os=-bsd
+ 		;;
++	arm64-*)
++		basic_machine=aarch64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
++		;;
+ 	aros)
+ 		basic_machine=i386-pc
+ 		os=-aros
diff --git a/rtems/patches/fix-mac-arm64-mpc-config.patch b/rtems/patches/fix-mac-arm64-mpc-config.patch
new file mode 100644
index 0000000..89ea483
--- /dev/null
+++ b/rtems/patches/fix-mac-arm64-mpc-config.patch
@@ -0,0 +1,13 @@
+--- mpc/build-aux/config.sub.orig	2022-05-11 09:20:51.000000000 +0200
++++ mpc/build-aux/config.sub	2022-05-11 09:23:47.000000000 +0200
+@@ -916,6 +916,10 @@
+ 		cpu=sparc
+ 		vendor=`echo "$basic_machine" | sed 's/-.*//'`
+ 		;;
++	arm64-*)
++		cpu=aarch64
++		vendor=`echo "$basic_machine" | sed 's/-.*//'`
++		;;
+ 
+ 	*-*)
+ 		# shellcheck disable=SC2162
diff --git a/rtems/patches/fix-mac-arm64-mpfr-config.patch b/rtems/patches/fix-mac-arm64-mpfr-config.patch
new file mode 100644
index 0000000..37cec7e
--- /dev/null
+++ b/rtems/patches/fix-mac-arm64-mpfr-config.patch
@@ -0,0 +1,12 @@
+--- mpfr/config.sub.orig	2022-05-11 07:13:02.000000000 +0200
++++ mpfr/config.sub	2022-05-11 07:14:42.000000000 +0200
+@@ -516,6 +516,9 @@
+ 		basic_machine=m68k-apollo
+ 		os=-bsd
+ 		;;
++	arm64-*)
++		basic_machine=aarch64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
++		;;
+ 	aros)
+ 		basic_machine=i386-pc
+ 		os=-aros
-- 
2.25.1