From 82b9d9c0f6adf471543b160e15eaeb2a14c722cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= <alex@alexrp.com>
Date: Wed, 5 Mar 2025 09:09:30 +0100
Subject: [PATCH] compiler-rt: Fix names of some float/int conversion routines
 for hexagon.

---
 lib/compiler_rt/fixdfti.zig    | 5 +----
 lib/compiler_rt/fixsfti.zig    | 5 +----
 lib/compiler_rt/fixunsdfti.zig | 5 +----
 lib/compiler_rt/fixunssfti.zig | 5 +----
 lib/compiler_rt/floattidf.zig  | 5 +----
 lib/compiler_rt/floattisf.zig  | 5 +----
 6 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/lib/compiler_rt/fixdfti.zig b/lib/compiler_rt/fixdfti.zig
index 889e31db53..46b17505fc 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 ae37f0f0e6..e1d4e7188c 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 ddaa45bc66..b4429a9d76 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 0b3ac65fe9..3137fb3bc6 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 78cef508a0..420ef9b201 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 4483643d45..284580c4b2 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 });
     }
 }