Commit 90fb2d97542e5a9fdb8ebf4fcc85b9f900dd3e66 | zig

author	Alex Rønne Petersen <alex@alexrp.com> 2025-05-18 22:20:55+02:00
committer	Alex Rønne Petersen <alex@alexrp.com> 2025-05-19 00:22:03+02:00
log	90fb2d97542e5a9fdb8ebf4fcc85b9f900dd3e66
tree	d8e6ad0c00850624d0d819300fed3b73a98d9e80
parent	092352ec63d3a4e9ff59a5d8ad8f119bf0eda468
signature	Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM

compiler-rt: Fix some exports to respect the common linkage and visibility.

5 files changed, 116 insertions(+), 118 deletions(-)

lib
- compiler_rt
tools
- gen_outline_atomics.zig

lib/compiler_rt/aarch64_outline_atomics.zig+101-101

lib/compiler_rt/clear_cache.zig+3-4

 @@ -2,7 +2,8 @@ const std = @import("std");
 const builtin = @import("builtin");
 const arch = builtin.cpu.arch;
 const os = builtin.os.tag;
-pub const panic = @import("common.zig").panic;
+const common = @import("common.zig");
+pub const panic = common.panic;
 // Ported from llvm-project d32170dbd5b0d54436537b6b75beaf44324e0c28
 @@ -174,10 +175,8 @@ fn clear_cache(start: usize, end: usize) callconv(.c) void {
     }
 }
-const linkage = if (builtin.is_test) std.builtin.GlobalLinkage.internal else std.builtin.GlobalLinkage.weak;
 fn exportIt() void {
-    @export(&clear_cache, .{ .name = "__clear_cache", .linkage = linkage });
+    @export(&clear_cache, .{ .name = "__clear_cache", .linkage = common.linkage, .visibility = common.visibility });
 }
 // Darwin-only

lib/compiler_rt/os_version_check.zig+2-2

...	@@ -1,7 +1,7 @@	...	@@ -1,7 +1,7 @@
1	const std = @import("std");	1	const std = @import("std");
2	const testing = std.testing;	2	const testing = std.testing;
3	const builtin = @import("builtin");	3	const builtin = @import("builtin");
4	const linkage: std.builtin.GlobalLinkage = if (builtin.is_test) .internal else .weak;	4	const common = @import("common.zig");
5	const panic = @import("common.zig").panic;	5	const panic = @import("common.zig").panic;
6		6
7	const have_availability_version_check = builtin.os.tag.isDarwin() and	7	const have_availability_version_check = builtin.os.tag.isDarwin() and
...	@@ -9,7 +9,7 @@ const have_availability_version_check = builtin.os.tag.isDarwin() and	...	@@ -9,7 +9,7 @@ const have_availability_version_check = builtin.os.tag.isDarwin() and
9		9
10	comptime {	10	comptime {
11	if (have_availability_version_check) {	11	if (have_availability_version_check) {
12	@export(&__isPlatformVersionAtLeast, .{ .name = "__isPlatformVersionAtLeast", .linkage = linkage });	12	@export(&__isPlatformVersionAtLeast, .{ .name = "__isPlatformVersionAtLeast", .linkage = common.linkage, .visibility = common.visibility });
13	}	13	}
14	}	14	}
15		15

lib/compiler_rt/stack_probe.zig+8-9

 @@ -1,28 +1,27 @@
 const std = @import("std");
 const builtin = @import("builtin");
+const common = @import("common.zig");
 const os_tag = builtin.os.tag;
 const arch = builtin.cpu.arch;
 const abi = builtin.abi;
 const is_test = builtin.is_test;
-const linkage: std.builtin.GlobalLinkage = if (builtin.is_test) .internal else .weak;
+pub const panic = common.panic;
-const strong_linkage: std.builtin.GlobalLinkage = if (builtin.is_test) .internal else .strong;
-pub const panic = @import("common.zig").panic;
 comptime {
     if (builtin.os.tag == .windows) {
         // Default stack-probe functions emitted by LLVM
         if (builtin.target.isMinGW()) {
-            @export(&_chkstk, .{ .name = "_alloca", .linkage = linkage });
+            @export(&_chkstk, .{ .name = "_alloca", .linkage = common.linkage, .visibility = common.visibility });
-            @export(&___chkstk_ms, .{ .name = "___chkstk_ms", .linkage = linkage });
+            @export(&___chkstk_ms, .{ .name = "___chkstk_ms", .linkage = common.linkage, .visibility = common.visibility });
             if (arch == .thumb or arch == .aarch64) {
-                @export(&__chkstk, .{ .name = "__chkstk", .linkage = linkage });
+                @export(&__chkstk, .{ .name = "__chkstk", .linkage = common.linkage, .visibility = common.visibility });
             }
         } else if (!builtin.link_libc) {
             // This symbols are otherwise exported by MSVCRT.lib
-            @export(&_chkstk, .{ .name = "_chkstk", .linkage = linkage });
+            @export(&_chkstk, .{ .name = "_chkstk", .linkage = common.linkage, .visibility = common.visibility });
-            @export(&__chkstk, .{ .name = "__chkstk", .linkage = linkage });
+            @export(&__chkstk, .{ .name = "__chkstk", .linkage = common.linkage, .visibility = common.visibility });
         }
     }
 @@ -30,7 +29,7 @@ comptime {
         .x86,
         .x86_64,
         => {
-            @export(&zig_probe_stack, .{ .name = "__zig_probe_stack", .linkage = linkage });
+            @export(&zig_probe_stack, .{ .name = "__zig_probe_stack", .linkage = common.linkage, .visibility = common.visibility });
         },
         else => {},
     }

tools/gen_outline_atomics.zig+2-2

...	@@ -24,7 +24,7 @@ pub fn main() !void {	...	@@ -24,7 +24,7 @@ pub fn main() !void {
24	\\//! This file is generated by tools/gen_outline_atomics.zig.	24	\\//! This file is generated by tools/gen_outline_atomics.zig.
25	\\const builtin = @import("builtin");	25	\\const builtin = @import("builtin");
26	\\const std = @import("std");	26	\\const std = @import("std");
27	\\const linkage = @import("./common.zig").linkage;	27	\\const common = @import("common.zig");
28	\\const always_has_lse = std.Target.aarch64.featureSetHas(builtin.cpu.features, .lse);	28	\\const always_has_lse = std.Target.aarch64.featureSetHas(builtin.cpu.features, .lse);
29	\\	29	\\
30	\\/// This default is overridden at runtime after inspecting CPU properties.	30	\\/// This default is overridden at runtime after inspecting CPU properties.
...	@@ -48,7 +48,7 @@ pub fn main() !void {	...	@@ -48,7 +48,7 @@ pub fn main() !void {
48	@tagName(op), n.toBytes(), @tagName(order),	48	@tagName(op), n.toBytes(), @tagName(order),
49	});	49	});
50	try writeFunction(arena, w, name, op, n, order);	50	try writeFunction(arena, w, name, op, n, order);
51	try footer.writer().print(" @export(&{s}, .{{ .name = \"{s}\", .linkage = linkage }});\n", .{	51	try footer.writer().print(" @export(&{s}, .{{ .name = \"{s}\", .linkage = common.linkage, .visibility = common.visibility }});\n", .{
52	name, name,	52	name, name,
53	});	53	});
54	}	54	}