authorgravatar for jan.hafer@rwth-aachen.deJan Philipp Hafer <jan.hafer@rwth-aachen.de> 2023-06-18 00:33:35+02:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-06-18 15:27:47-07:00
log539e0b0469457e6f3732f9d417cf023d7a1f1b68
tree741c1386dc70b3d8ed0b43fca24e96d682ac90c0
parent28862dd30c7152e6033abdb5daee3230ac39500a

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;
44
55comptime {
66 if (@import("builtin").zig_backend != .stage2_c) {
7 if (common.want_ppc_abi) {
7 if (common.want_ppc_abi)
88 @export(__divtc3, .{ .name = "__divkc3", .linkage = common.linkage, .visibility = common.visibility });
9 } else {
10 @export(__divtc3, .{ .name = "__divtc3", .linkage = common.linkage, .visibility = common.visibility });
11 }
9 @export(__divtc3, .{ .name = "__divtc3", .linkage = common.linkage, .visibility = common.visibility });
1210 }
1311}
1412
lib/compiler_rt/divtf3.zig-1
......@@ -9,7 +9,6 @@ pub const panic = common.panic;
99
1010comptime {
1111 if (common.want_ppc_abi) {
12 // TODO: why did this not error?
1312 @export(__divtf3, .{ .name = "__divkf3", .linkage = common.linkage, .visibility = common.visibility });
1413 } else if (common.want_sparc_abi) {
1514 @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;
77comptime {
88 if (common.want_windows_v2u64_abi) {
99 @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 });
1210 } else {
11 if (common.want_ppc_abi)
12 @export(__fixtfti, .{ .name = "__fixkfti", .linkage = common.linkage, .visibility = common.visibility });
1313 @export(__fixtfti, .{ .name = "__fixtfti", .linkage = common.linkage, .visibility = common.visibility });
1414 }
1515}
lib/compiler_rt/fixunstfti.zig+2-2
......@@ -7,9 +7,9 @@ pub const panic = common.panic;
77comptime {
88 if (common.want_windows_v2u64_abi) {
99 @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 });
1210 } else {
11 if (common.want_ppc_abi)
12 @export(__fixunstfti, .{ .name = "__fixunskfti", .linkage = common.linkage, .visibility = common.visibility });
1313 @export(__fixunstfti, .{ .name = "__fixunstfti", .linkage = common.linkage, .visibility = common.visibility });
1414 }
1515}
lib/compiler_rt/floattitf.zig+2-2
......@@ -7,9 +7,9 @@ pub const panic = common.panic;
77comptime {
88 if (common.want_windows_v2u64_abi) {
99 @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 });
1210 } else {
11 if (common.want_ppc_abi)
12 @export(__floattitf, .{ .name = "__floattikf", .linkage = common.linkage, .visibility = common.visibility });
1313 @export(__floattitf, .{ .name = "__floattitf", .linkage = common.linkage, .visibility = common.visibility });
1414 }
1515}
lib/compiler_rt/floatuntitf.zig+1-2
......@@ -8,9 +8,8 @@ comptime {
88 if (common.want_windows_v2u64_abi) {
99 @export(__floatuntitf_windows_x86_64, .{ .name = "__floatuntitf", .linkage = common.linkage, .visibility = common.visibility });
1010 } else {
11 if (common.want_ppc_abi) {
11 if (common.want_ppc_abi)
1212 @export(__floatuntitf, .{ .name = "__floatuntikf", .linkage = common.linkage, .visibility = common.visibility });
13 }
1413 @export(__floatuntitf, .{ .name = "__floatuntitf", .linkage = common.linkage, .visibility = common.visibility });
1514 }
1615}
lib/compiler_rt/multc3.zig+2-4
......@@ -5,11 +5,9 @@ pub const panic = common.panic;
55
66comptime {
77 if (@import("builtin").zig_backend != .stage2_c) {
8 if (common.want_ppc_abi) {
8 if (common.want_ppc_abi)
99 @export(__multc3, .{ .name = "__mulkc3", .linkage = common.linkage, .visibility = common.visibility });
10 } else {
11 @export(__multc3, .{ .name = "__multc3", .linkage = common.linkage, .visibility = common.visibility });
12 }
10 @export(__multc3, .{ .name = "__multc3", .linkage = common.linkage, .visibility = common.visibility });
1311 }
1412}
1513
lib/compiler_rt/negtf2.zig+2-4
......@@ -3,11 +3,9 @@ const common = @import("./common.zig");
33pub const panic = common.panic;
44
55comptime {
6 if (common.want_ppc_abi) {
6 if (common.want_ppc_abi)
77 @export(__negtf2, .{ .name = "__negkf2", .linkage = common.linkage, .visibility = common.visibility });
8 } else {
9 @export(__negtf2, .{ .name = "__negtf2", .linkage = common.linkage, .visibility = common.visibility });
10 }
8 @export(__negtf2, .{ .name = "__negtf2", .linkage = common.linkage, .visibility = common.visibility });
119}
1210
1311fn __negtf2(a: f128) callconv(.C) f128 {
lib/compiler_rt/powiXf2.zig+2-4
......@@ -13,11 +13,9 @@ comptime {
1313 @export(__powihf2, .{ .name = "__powihf2", .linkage = common.linkage, .visibility = common.visibility });
1414 @export(__powisf2, .{ .name = "__powisf2", .linkage = common.linkage, .visibility = common.visibility });
1515 @export(__powidf2, .{ .name = "__powidf2", .linkage = common.linkage, .visibility = common.visibility });
16 if (common.want_ppc_abi) {
16 if (common.want_ppc_abi)
1717 @export(__powitf2, .{ .name = "__powikf2", .linkage = common.linkage, .visibility = common.visibility });
18 } else {
19 @export(__powitf2, .{ .name = "__powitf2", .linkage = common.linkage, .visibility = common.visibility });
20 }
18 @export(__powitf2, .{ .name = "__powitf2", .linkage = common.linkage, .visibility = common.visibility });
2119 @export(__powixf2, .{ .name = "__powixf2", .linkage = common.linkage, .visibility = common.visibility });
2220}
2321