From 8570df5ef3354a03d0394327e52360b13caa0823 Mon Sep 17 00:00:00 2001
From: Jiahao XU <30436523+NobodyXu@users.noreply.github.com>
Date: Sat, 30 Aug 2025 01:48:10 +1000
Subject: [PATCH 1/4] fix building for aarch64-apple-visionos-sim on nightly

fix duplicate simulator suffix
---
 src/target/llvm.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/target/llvm.rs b/src/target/llvm.rs
index 63b0dfca1..b20fc3222 100644
--- a/src/target/llvm.rs
+++ b/src/target/llvm.rs
@@ -95,7 +95,7 @@ impl TargetInfo<'_> {
             env => env,
         };
         let abi = match self.abi {
-            "sim" => "simulator",
+            "sim" if env != "simulator" => "simulator",
             "llvm" | "softfloat" | "uwp" | "vec-extabi" => "",
             "ilp32" => "_ilp32",
             "abi64" => "",

From d45215a2bee0947ac8c6fd47e12a054dbf675993 Mon Sep 17 00:00:00 2001
From: Jiahao XU <30436523+NobodyXu@users.noreply.github.com>
Date: Sat, 30 Aug 2025 02:01:56 +1000
Subject: [PATCH 2/4] fix llvm.rs

---
 src/target/llvm.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/target/llvm.rs b/src/target/llvm.rs
index b20fc3222..ff19e49dd 100644
--- a/src/target/llvm.rs
+++ b/src/target/llvm.rs
@@ -95,7 +95,7 @@ impl TargetInfo<'_> {
             env => env,
         };
         let abi = match self.abi {
-            "sim" if env != "simulator" => "simulator",
+            "sim" => if env != "simulator" { "simulator" } else { "" },
             "llvm" | "softfloat" | "uwp" | "vec-extabi" => "",
             "ilp32" => "_ilp32",
             "abi64" => "",

From 161c4acc14412d423b8a7de165d6a49d8a4acdcb Mon Sep 17 00:00:00 2001
From: Jiahao XU <30436523+NobodyXu@users.noreply.github.com>
Date: Sat, 30 Aug 2025 02:11:21 +1000
Subject: [PATCH 3/4] format llvm.rs

---
 src/target/llvm.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/target/llvm.rs b/src/target/llvm.rs
index ff19e49dd..b29fdb706 100644
--- a/src/target/llvm.rs
+++ b/src/target/llvm.rs
@@ -95,7 +95,13 @@ impl TargetInfo<'_> {
             env => env,
         };
         let abi = match self.abi {
-            "sim" => if env != "simulator" { "simulator" } else { "" },
+            "sim" => {
+                if env != "simulator" {
+                    "simulator"
+                } else {
+                    ""
+                }
+            }
             "llvm" | "softfloat" | "uwp" | "vec-extabi" => "",
             "ilp32" => "_ilp32",
             "abi64" => "",

From 90e521918204ed68de21d14b70a1a15ec38ccc0d Mon Sep 17 00:00:00 2001
From: Jiahao XU <30436523+NobodyXu@users.noreply.github.com>
Date: Sat, 30 Aug 2025 02:17:27 +1000
Subject: [PATCH 4/4] Replace macos-13 with macos-latest in main.yml

---
 .github/workflows/main.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 594ab8442..ec3925717 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -54,11 +54,11 @@ jobs:
             rust: stable
             target: i686-unknown-linux-gnu
           - build: aarch64-macos
-            os: macos-14
+            os: macos-latest
             rust: stable
             target: aarch64-apple-darwin
           - build: x86_64-macos
-            os: macos-13 # x86
+            os: macos-latest
             rust: stable
             target: x86_64-apple-darwin
           - build: aarch64-ios
@@ -72,7 +72,7 @@ jobs:
             target: aarch64-apple-ios-sim
             no_run: --no-run
           - build: x86_64-ios-sim
-            os: macos-13 # x86
+            os: macos-latest
             rust: stable
             target: x86_64-apple-ios # Simulator
             no_run: --no-run
@@ -82,7 +82,7 @@ jobs:
             target: aarch64-apple-ios-macabi
             no_run: --no-run # FIXME(madsmtm): Fix running tests
           - build: x86_64-ios-macabi
-            os: macos-13 # x86
+            os: macos-latest
             rust: stable
             target: x86_64-apple-ios-macabi
             no_run: --no-run # FIXME(madsmtm): Fix running tests