| author |  Alex Rønne Petersen <alex@alexrp.com> 2026-06-19 12:34:40+02:00 |
| committer | Alex Rønne Petersen <alex@alexrp.com> 2026-06-19 12:34:40+02:00 |
| log | 10083cc23e66a62a85d642faf7891b9ef3a6cdde |
| tree | 03beb3f18db3654f046bb6edd5ede6b9c6ab6359 |
| parent | 787a2c9d7a5fd0f6aaa10a406cda5bd2f4eb33a7 |
| parent | 6e001367a436ddae0c5d7e5861200a7966940073 |
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/358364 files changed, 9 insertions(+), 11 deletions(-)
lib/libc/musl/src/thread/x32/clone.s+1-1
| ... | @@ -8,7 +8,7 @@ __clone: | ... | @@ -8,7 +8,7 @@ __clone: |
| 8 | mov %rdx,%rdi | 8 | mov %rdx,%rdi |
| 9 | mov %r8,%rdx | 9 | mov %r8,%rdx |
| 10 | mov %r9,%r8 | 10 | mov %r9,%r8 |
| 11 | mov 8(%rsp),%r10 | 11 | mov 8(%rsp),%r10d |
| 12 | mov %r11,%r9 | 12 | mov %r11,%r9 |
| 13 | and $-16,%rsi | 13 | and $-16,%rsi |
| 14 | sub $8,%rsi | 14 | sub $8,%rsi |
lib/std/os/linux.zig+6-2
| ... | @@ -9438,7 +9438,7 @@ pub const timezone = extern struct { | ... | @@ -9438,7 +9438,7 @@ pub const timezone = extern struct { |
| 9438 | /// The timespec struct used by the kernel. | 9438 | /// The timespec struct used by the kernel. |
| 9439 | pub const kernel_timespec = extern struct { | 9439 | pub const kernel_timespec = extern struct { |
| 9440 | sec: i64, | 9440 | sec: i64, |
| 9441 | nsec: i64, | 9441 | nsec: isize, |
| 9442 | 9442 | ||
| 9443 | /// For use with `utimensat` and `futimens`. | 9443 | /// For use with `utimensat` and `futimens`. |
| 9444 | pub const NOW: timespec = .{ | 9444 | pub const NOW: timespec = .{ |
| ... | @@ -9460,7 +9460,11 @@ pub const UTIME = struct { | ... | @@ -9460,7 +9460,11 @@ pub const UTIME = struct { |
| 9460 | }; | 9460 | }; |
| 9461 | 9461 | ||
| 9462 | // https://github.com/ziglang/zig/issues/4726#issuecomment-2190337877 | 9462 | // https://github.com/ziglang/zig/issues/4726#issuecomment-2190337877 |
| 9463 | pub const timespec = if (native_arch == .hexagon or native_arch == .riscv32) kernel_timespec else extern struct { | 9463 | const use_kernel_timespec = native_arch == .hexagon or native_arch == .riscv32 or switch (native_abi) { |
| 9464 | .gnux32, .muslx32, .x32 => true, | ||
| 9465 | else => false, | ||
| 9466 | }; | ||
| 9467 | pub const timespec = if (use_kernel_timespec) kernel_timespec else extern struct { | ||
| 9464 | sec: isize, | 9468 | sec: isize, |
| 9465 | nsec: isize, | 9469 | nsec: isize, |
| 9466 | }; | 9470 | }; |
lib/std/os/linux/x32.zig+2-2
| ... | @@ -130,7 +130,7 @@ pub fn clone() callconv(.naked) u32 { | ... | @@ -130,7 +130,7 @@ pub fn clone() callconv(.naked) u32 { |
| 130 | \\ mov %%rdx,%%rdi | 130 | \\ mov %%rdx,%%rdi |
| 131 | \\ mov %%r8,%%rdx | 131 | \\ mov %%r8,%%rdx |
| 132 | \\ mov %%r9,%%r8 | 132 | \\ mov %%r9,%%r8 |
| 133 | \\ mov 8(%%rsp),%%r10 | 133 | \\ mov 8(%%rsp),%%r10d |
| 134 | \\ mov %%r11,%%r9 | 134 | \\ mov %%r11,%%r9 |
| 135 | \\ and $-16,%%rsi | 135 | \\ and $-16,%%rsi |
| 136 | \\ sub $8,%%rsi | 136 | \\ sub $8,%%rsi |
| ... | @@ -175,7 +175,7 @@ pub fn restore_rt() callconv(.naked) noreturn { | ... | @@ -175,7 +175,7 @@ pub fn restore_rt() callconv(.naked) noreturn { |
| 175 | } | 175 | } |
| 176 | } | 176 | } |
| 177 | 177 | ||
| 178 | pub const time_t = i32; | 178 | pub const time_t = i64; |
| 179 | 179 | ||
| 180 | pub const VDSO = struct { | 180 | pub const VDSO = struct { |
| 181 | pub const CGT_SYM = "__vdso_clock_gettime"; | 181 | pub const CGT_SYM = "__vdso_clock_gettime"; |
test/tests.zig-6
| ... | @@ -627,7 +627,6 @@ const module_test_targets = blk: { | ... | @@ -627,7 +627,6 @@ const module_test_targets = blk: { |
| 627 | .os_tag = .linux, | 627 | .os_tag = .linux, |
| 628 | .abi = .abin32, | 628 | .abi = .abin32, |
| 629 | }, | 629 | }, |
| 630 | .extra_target = true, | ||
| 631 | }, | 630 | }, |
| 632 | .{ | 631 | .{ |
| 633 | .target = .{ | 632 | .target = .{ |
| ... | @@ -654,7 +653,6 @@ const module_test_targets = blk: { | ... | @@ -654,7 +653,6 @@ const module_test_targets = blk: { |
| 654 | .abi = .muslabin32, | 653 | .abi = .muslabin32, |
| 655 | }, | 654 | }, |
| 656 | .link_libc = true, | 655 | .link_libc = true, |
| 657 | .extra_target = true, | ||
| 658 | }, | 656 | }, |
| 659 | .{ | 657 | .{ |
| 660 | .target = .{ | 658 | .target = .{ |
| ... | @@ -681,7 +679,6 @@ const module_test_targets = blk: { | ... | @@ -681,7 +679,6 @@ const module_test_targets = blk: { |
| 681 | .abi = .gnuabin32, | 679 | .abi = .gnuabin32, |
| 682 | }, | 680 | }, |
| 683 | .link_libc = true, | 681 | .link_libc = true, |
| 684 | .extra_target = true, | ||
| 685 | }, | 682 | }, |
| 686 | 683 | ||
| 687 | .{ | 684 | .{ |
| ... | @@ -1167,7 +1164,6 @@ const module_test_targets = blk: { | ... | @@ -1167,7 +1164,6 @@ const module_test_targets = blk: { |
| 1167 | .os_tag = .linux, | 1164 | .os_tag = .linux, |
| 1168 | .abi = .x32, | 1165 | .abi = .x32, |
| 1169 | }, | 1166 | }, |
| 1170 | .extra_target = true, | ||
| 1171 | }, | 1167 | }, |
| 1172 | .{ | 1168 | .{ |
| 1173 | .target = .{ | 1169 | .target = .{ |
| ... | @@ -1204,7 +1200,6 @@ const module_test_targets = blk: { | ... | @@ -1204,7 +1200,6 @@ const module_test_targets = blk: { |
| 1204 | .abi = .muslx32, | 1200 | .abi = .muslx32, |
| 1205 | }, | 1201 | }, |
| 1206 | .link_libc = true, | 1202 | .link_libc = true, |
| 1207 | .extra_target = true, | ||
| 1208 | }, | 1203 | }, |
| 1209 | .{ | 1204 | .{ |
| 1210 | .target = .{ | 1205 | .target = .{ |
| ... | @@ -1231,7 +1226,6 @@ const module_test_targets = blk: { | ... | @@ -1231,7 +1226,6 @@ const module_test_targets = blk: { |
| 1231 | .abi = .gnux32, | 1226 | .abi = .gnux32, |
| 1232 | }, | 1227 | }, |
| 1233 | .link_libc = true, | 1228 | .link_libc = true, |
| 1234 | .extra_target = true, | ||
| 1235 | }, | 1229 | }, |
| 1236 | 1230 | ||
| 1237 | // Darwin Targets | 1231 | // Darwin Targets |