authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2026-06-19 12:34:40+02:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2026-06-19 12:34:40+02:00
log10083cc23e66a62a85d642faf7891b9ef3a6cdde
tree03beb3f18db3654f046bb6edd5ede6b9c6ab6359
parent787a2c9d7a5fd0f6aaa10a406cda5bd2f4eb33a7
parent6e001367a436ddae0c5d7e5861200a7966940073

Merge pull request 'test: promote most x32/n32 module test targets to non-extra status' (#35836) from alexrp/zig:x32-n32-graduation into master

Reviewed-on: https://codeberg.org/ziglang/zig/pulls/35836

4 files changed, 9 insertions(+), 11 deletions(-)

lib/libc/musl/src/thread/x32/clone.s+1-1
......@@ -8,7 +8,7 @@ __clone:
88 mov %rdx,%rdi
99 mov %r8,%rdx
1010 mov %r9,%r8
11 mov 8(%rsp),%r10
11 mov 8(%rsp),%r10d
1212 mov %r11,%r9
1313 and $-16,%rsi
1414 sub $8,%rsi
lib/std/os/linux.zig+6-2
......@@ -9438,7 +9438,7 @@ pub const timezone = extern struct {
94389438/// The timespec struct used by the kernel.
94399439pub const kernel_timespec = extern struct {
94409440 sec: i64,
9441 nsec: i64,
9441 nsec: isize,
94429442
94439443 /// For use with `utimensat` and `futimens`.
94449444 pub const NOW: timespec = .{
......@@ -9460,7 +9460,11 @@ pub const UTIME = struct {
94609460};
94619461
94629462// https://github.com/ziglang/zig/issues/4726#issuecomment-2190337877
9463pub const timespec = if (native_arch == .hexagon or native_arch == .riscv32) kernel_timespec else extern struct {
9463const use_kernel_timespec = native_arch == .hexagon or native_arch == .riscv32 or switch (native_abi) {
9464 .gnux32, .muslx32, .x32 => true,
9465 else => false,
9466};
9467pub const timespec = if (use_kernel_timespec) kernel_timespec else extern struct {
94649468 sec: isize,
94659469 nsec: isize,
94669470};
lib/std/os/linux/x32.zig+2-2
......@@ -130,7 +130,7 @@ pub fn clone() callconv(.naked) u32 {
130130 \\ mov %%rdx,%%rdi
131131 \\ mov %%r8,%%rdx
132132 \\ mov %%r9,%%r8
133 \\ mov 8(%%rsp),%%r10
133 \\ mov 8(%%rsp),%%r10d
134134 \\ mov %%r11,%%r9
135135 \\ and $-16,%%rsi
136136 \\ sub $8,%%rsi
......@@ -175,7 +175,7 @@ pub fn restore_rt() callconv(.naked) noreturn {
175175 }
176176}
177177
178pub const time_t = i32;
178pub const time_t = i64;
179179
180180pub const VDSO = struct {
181181 pub const CGT_SYM = "__vdso_clock_gettime";
test/tests.zig-6
......@@ -627,7 +627,6 @@ const module_test_targets = blk: {
627627 .os_tag = .linux,
628628 .abi = .abin32,
629629 },
630 .extra_target = true,
631630 },
632631 .{
633632 .target = .{
......@@ -654,7 +653,6 @@ const module_test_targets = blk: {
654653 .abi = .muslabin32,
655654 },
656655 .link_libc = true,
657 .extra_target = true,
658656 },
659657 .{
660658 .target = .{
......@@ -681,7 +679,6 @@ const module_test_targets = blk: {
681679 .abi = .gnuabin32,
682680 },
683681 .link_libc = true,
684 .extra_target = true,
685682 },
686683
687684 .{
......@@ -1167,7 +1164,6 @@ const module_test_targets = blk: {
11671164 .os_tag = .linux,
11681165 .abi = .x32,
11691166 },
1170 .extra_target = true,
11711167 },
11721168 .{
11731169 .target = .{
......@@ -1204,7 +1200,6 @@ const module_test_targets = blk: {
12041200 .abi = .muslx32,
12051201 },
12061202 .link_libc = true,
1207 .extra_target = true,
12081203 },
12091204 .{
12101205 .target = .{
......@@ -1231,7 +1226,6 @@ const module_test_targets = blk: {
12311226 .abi = .gnux32,
12321227 },
12331228 .link_libc = true,
1234 .extra_target = true,
12351229 },
12361230
12371231 // Darwin Targets