From 77082b2d09eb44f7a97e7654e035e235a28b17b7 Mon Sep 17 00:00:00 2001
From: Alexander Gordeyko <axgord@gmail.com>
Date: Tue, 24 Mar 2026 20:30:27 +0200
Subject: [PATCH 1/2]  IOS simulator support for ARM64

---
 toolchain/finish-setup.xml        |  5 +++--
 toolchain/iphonesim-toolchain.xml | 36 ++++++++++++++++++++-----------
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/toolchain/finish-setup.xml b/toolchain/finish-setup.xml
index 1e814ade3..a99c118fd 100644
--- a/toolchain/finish-setup.xml
+++ b/toolchain/finish-setup.xml
@@ -40,8 +40,9 @@
 
 
 
-<set name="LIBEXTRA" value=".iphonesim-64" if="iphonesim"/>
-<set name="LIBEXTRA" value=".iphonesim" if="iphonesim" unless="HXCPP_M64"/>
+<set name="LIBEXTRA" value=".iphonesim-64" if="iphonesim" unless="HXCPP_ARM64"/>
+<set name="LIBEXTRA" value=".iphonesim-arm64" if="iphonesim HXCPP_ARM64"/>
+<set name="LIBEXTRA" value=".iphonesim" if="iphonesim" unless="HXCPP_M64 || HXCPP_ARM64"/>
 <section if="iphoneos">
 	<set name="LIBEXTRA" value=".iphoneos-v7" if="HXCPP_ARMV7"/>
 	<set name="LIBEXTRA" value=".iphoneos-v7s" if="HXCPP_ARMV7S"/>
diff --git a/toolchain/iphonesim-toolchain.xml b/toolchain/iphonesim-toolchain.xml
index 3dded7016..2c673842c 100644
--- a/toolchain/iphonesim-toolchain.xml
+++ b/toolchain/iphonesim-toolchain.xml
@@ -38,16 +38,24 @@
   <mmflag value="-fobjc-abi-version=2"/>
   <mmflag value="-fobjc-legacy-dispatch"/>
   <flag value="-Wno-unused-variable"/>
-  <flag value="-arch"/>
-  <flag value="i386" unless="HXCPP_M64"/>
-  <flag value="x86_64" if="HXCPP_M64"/>
-  <flag value="-isysroot"/>
-  <flag value="${DEVELOPER_DIR}/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator${IPHONE_VER}.sdk"/>
-  <!-- Removed for iOS 8 -->
-  <!-- <flag value="-fvisibility=hidden"/> -->
-  <!-- <flag value="-miphoneos-version-min=${IPHONE_VER}"/> -->
-  <flag value="-miphoneos-version-min=9.0" unless="HXCPP_IOS_MIN_VERSION" />
-  <flag value="-miphoneos-version-min=${HXCPP_IOS_MIN_VERSION}" if="HXCPP_IOS_MIN_VERSION" />
+  <!-- ARM64 simulator (Apple Silicon): use -target for correct LC_BUILD_VERSION platform -->
+  <section if="HXCPP_ARM64">
+    <flag value="-target"/>
+    <flag value="arm64-apple-ios12.0-simulator" unless="HXCPP_IOS_MIN_VERSION"/>
+    <flag value="arm64-apple-ios${HXCPP_IOS_MIN_VERSION}-simulator" if="HXCPP_IOS_MIN_VERSION"/>
+    <flag value="-isysroot"/>
+    <flag value="${DEVELOPER_DIR}/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator${IPHONE_VER}.sdk"/>
+  </section>
+  <!-- x86_64/i386 simulator: original flags -->
+  <section unless="HXCPP_ARM64">
+    <flag value="-arch"/>
+    <flag value="i386" unless="HXCPP_M64"/>
+    <flag value="x86_64" if="HXCPP_M64"/>
+    <flag value="-isysroot"/>
+    <flag value="${DEVELOPER_DIR}/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator${IPHONE_VER}.sdk"/>
+    <flag value="-mios-simulator-version-min=9.0" unless="HXCPP_IOS_MIN_VERSION" />
+    <flag value="-mios-simulator-version-min=${HXCPP_IOS_MIN_VERSION}" if="HXCPP_IOS_MIN_VERSION" />
+  </section>
   <flag value="-DIPHONE=IPHONE"/>
   <flag value="-DIPHONESIM=IPHONESIM"/>
   <flag value="-fobjc-arc" if="OBJC_ARC" />
@@ -69,7 +77,8 @@
 
   <outflag value="-o"/>
   <ext value=".o"/>
-  <objdir value="obj/iphonesim${OBJGCC}${OBJDBG}/" />
+  <objdir value="obj/iphonesim${OBJGCC}${OBJDBG}-64/" if="HXCPP_ARM64" />
+  <objdir value="obj/iphonesim${OBJGCC}${OBJDBG}/" unless="HXCPP_ARM64" />
 </compiler>
 
 <linker id="dll" exe="g++" >
@@ -77,8 +86,9 @@
   <exe name="xcrun --sdk iphonesimulator${IPHONE_VER} clang++" />
   <flag value="-dynamiclib"/>
   <flag value="-arch"/>
-  <flag value="i386" unless="HXCPP_M64"/>
-  <flag value="x86_64" if="HXCPP_M64"/>
+  <flag value="i386" unless="HXCPP_M64 || HXCPP_ARM64"/>
+  <flag value="x86_64" if="HXCPP_M64" unless="HXCPP_ARM64"/>
+  <flag value="arm64" if="HXCPP_ARM64"/>
   <flag value="-isysroot"/>
   <flag value="${DEVELOPER_DIR}/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator${IPHONE_VER}.sdk"/>
   <flag value="-Wl,-undefined,dynamic_lookup"/>

From ed4e33e837ea950c39ed3b722662abbc7024073b Mon Sep 17 00:00:00 2001
From: Alexander Gordeyko <axgord@gmail.com>
Date: Thu, 14 May 2026 17:31:00 +0300
Subject: [PATCH 2/2] iphonesim-toolchain: extract shared -isysroot out of arch
 sections

Per review feedback: -isysroot and its SDK path are identical in both
ARM64 and x86_64/i386 sections, move them out to avoid duplication.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 toolchain/iphonesim-toolchain.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/toolchain/iphonesim-toolchain.xml b/toolchain/iphonesim-toolchain.xml
index 2c673842c..6296f38b8 100644
--- a/toolchain/iphonesim-toolchain.xml
+++ b/toolchain/iphonesim-toolchain.xml
@@ -43,19 +43,17 @@
     <flag value="-target"/>
     <flag value="arm64-apple-ios12.0-simulator" unless="HXCPP_IOS_MIN_VERSION"/>
     <flag value="arm64-apple-ios${HXCPP_IOS_MIN_VERSION}-simulator" if="HXCPP_IOS_MIN_VERSION"/>
-    <flag value="-isysroot"/>
-    <flag value="${DEVELOPER_DIR}/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator${IPHONE_VER}.sdk"/>
   </section>
   <!-- x86_64/i386 simulator: original flags -->
   <section unless="HXCPP_ARM64">
     <flag value="-arch"/>
     <flag value="i386" unless="HXCPP_M64"/>
     <flag value="x86_64" if="HXCPP_M64"/>
-    <flag value="-isysroot"/>
-    <flag value="${DEVELOPER_DIR}/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator${IPHONE_VER}.sdk"/>
     <flag value="-mios-simulator-version-min=9.0" unless="HXCPP_IOS_MIN_VERSION" />
     <flag value="-mios-simulator-version-min=${HXCPP_IOS_MIN_VERSION}" if="HXCPP_IOS_MIN_VERSION" />
   </section>
+  <flag value="-isysroot"/>
+  <flag value="${DEVELOPER_DIR}/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator${IPHONE_VER}.sdk"/>
   <flag value="-DIPHONE=IPHONE"/>
   <flag value="-DIPHONESIM=IPHONESIM"/>
   <flag value="-fobjc-arc" if="OBJC_ARC" />