| author |  Jan Philipp Hafer <jan.hafer@rwth-aachen.de> 2023-06-18 00:33:35+02:00 |
| committer |  Andrew Kelley <andrew@ziglang.org> 2023-06-18 15:27:47-07:00 |
| log | 539e0b0469457e6f3732f9d417cf023d7a1f1b68 |
| tree | 741c1386dc70b3d8ed0b43fca24e96d682ac90c0 |
| parent | 28862dd30c7152e6033abdb5daee3230ac39500a |
compiler_rt: fixup exports of PPC routines
PPC targets can also use the functionality-equivalent standard routine, so
unconditionally export the standard routine.
Fixup of #16054 merged in f043071cdfb956ff16b1441c9d01ce43eea9fb7b.9 files changed, 15 insertions(+), 25 deletions(-)
lib/compiler_rt/divtc3.zig+2-4
| ... | @@ -4,11 +4,9 @@ const Complex = @import("./mulc3.zig").Complex; | ... | @@ -4,11 +4,9 @@ const Complex = @import("./mulc3.zig").Complex; |
| 4 | 4 | ||
| 5 | comptime { | 5 | comptime { |
| 6 | if (@import("builtin").zig_backend != .stage2_c) { | 6 | if (@import("builtin").zig_backend != .stage2_c) { |
| 7 | if (common.want_ppc_abi) { | 7 | if (common.want_ppc_abi) |
| 8 | @export(__divtc3, .{ .name = "__divkc3", .linkage = common.linkage, .visibility = common.visibility }); | 8 | @export(__divtc3, .{ .name = "__divkc3", .linkage = common.linkage, .visibility = common.visibility }); |
| 9 | } else { | 9 | @export(__divtc3, .{ .name = "__divtc3", .linkage = common.linkage, .visibility = common.visibility }); |
| 10 | @export(__divtc3, .{ .name = "__divtc3", .linkage = common.linkage, .visibility = common.visibility }); | ||
| 11 | } | ||
| 12 | } | 10 | } |
| 13 | } | 11 | } |
| 14 | 12 |
lib/compiler_rt/divtf3.zig-1
| ... | @@ -9,7 +9,6 @@ pub const panic = common.panic; | ... | @@ -9,7 +9,6 @@ pub const panic = common.panic; |
| 9 | 9 | ||
| 10 | comptime { | 10 | comptime { |
| 11 | if (common.want_ppc_abi) { | 11 | if (common.want_ppc_abi) { |
| 12 | // TODO: why did this not error? | ||
| 13 | @export(__divtf3, .{ .name = "__divkf3", .linkage = common.linkage, .visibility = common.visibility }); | 12 | @export(__divtf3, .{ .name = "__divkf3", .linkage = common.linkage, .visibility = common.visibility }); |
| 14 | } else if (common.want_sparc_abi) { | 13 | } else if (common.want_sparc_abi) { |
| 15 | @export(_Qp_div, .{ .name = "_Qp_div", .linkage = common.linkage, .visibility = common.visibility }); | 14 | @export(_Qp_div, .{ .name = "_Qp_div", .linkage = common.linkage, .visibility = common.visibility }); |
lib/compiler_rt/fixtfti.zig+2-2
| ... | @@ -7,9 +7,9 @@ pub const panic = common.panic; | ... | @@ -7,9 +7,9 @@ pub const panic = common.panic; |
| 7 | comptime { | 7 | comptime { |
| 8 | if (common.want_windows_v2u64_abi) { | 8 | if (common.want_windows_v2u64_abi) { |
| 9 | @export(__fixtfti_windows_x86_64, .{ .name = "__fixtfti", .linkage = common.linkage, .visibility = common.visibility }); | 9 | @export(__fixtfti_windows_x86_64, .{ .name = "__fixtfti", .linkage = common.linkage, .visibility = common.visibility }); |
| 10 | } else if (common.want_ppc_abi) { | ||
| 11 | @export(__fixtfti, .{ .name = "__fixkfti", .linkage = common.linkage, .visibility = common.visibility }); | ||
| 12 | } else { | 10 | } else { |
| 11 | if (common.want_ppc_abi) | ||
| 12 | @export(__fixtfti, .{ .name = "__fixkfti", .linkage = common.linkage, .visibility = common.visibility }); | ||
| 13 | @export(__fixtfti, .{ .name = "__fixtfti", .linkage = common.linkage, .visibility = common.visibility }); | 13 | @export(__fixtfti, .{ .name = "__fixtfti", .linkage = common.linkage, .visibility = common.visibility }); |
| 14 | } | 14 | } |
| 15 | } | 15 | } |
lib/compiler_rt/fixunstfti.zig+2-2
| ... | @@ -7,9 +7,9 @@ pub const panic = common.panic; | ... | @@ -7,9 +7,9 @@ pub const panic = common.panic; |
| 7 | comptime { | 7 | comptime { |
| 8 | if (common.want_windows_v2u64_abi) { | 8 | if (common.want_windows_v2u64_abi) { |
| 9 | @export(__fixunstfti_windows_x86_64, .{ .name = "__fixunstfti", .linkage = common.linkage, .visibility = common.visibility }); | 9 | @export(__fixunstfti_windows_x86_64, .{ .name = "__fixunstfti", .linkage = common.linkage, .visibility = common.visibility }); |
| 10 | } else if (common.want_ppc_abi) { | ||
| 11 | @export(__fixunstfti, .{ .name = "__fixunskfti", .linkage = common.linkage, .visibility = common.visibility }); | ||
| 12 | } else { | 10 | } else { |
| 11 | if (common.want_ppc_abi) | ||
| 12 | @export(__fixunstfti, .{ .name = "__fixunskfti", .linkage = common.linkage, .visibility = common.visibility }); | ||
| 13 | @export(__fixunstfti, .{ .name = "__fixunstfti", .linkage = common.linkage, .visibility = common.visibility }); | 13 | @export(__fixunstfti, .{ .name = "__fixunstfti", .linkage = common.linkage, .visibility = common.visibility }); |
| 14 | } | 14 | } |
| 15 | } | 15 | } |
lib/compiler_rt/floattitf.zig+2-2
| ... | @@ -7,9 +7,9 @@ pub const panic = common.panic; | ... | @@ -7,9 +7,9 @@ pub const panic = common.panic; |
| 7 | comptime { | 7 | comptime { |
| 8 | if (common.want_windows_v2u64_abi) { | 8 | if (common.want_windows_v2u64_abi) { |
| 9 | @export(__floattitf_windows_x86_64, .{ .name = "__floattitf", .linkage = common.linkage, .visibility = common.visibility }); | 9 | @export(__floattitf_windows_x86_64, .{ .name = "__floattitf", .linkage = common.linkage, .visibility = common.visibility }); |
| 10 | } else if (common.want_ppc_abi) { | ||
| 11 | @export(__floattitf, .{ .name = "__floattikf", .linkage = common.linkage, .visibility = common.visibility }); | ||
| 12 | } else { | 10 | } else { |
| 11 | if (common.want_ppc_abi) | ||
| 12 | @export(__floattitf, .{ .name = "__floattikf", .linkage = common.linkage, .visibility = common.visibility }); | ||
| 13 | @export(__floattitf, .{ .name = "__floattitf", .linkage = common.linkage, .visibility = common.visibility }); | 13 | @export(__floattitf, .{ .name = "__floattitf", .linkage = common.linkage, .visibility = common.visibility }); |
| 14 | } | 14 | } |
| 15 | } | 15 | } |
lib/compiler_rt/floatuntitf.zig+1-2
| ... | @@ -8,9 +8,8 @@ comptime { | ... | @@ -8,9 +8,8 @@ comptime { |
| 8 | if (common.want_windows_v2u64_abi) { | 8 | if (common.want_windows_v2u64_abi) { |
| 9 | @export(__floatuntitf_windows_x86_64, .{ .name = "__floatuntitf", .linkage = common.linkage, .visibility = common.visibility }); | 9 | @export(__floatuntitf_windows_x86_64, .{ .name = "__floatuntitf", .linkage = common.linkage, .visibility = common.visibility }); |
| 10 | } else { | 10 | } else { |
| 11 | if (common.want_ppc_abi) { | 11 | if (common.want_ppc_abi) |
| 12 | @export(__floatuntitf, .{ .name = "__floatuntikf", .linkage = common.linkage, .visibility = common.visibility }); | 12 | @export(__floatuntitf, .{ .name = "__floatuntikf", .linkage = common.linkage, .visibility = common.visibility }); |
| 13 | } | ||
| 14 | @export(__floatuntitf, .{ .name = "__floatuntitf", .linkage = common.linkage, .visibility = common.visibility }); | 13 | @export(__floatuntitf, .{ .name = "__floatuntitf", .linkage = common.linkage, .visibility = common.visibility }); |
| 15 | } | 14 | } |
| 16 | } | 15 | } |
lib/compiler_rt/multc3.zig+2-4
| ... | @@ -5,11 +5,9 @@ pub const panic = common.panic; | ... | @@ -5,11 +5,9 @@ pub const panic = common.panic; |
| 5 | 5 | ||
| 6 | comptime { | 6 | comptime { |
| 7 | if (@import("builtin").zig_backend != .stage2_c) { | 7 | if (@import("builtin").zig_backend != .stage2_c) { |
| 8 | if (common.want_ppc_abi) { | 8 | if (common.want_ppc_abi) |
| 9 | @export(__multc3, .{ .name = "__mulkc3", .linkage = common.linkage, .visibility = common.visibility }); | 9 | @export(__multc3, .{ .name = "__mulkc3", .linkage = common.linkage, .visibility = common.visibility }); |
| 10 | } else { | 10 | @export(__multc3, .{ .name = "__multc3", .linkage = common.linkage, .visibility = common.visibility }); |
| 11 | @export(__multc3, .{ .name = "__multc3", .linkage = common.linkage, .visibility = common.visibility }); | ||
| 12 | } | ||
| 13 | } | 11 | } |
| 14 | } | 12 | } |
| 15 | 13 |
lib/compiler_rt/negtf2.zig+2-4
| ... | @@ -3,11 +3,9 @@ const common = @import("./common.zig"); | ... | @@ -3,11 +3,9 @@ const common = @import("./common.zig"); |
| 3 | pub const panic = common.panic; | 3 | pub const panic = common.panic; |
| 4 | 4 | ||
| 5 | comptime { | 5 | comptime { |
| 6 | if (common.want_ppc_abi) { | 6 | if (common.want_ppc_abi) |
| 7 | @export(__negtf2, .{ .name = "__negkf2", .linkage = common.linkage, .visibility = common.visibility }); | 7 | @export(__negtf2, .{ .name = "__negkf2", .linkage = common.linkage, .visibility = common.visibility }); |
| 8 | } else { | 8 | @export(__negtf2, .{ .name = "__negtf2", .linkage = common.linkage, .visibility = common.visibility }); |
| 9 | @export(__negtf2, .{ .name = "__negtf2", .linkage = common.linkage, .visibility = common.visibility }); | ||
| 10 | } | ||
| 11 | } | 9 | } |
| 12 | 10 | ||
| 13 | fn __negtf2(a: f128) callconv(.C) f128 { | 11 | fn __negtf2(a: f128) callconv(.C) f128 { |
lib/compiler_rt/powiXf2.zig+2-4
| ... | @@ -13,11 +13,9 @@ comptime { | ... | @@ -13,11 +13,9 @@ comptime { |
| 13 | @export(__powihf2, .{ .name = "__powihf2", .linkage = common.linkage, .visibility = common.visibility }); | 13 | @export(__powihf2, .{ .name = "__powihf2", .linkage = common.linkage, .visibility = common.visibility }); |
| 14 | @export(__powisf2, .{ .name = "__powisf2", .linkage = common.linkage, .visibility = common.visibility }); | 14 | @export(__powisf2, .{ .name = "__powisf2", .linkage = common.linkage, .visibility = common.visibility }); |
| 15 | @export(__powidf2, .{ .name = "__powidf2", .linkage = common.linkage, .visibility = common.visibility }); | 15 | @export(__powidf2, .{ .name = "__powidf2", .linkage = common.linkage, .visibility = common.visibility }); |
| 16 | if (common.want_ppc_abi) { | 16 | if (common.want_ppc_abi) |
| 17 | @export(__powitf2, .{ .name = "__powikf2", .linkage = common.linkage, .visibility = common.visibility }); | 17 | @export(__powitf2, .{ .name = "__powikf2", .linkage = common.linkage, .visibility = common.visibility }); |
| 18 | } else { | 18 | @export(__powitf2, .{ .name = "__powitf2", .linkage = common.linkage, .visibility = common.visibility }); |
| 19 | @export(__powitf2, .{ .name = "__powitf2", .linkage = common.linkage, .visibility = common.visibility }); | ||
| 20 | } | ||
| 21 | @export(__powixf2, .{ .name = "__powixf2", .linkage = common.linkage, .visibility = common.visibility }); | 19 | @export(__powixf2, .{ .name = "__powixf2", .linkage = common.linkage, .visibility = common.visibility }); |
| 22 | } | 20 | } |
| 23 | 21 |