authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2026-01-23 19:47:12+01:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2026-01-23 21:16:03+01:00
loge437efd6015cdc369a2ca632565d105e9f04f20f
tree9570a204defe1aecfcc5e4cb0f2ef4d6cc5e6af4
parentc699bb81347dc0c9371c7c6c2cddab457cbe02ba
signaturebadge-check Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM

test: enable thumb-windows-gnu module tests

We use long calls for these just like thumb*-linux-* to prevent range issues as the binaries grow larger over time. We also need function and data sections due to the many __stack_chk_guard references within the std test binary; without these options, the linker is not able to insert range thunks in between functions because the std binary just has one giant .text section that's opaque to the linker. closes https://codeberg.org/ziglang/zig/issues/30923

1 files changed, 38 insertions(+), 27 deletions(-)

test/tests.zig+38-27
......@@ -28,6 +28,8 @@ const TestTarget = struct {
2828 use_lld: ?bool = null,
2929 pic: ?bool = null,
3030 strip: ?bool = null,
31 function_sections: ?bool = null,
32 data_sections: ?bool = null,
3133 skip_modules: []const []const u8 = &.{},
3234
3335 // This is intended for targets that, for any reason, shouldn't be run as part of a normal test
......@@ -40,7 +42,7 @@ const test_targets = blk: {
4042 // getBaselineCpuFeatures calls populateDependencies which has a O(N ^ 2) algorithm
4143 // (where N is roughly 160, which technically makes it O(1), but it adds up to a
4244 // lot of branches)
43 @setEvalBranchQuota(60000);
45 @setEvalBranchQuota(80_000);
4446 break :blk [_]TestTarget{
4547 // Native Targets
4648
......@@ -1526,36 +1528,43 @@ const test_targets = blk: {
15261528 },
15271529
15281530 .{
1529 .target = .{
1530 .cpu_arch = .thumb,
1531 .os_tag = .windows,
1532 .abi = .msvc,
1533 },
1531 .target = std.Target.Query.parse(.{
1532 .arch_os_abi = "thumb-windows-msvc",
1533 .cpu_features = "baseline+long_calls",
1534 }) catch unreachable,
1535 .pic = false, // Long calls don't work with PIC.
1536 .function_sections = true,
1537 .data_sections = true,
15341538 },
15351539 .{
1536 .target = .{
1537 .cpu_arch = .thumb,
1538 .os_tag = .windows,
1539 .abi = .msvc,
1540 },
1540 .target = std.Target.Query.parse(.{
1541 .arch_os_abi = "thumb-windows-msvc",
1542 .cpu_features = "baseline+long_calls",
1543 }) catch unreachable,
15411544 .link_libc = true,
1545 .pic = false, // Long calls don't work with PIC.
1546 .function_sections = true,
1547 .data_sections = true,
1548 },
1549 .{
1550 .target = std.Target.Query.parse(.{
1551 .arch_os_abi = "thumb-windows-gnu",
1552 .cpu_features = "baseline+long_calls",
1553 }) catch unreachable,
1554 .pic = false, // Long calls don't work with PIC.
1555 .function_sections = true,
1556 .data_sections = true,
1557 },
1558 .{
1559 .target = std.Target.Query.parse(.{
1560 .arch_os_abi = "thumb-windows-gnu",
1561 .cpu_features = "baseline+long_calls",
1562 }) catch unreachable,
1563 .link_libc = true,
1564 .pic = false, // Long calls don't work with PIC.
1565 .function_sections = true,
1566 .data_sections = true,
15421567 },
1543 // https://github.com/ziglang/zig/issues/24016
1544 // .{
1545 // .target = .{
1546 // .cpu_arch = .thumb,
1547 // .os_tag = .windows,
1548 // .abi = .gnu,
1549 // },
1550 // },
1551 // .{
1552 // .target = .{
1553 // .cpu_arch = .thumb,
1554 // .os_tag = .windows,
1555 // .abi = .gnu,
1556 // },
1557 // .link_libc = true,
1558 // },
15591568
15601569 .{
15611570 .target = .{
......@@ -2454,6 +2463,8 @@ fn addOneModuleTest(
24542463 if (options.build_options) |build_options| {
24552464 these_tests.root_module.addOptions("build_options", build_options);
24562465 }
2466 if (test_target.function_sections) |fs| these_tests.link_function_sections = fs;
2467 if (test_target.data_sections) |ds| these_tests.link_data_sections = ds;
24572468 const single_threaded_suffix = if (test_target.single_threaded == true) "-single" else "";
24582469 const backend_suffix = if (test_target.use_llvm == true)
24592470 "-llvm"