Merge pull request #11828 from devins2518/arm-atomics

compiler_rt: aarch64 outline atomics
ziglang · Jan 9, 2023 · 2bbaf95 · 2bbaf95
1 parent a3232c6
commit 2bbaf95
Show file tree

Hide file tree

Showing 3 changed files with 2,572 additions and 0 deletions.
diff --git a/lib/compiler_rt.zig b/lib/compiler_rt.zig
@@ -1,8 +1,15 @@
+const builtin = @import("builtin");
+
 pub const panic = @import("compiler_rt/common.zig").panic;
 
 comptime {
     _ = @import("compiler_rt/atomics.zig");
 
+    // macOS has these functions inside libSystem.
+    if (builtin.cpu.arch.isAARCH64() and !builtin.os.tag.isDarwin()) {
+        _ = @import("compiler_rt/aarch64_outline_atomics.zig");
+    }
+
     _ = @import("compiler_rt/addf3.zig");
     _ = @import("compiler_rt/addhf3.zig");
     _ = @import("compiler_rt/addsf3.zig");