Merge pull request #12071 from topolarity/windows-abi-change

compiler_rt: Update Windows ABI for float<->int conversion routines

Author: andrewrk

lib/compiler_rt/common.zig

@@ -17,6 +17,10 @@ pub const want_aeabi = switch (builtin.abi) {
 };
 pub const want_ppc_abi = builtin.cpu.arch.isPPC() or builtin.cpu.arch.isPPC64();
 
+// Libcalls that involve u128 on Windows x86-64 are expected by LLVM to use the
+// calling convention of @Vector(2, u64), rather than what's standard.
+pub const want_windows_v2u64_abi = builtin.os.tag == .windows and builtin.cpu.arch == .x86_64;
+
 /// This governs whether to use these symbol names for f16/f32 conversions
 /// rather than the standard names:
 /// * __gnu_f2h_ieee

lib/compiler_rt/fixdfti.zig

@@ -1,12 +1,23 @@
+const builtin = @import("builtin");
 const common = @import("./common.zig");
 const floatToInt = @import("./float_to_int.zig").floatToInt;
 
 pub const panic = common.panic;
 
 comptime {
-    @export(__fixdfti, .{ .name = "__fixdfti", .linkage = common.linkage });
+    if (common.want_windows_v2u64_abi) {
+        @export(__fixdfti_windows_x86_64, .{ .name = "__fixdfti", .linkage = common.linkage });
+    } else {
+        @export(__fixdfti, .{ .name = "__fixdfti", .linkage = common.linkage });
+    }
 }
 
 pub fn __fixdfti(a: f64) callconv(.C) i128 {
     return floatToInt(i128, a);
 }
+
+const v2u64 = @Vector(2, u64);
+
+fn __fixdfti_windows_x86_64(a: f64) callconv(.C) v2u64 {
+    return @bitCast(v2u64, floatToInt(i128, a));
+}

lib/compiler_rt/fixhfti.zig

@@ -1,12 +1,23 @@
+const builtin = @import("builtin");
 const common = @import("./common.zig");
 const floatToInt = @import("./float_to_int.zig").floatToInt;
 
 pub const panic = common.panic;
 
 comptime {
-    @export(__fixhfti, .{ .name = "__fixhfti", .linkage = common.linkage });
+    if (common.want_windows_v2u64_abi) {
+        @export(__fixhfti_windows_x86_64, .{ .name = "__fixhfti", .linkage = common.linkage });
+    } else {
+        @export(__fixhfti, .{ .name = "__fixhfti", .linkage = common.linkage });
+    }
 }
 
-fn __fixhfti(a: f16) callconv(.C) i128 {
+pub fn __fixhfti(a: f16) callconv(.C) i128 {
     return floatToInt(i128, a);
 }
+
+const v2u64 = @Vector(2, u64);
+
+fn __fixhfti_windows_x86_64(a: f16) callconv(.C) v2u64 {
+    return @bitCast(v2u64, floatToInt(i128, a));
+}

lib/compiler_rt/fixsfti.zig

@@ -1,12 +1,23 @@
+const builtin = @import("builtin");
 const common = @import("./common.zig");
 const floatToInt = @import("./float_to_int.zig").floatToInt;
 
 pub const panic = common.panic;
 
 comptime {
-    @export(__fixsfti, .{ .name = "__fixsfti", .linkage = common.linkage });
+    if (common.want_windows_v2u64_abi) {
+        @export(__fixsfti_windows_x86_64, .{ .name = "__fixsfti", .linkage = common.linkage });
+    } else {
+        @export(__fixsfti, .{ .name = "__fixsfti", .linkage = common.linkage });
+    }
 }
 
 pub fn __fixsfti(a: f32) callconv(.C) i128 {
     return floatToInt(i128, a);
 }
+
+const v2u64 = @Vector(2, u64);
+
+fn __fixsfti_windows_x86_64(a: f32) callconv(.C) v2u64 {
+    return @bitCast(v2u64, floatToInt(i128, a));
+}

lib/compiler_rt/fixtfti.zig

@@ -1,12 +1,23 @@
+const builtin = @import("builtin");
 const common = @import("./common.zig");
 const floatToInt = @import("./float_to_int.zig").floatToInt;
 
 pub const panic = common.panic;
 
 comptime {
-    @export(__fixtfti, .{ .name = "__fixtfti", .linkage = common.linkage });
+    if (common.want_windows_v2u64_abi) {
+        @export(__fixtfti_windows_x86_64, .{ .name = "__fixtfti", .linkage = common.linkage });
+    } else {
+        @export(__fixtfti, .{ .name = "__fixtfti", .linkage = common.linkage });
+    }
 }
 
 pub fn __fixtfti(a: f128) callconv(.C) i128 {
     return floatToInt(i128, a);
 }
+
+const v2u64 = @Vector(2, u64);
+
+fn __fixtfti_windows_x86_64(a: f128) callconv(.C) v2u64 {
+    return @bitCast(v2u64, floatToInt(i128, a));
+}

lib/compiler_rt/fixunsdfti.zig

@@ -1,12 +1,23 @@
+const builtin = @import("builtin");
 const common = @import("./common.zig");
 const floatToInt = @import("./float_to_int.zig").floatToInt;
 
 pub const panic = common.panic;
 
 comptime {
-    @export(__fixunsdfti, .{ .name = "__fixunsdfti", .linkage = common.linkage });
+    if (common.want_windows_v2u64_abi) {
+        @export(__fixunsdfti_windows_x86_64, .{ .name = "__fixunsdfti", .linkage = common.linkage });
+    } else {
+        @export(__fixunsdfti, .{ .name = "__fixunsdfti", .linkage = common.linkage });
+    }
 }
 
 pub fn __fixunsdfti(a: f64) callconv(.C) u128 {
     return floatToInt(u128, a);
 }
+
+const v2u64 = @Vector(2, u64);
+
+fn __fixunsdfti_windows_x86_64(a: f64) callconv(.C) v2u64 {
+    return @bitCast(v2u64, floatToInt(u128, a));
+}

lib/compiler_rt/fixunshfti.zig

@@ -1,12 +1,23 @@
+const builtin = @import("builtin");
 const common = @import("./common.zig");
 const floatToInt = @import("./float_to_int.zig").floatToInt;
 
 pub const panic = common.panic;
 
 comptime {
-    @export(__fixunshfti, .{ .name = "__fixunshfti", .linkage = common.linkage });
+    if (common.want_windows_v2u64_abi) {
+        @export(__fixunshfti_windows_x86_64, .{ .name = "__fixunshfti", .linkage = common.linkage });
+    } else {
+        @export(__fixunshfti, .{ .name = "__fixunshfti", .linkage = common.linkage });
+    }
 }
 
 pub fn __fixunshfti(a: f16) callconv(.C) u128 {
     return floatToInt(u128, a);
 }
+
+const v2u64 = @import("std").meta.Vector(2, u64);
+
+fn __fixunshfti_windows_x86_64(a: f16) callconv(.C) v2u64 {
+    return @bitCast(v2u64, floatToInt(u128, a));
+}

lib/compiler_rt/fixunssfti.zig

@@ -1,12 +1,23 @@
+const builtin = @import("builtin");
 const common = @import("./common.zig");
 const floatToInt = @import("./float_to_int.zig").floatToInt;
 
 pub const panic = common.panic;
 
 comptime {
-    @export(__fixunssfti, .{ .name = "__fixunssfti", .linkage = common.linkage });
+    if (common.want_windows_v2u64_abi) {
+        @export(__fixunssfti_windows_x86_64, .{ .name = "__fixunssfti", .linkage = common.linkage });
+    } else {
+        @export(__fixunssfti, .{ .name = "__fixunssfti", .linkage = common.linkage });
+    }
 }
 
 pub fn __fixunssfti(a: f32) callconv(.C) u128 {
     return floatToInt(u128, a);
 }
+
+const v2u64 = @Vector(2, u64);
+
+fn __fixunssfti_windows_x86_64(a: f32) callconv(.C) v2u64 {
+    return @bitCast(v2u64, floatToInt(u128, a));
+}

lib/compiler_rt/fixunstfti.zig

@@ -1,12 +1,23 @@
+const builtin = @import("builtin");
 const common = @import("./common.zig");
 const floatToInt = @import("./float_to_int.zig").floatToInt;
 
 pub const panic = common.panic;
 
 comptime {
-    @export(__fixunstfti, .{ .name = "__fixunstfti", .linkage = common.linkage });
+    if (common.want_windows_v2u64_abi) {
+        @export(__fixunstfti_windows_x86_64, .{ .name = "__fixunstfti", .linkage = common.linkage });
+    } else {
+        @export(__fixunstfti, .{ .name = "__fixunstfti", .linkage = common.linkage });
+    }
 }
 
 pub fn __fixunstfti(a: f128) callconv(.C) u128 {
     return floatToInt(u128, a);
 }
+
+const v2u64 = @Vector(2, u64);
+
+fn __fixunstfti_windows_x86_64(a: f128) callconv(.C) v2u64 {
+    return @bitCast(v2u64, floatToInt(u128, a));
+}

lib/compiler_rt/fixunsxfti.zig

@@ -1,12 +1,23 @@
+const builtin = @import("builtin");
 const common = @import("./common.zig");
 const floatToInt = @import("./float_to_int.zig").floatToInt;
 
 pub const panic = common.panic;
 
 comptime {
-    @export(__fixunsxfti, .{ .name = "__fixunsxfti", .linkage = common.linkage });
+    if (common.want_windows_v2u64_abi) {
+        @export(__fixunsxfti_windows_x86_64, .{ .name = "__fixunsxfti", .linkage = common.linkage });
+    } else {
+        @export(__fixunsxfti, .{ .name = "__fixunsxfti", .linkage = common.linkage });
+    }
 }
 
 pub fn __fixunsxfti(a: f80) callconv(.C) u128 {
     return floatToInt(u128, a);
 }
+
+const v2u64 = @Vector(2, u64);
+
+fn __fixunsxfti_windows_x86_64(a: f80) callconv(.C) v2u64 {
+    return @bitCast(v2u64, floatToInt(u128, a));
+}