diff --git a/lib/compiler_rt/fixdfti.zig b/lib/compiler_rt/fixdfti.zig
index 889e31db53e5ca1b806dbe83593733789f47f4d8..46b17505fc5fcab49723c0d17b12426067725011 100644
--- a/lib/compiler_rt/fixdfti.zig
+++ b/lib/compiler_rt/fixdfti.zig
@@ -8,10 +8,7 @@ comptime {
     if (common.want_windows_v2u64_abi) {
         @export(&__fixdfti_windows_x86_64, .{ .name = "__fixdfti", .linkage = common.linkage, .visibility = common.visibility });
     } else {
-        @export(&__fixdfti, .{ .name = switch (builtin.cpu.arch) {
-            .hexagon => "__hexagon",
-            else => "_",
-        } ++ "_fixdfti", .linkage = common.linkage, .visibility = common.visibility });
+        @export(&__fixdfti, .{ .name = "__fixdfti", .linkage = common.linkage, .visibility = common.visibility });
     }
 }
 
diff --git a/lib/compiler_rt/fixsfti.zig b/lib/compiler_rt/fixsfti.zig
index ae37f0f0e6fbc077d547c3e65751eaf1ae7d935a..e1d4e7188caf8dfc9545afe265533e977cb4e673 100644
--- a/lib/compiler_rt/fixsfti.zig
+++ b/lib/compiler_rt/fixsfti.zig
@@ -8,10 +8,7 @@ comptime {
     if (common.want_windows_v2u64_abi) {
         @export(&__fixsfti_windows_x86_64, .{ .name = "__fixsfti", .linkage = common.linkage, .visibility = common.visibility });
     } else {
-        @export(&__fixsfti, .{ .name = switch (builtin.cpu.arch) {
-            .hexagon => "__hexagon",
-            else => "_",
-        } ++ "_fixsfti", .linkage = common.linkage, .visibility = common.visibility });
+        @export(&__fixsfti, .{ .name = "__fixsfti", .linkage = common.linkage, .visibility = common.visibility });
     }
 }
 
diff --git a/lib/compiler_rt/fixunsdfti.zig b/lib/compiler_rt/fixunsdfti.zig
index ddaa45bc6649a2ff327da6db35b811604cf70988..b4429a9d7622552c64b72795ad713d347ba58c78 100644
--- a/lib/compiler_rt/fixunsdfti.zig
+++ b/lib/compiler_rt/fixunsdfti.zig
@@ -8,10 +8,7 @@ comptime {
     if (common.want_windows_v2u64_abi) {
         @export(&__fixunsdfti_windows_x86_64, .{ .name = "__fixunsdfti", .linkage = common.linkage, .visibility = common.visibility });
     } else {
-        @export(&__fixunsdfti, .{ .name = switch (builtin.cpu.arch) {
-            .hexagon => "__hexagon",
-            else => "_",
-        } ++ "_fixunsdfti", .linkage = common.linkage, .visibility = common.visibility });
+        @export(&__fixunsdfti, .{ .name = "__fixunsdfti", .linkage = common.linkage, .visibility = common.visibility });
     }
 }
 
diff --git a/lib/compiler_rt/fixunssfti.zig b/lib/compiler_rt/fixunssfti.zig
index 0b3ac65fe947cff401a909e1a3a6c1bb802fe4d9..3137fb3bc616a5f2deaa8fa84cdd3264cfbbcfb7 100644
--- a/lib/compiler_rt/fixunssfti.zig
+++ b/lib/compiler_rt/fixunssfti.zig
@@ -8,10 +8,7 @@ comptime {
     if (common.want_windows_v2u64_abi) {
         @export(&__fixunssfti_windows_x86_64, .{ .name = "__fixunssfti", .linkage = common.linkage, .visibility = common.visibility });
     } else {
-        @export(&__fixunssfti, .{ .name = switch (builtin.cpu.arch) {
-            .hexagon => "__hexagon",
-            else => "_",
-        } ++ "_fixunssfti", .linkage = common.linkage, .visibility = common.visibility });
+        @export(&__fixunssfti, .{ .name = "__fixunssfti", .linkage = common.linkage, .visibility = common.visibility });
     }
 }
 
diff --git a/lib/compiler_rt/floattidf.zig b/lib/compiler_rt/floattidf.zig
index 78cef508a06bab33e8c1d38b1666e1892fba23d0..420ef9b201480e3062fd1b5f905bc28994c91836 100644
--- a/lib/compiler_rt/floattidf.zig
+++ b/lib/compiler_rt/floattidf.zig
@@ -8,10 +8,7 @@ comptime {
     if (common.want_windows_v2u64_abi) {
         @export(&__floattidf_windows_x86_64, .{ .name = "__floattidf", .linkage = common.linkage, .visibility = common.visibility });
     } else {
-        @export(&__floattidf, .{ .name = switch (builtin.cpu.arch) {
-            .hexagon => "__hexagon",
-            else => "_",
-        } ++ "_floattidf", .linkage = common.linkage, .visibility = common.visibility });
+        @export(&__floattidf, .{ .name = "__floattidf", .linkage = common.linkage, .visibility = common.visibility });
     }
 }
 
diff --git a/lib/compiler_rt/floattisf.zig b/lib/compiler_rt/floattisf.zig
index 4483643d453a3edaa68c2d5df58668a7d87c8efc..284580c4b2cc683de00921cac6f8c332a2b19f47 100644
--- a/lib/compiler_rt/floattisf.zig
+++ b/lib/compiler_rt/floattisf.zig
@@ -8,10 +8,7 @@ comptime {
     if (common.want_windows_v2u64_abi) {
         @export(&__floattisf_windows_x86_64, .{ .name = "__floattisf", .linkage = common.linkage, .visibility = common.visibility });
     } else {
-        @export(&__floattisf, .{ .name = switch (builtin.cpu.arch) {
-            .hexagon => "__hexagon",
-            else => "_",
-        } ++ "_floattisf", .linkage = common.linkage, .visibility = common.visibility });
+        @export(&__floattisf, .{ .name = "__floattisf", .linkage = common.linkage, .visibility = common.visibility });
     }
 }