From 474e9082244b7d2e7e0d978b40b16bcbe21c5918 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= <alex@alexrp.com>
Date: Fri, 25 Sep 2026 14:24:46 +0200
Subject: [PATCH] compiler-rt: remove some @export usage in favor of symbol()

---
 lib/compiler_rt/memcpy.zig  | 12 ++----------
 lib/compiler_rt/memmove.zig | 12 ++----------
 lib/compiler_rt/ssp.zig     |  2 +-
 3 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/lib/compiler_rt/memcpy.zig b/lib/compiler_rt/memcpy.zig
index b75f40ea4324448579f97f499cfb76493386adcf..d90a4ae839af8f7f4c351ef4b68a5fd9d2a724fb 100644
--- a/lib/compiler_rt/memcpy.zig
+++ b/lib/compiler_rt/memcpy.zig
@@ -1,20 +1,12 @@
 const std = @import("std");
 const assert = std.debug.assert;
 const compiler_rt = @import("../compiler_rt.zig");
+const symbol = compiler_rt.symbol;
 const builtin = @import("builtin");
 
 comptime {
     if (builtin.object_format != .c) {
-        const export_options: std.builtin.ExportOptions = .{
-            .name = "memcpy",
-            .linkage = compiler_rt.linkage,
-            .visibility = compiler_rt.visibility,
-        };
-
-        if (builtin.mode == .small or builtin.zig_backend == .stage2_aarch64)
-            @export(&memcpySmall, export_options)
-        else
-            @export(&memcpyFast, export_options);
+        symbol(if (builtin.mode == .small or builtin.zig_backend == .stage2_aarch64) &memcpySmall else &memcpyFast, "memcpy");
     }
 }
 
diff --git a/lib/compiler_rt/memmove.zig b/lib/compiler_rt/memmove.zig
index b02a4c7e54b538c0192a058caa660c465f09db5f..206e5b8cadbe47a4e3ea33d1ce282e313a5c9a5c 100644
--- a/lib/compiler_rt/memmove.zig
+++ b/lib/compiler_rt/memmove.zig
@@ -1,5 +1,6 @@
 const std = @import("std");
 const compiler_rt = @import("../compiler_rt.zig");
+const symbol = compiler_rt.symbol;
 const builtin = @import("builtin");
 const assert = std.debug.assert;
 const memcpy = @import("memcpy.zig");
@@ -8,16 +9,7 @@ const Element = compiler_rt.PreferredLoadStoreElement;
 
 comptime {
     if (builtin.object_format != .c) {
-        const export_options: std.builtin.ExportOptions = .{
-            .name = "memmove",
-            .linkage = compiler_rt.linkage,
-            .visibility = compiler_rt.visibility,
-        };
-
-        if (builtin.mode == .small or builtin.zig_backend == .stage2_aarch64)
-            @export(&memmoveSmall, export_options)
-        else
-            @export(&memmoveFast, export_options);
+        symbol(if (builtin.mode == .small or builtin.zig_backend == .stage2_aarch64) &memmoveSmall else &memmoveFast, "memmove");
     }
 }
 
diff --git a/lib/compiler_rt/ssp.zig b/lib/compiler_rt/ssp.zig
index 20468b0c0de8eb23cc9dff83c3e1bcbf46417f57..8b4283eb7538e7465577064ede90951cd6e7c5eb 100644
--- a/lib/compiler_rt/ssp.zig
+++ b/lib/compiler_rt/ssp.zig
@@ -22,7 +22,7 @@ extern fn memcpy(noalias dest: ?[*]u8, noalias src: ?[*]const u8, n: usize) call
 extern fn memmove(dest: ?[*]u8, src: ?[*]const u8, n: usize) callconv(.c) ?[*]u8;
 
 comptime {
-    @export(&__stack_chk_fail, .{ .name = if (builtin.os.tag == .openbsd) "__stack_smash_handler" else "__stack_chk_fail", .linkage = compiler_rt.linkage, .visibility = compiler_rt.visibility });
+    symbol(&__stack_chk_fail, if (builtin.os.tag == .openbsd) "__stack_smash_handler" else "__stack_chk_fail");
     symbol(&__chk_fail, "__chk_fail");
     symbol(&__stack_chk_guard, if (builtin.os.tag == .openbsd) "__guard_local" else "__stack_chk_guard");
     symbol(&__strcpy_chk, "__strcpy_chk");
-- 
2.54.0