Tidy up the Mac Catalyst support

Author: asavva-2016

patch/libffi.patch

@@ -1,6 +1,5 @@
-diff -Naur libffi-3.4.7-orig/config.sub libffi-3.4.7/config.sub
 --- libffi-3.4.7-orig/config.sub	2024-12-13 10:38:19
-+++ libffi-3.4.7/config.sub	2025-02-23 09:47:29
++++ libffi-3.4.7/config.sub	2025-02-26 18:50:21
 @@ -4,6 +4,7 @@
 
  # shellcheck disable=SC2006,SC2268 # see below for rationale
@@ -9,19 +8,16 @@ diff -Naur libffi-3.4.7-orig/config.sub libffi-3.4.7/config.sub
  timestamp='2024-01-01'
 
  # This file is free software; you can redistribute it and/or modify it
-@@ -1127,7 +1128,10 @@
+@@ -1127,7 +1128,7 @@
  	xscale-* | xscalee[bl]-*)
  		cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
  		;;
 -	arm64-* | arm64_32-* | aarch64le-*)
-+	arm64-apple)
-+		cpu=arm64
-+		;;
 +	arm64-* | aarch64le-* | arm64_32-*)
  		cpu=aarch64
  		;;
 
-@@ -1768,7 +1772,7 @@
+@@ -1768,7 +1769,7 @@
  	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
  	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
  	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
@@ -30,20 +26,21 @@ diff -Naur libffi-3.4.7-orig/config.sub libffi-3.4.7/config.sub
  		;;
  	# This one is extra strict with allowed versions
  	sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
-@@ -1864,9 +1868,11 @@
+@@ -1864,10 +1865,12 @@
  		;;
  	os2-emx-)
  		;;
 -	ios*-simulator* | tvos*-simulator* | watchos*-simulator*)
 -		;;	
  	*-eabi*- | *-gnueabi*-)
-+		;;
+ 		;;
 +	ios*-simulator- | tvos*-simulator- | watchos*-simulator- )
 +		;;
 +	ios*-macabi- )
- 		;;
++		;;
  	none--*)
  		# None (no kernel, i.e. freestanding / bare metal),
+ 		# can be paired with an machine code file format
 diff -Naur libffi-3.4.7-orig/generate-darwin-source-and-headers.py libffi-3.4.7/generate-darwin-source-and-headers.py
 --- libffi-3.4.7-orig/generate-darwin-source-and-headers.py	2024-06-01 18:42:02
 +++ libffi-3.4.7/generate-darwin-source-and-headers.py	2025-02-23 09:40:26