Merge pull request #10899 from ziglang/arm64-macos

aarch64,macos: handle GOT and direct loads in codegen

3 files changed, 9 insertions, 3 deletions

diff --git a/test/behavior/basic.zig b/test/behavior/basic.zig
index 0c2c293d23..61c7de7a23 100644
--- a/test/behavior/basic.zig
+++ b/test/behavior/basic.zig
@@ -197,6 +197,9 @@ test "multiline string comments at multiple places" {
 }
 
 test "string concatenation" {
+    if (builtin.zig_backend == .stage2_aarch64 and builtin.os.tag == .macos) return error.SkipZigTest;
+    if (builtin.zig_backend == .stage2_x86_64 and builtin.os.tag == .macos) return error.SkipZigTest;
+
     try expect(mem.eql(u8, "OK" ++ " IT " ++ "WORKED", "OK IT WORKED"));
 }
 
@@ -405,6 +408,7 @@ fn testTakeAddressOfParameter(f: f32) !void {
 
 test "pointer to void return type" {
     if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
+    if (builtin.zig_backend == .stage2_aarch64 and builtin.os.tag == .macos) return error.SkipZigTest;
     if (builtin.zig_backend == .stage2_x86_64 and builtin.os.tag == .macos) return error.SkipZigTest;
 
     try testPointerToVoidReturnType();
diff --git a/test/behavior/cast.zig b/test/behavior/cast.zig
index 85e3368441..70b17a55a1 100644
--- a/test/behavior/cast.zig
+++ b/test/behavior/cast.zig
@@ -78,8 +78,9 @@ test "comptime_int @intToFloat" {
         try expect(@TypeOf(result) == f64);
         try expect(result == 1234.0);
     }
-    if (builtin.zig_backend != .stage2_x86_64 or builtin.os.tag != .macos) {
-        // TODO investigate why this traps on x86_64-macos
+
+    if (!((builtin.zig_backend == .stage2_aarch64 or builtin.zig_backend == .stage2_x86_64) and builtin.os.tag == .macos)) {
+        // TODO investigate why this traps on x86_64-macos and aarch64-macos
         {
             const result = @intToFloat(f128, 1234);
             try expect(@TypeOf(result) == f128);
diff --git a/test/behavior/struct.zig b/test/behavior/struct.zig
index 8428ea886f..3e92b4374b 100644
--- a/test/behavior/struct.zig
+++ b/test/behavior/struct.zig
@@ -393,7 +393,8 @@ test "empty struct method call" {
     if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
     if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
     if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
-    if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
+    if (builtin.zig_backend == .stage2_aarch64 and builtin.os.tag == .macos) return error.SkipZigTest; // TODO
+    if (builtin.zig_backend == .stage2_x86_64 and builtin.os.tag == .macos) return error.SkipZigTest; // TODO
 
     const es = EmptyStruct{};
     try expect(es.method() == 1234);