authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-01-07 03:59:09+01:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-01-07 08:44:45+01:00
log23281704dc3b3fedf7c215edcb38f84e7e059b2e
tree80ed57893ad5c0153e08b98c4b6186bf142cbe5a
parentfc28a71d9f019dc4ae65a363cad6330791ea928c

test: Enable long calls for all thumb/thumbeb module tests.

The relocation range issues will happen eventually as we add more code to the standard library and test suites, so we may as well just deal with this now. @MasonRemaley ran into this in #20271, for example.

1 files changed, 23 insertions(+), 86 deletions(-)

test/tests.zig+23-86
...@@ -425,41 +425,23 @@ const test_targets = blk: {...@@ -425,41 +425,23 @@ const test_targets = blk: {
425 .link_libc = true,425 .link_libc = true,
426 },426 },
427427
428 // Calls are normally lowered to branch instructions that only support +/- 16 MB range when
429 // targeting Thumb. This easily becomes insufficient for our test binaries, so use long
430 // calls to avoid out-of-range relocations.
428 .{431 .{
429 .target = .{432 .target = std.Target.Query.parse(.{
430 .cpu_arch = .thumb,433 .arch_os_abi = "thumb-linux-eabi",
431 .os_tag = .linux,434 .cpu_features = "baseline+long_calls",
432 .abi = .eabi,435 }) catch unreachable,
433 },436 .pic = false, // Long calls don't work with PIC.
434 },
435 .{
436 .target = .{
437 .cpu_arch = .thumb,
438 .os_tag = .linux,
439 .abi = .eabihf,
440 },
441 },
442 .{
443 .target = .{
444 .cpu_arch = .thumb,
445 .os_tag = .linux,
446 .abi = .musleabi,
447 },
448 .link_libc = true,
449 .skip_modules = &.{"std"},
450 },437 },
451 .{438 .{
452 .target = .{439 .target = std.Target.Query.parse(.{
453 .cpu_arch = .thumb,440 .arch_os_abi = "thumb-linux-eabihf",
454 .os_tag = .linux,441 .cpu_features = "baseline+long_calls",
455 .abi = .musleabihf,442 }) catch unreachable,
456 },443 .pic = false, // Long calls don't work with PIC.
457 .link_libc = true,
458 .skip_modules = &.{"std"},
459 },444 },
460 // Calls are normally lowered to branch instructions that only support +/- 16 MB range when
461 // targeting Thumb. This is not sufficient for the std test binary linked statically with
462 // musl, so use long calls to avoid out-of-range relocations.
463 .{445 .{
464 .target = std.Target.Query.parse(.{446 .target = std.Target.Query.parse(.{
465 .arch_os_abi = "thumb-linux-musleabi",447 .arch_os_abi = "thumb-linux-musleabi",
...@@ -467,12 +449,6 @@ const test_targets = blk: {...@@ -467,12 +449,6 @@ const test_targets = blk: {
467 }) catch unreachable,449 }) catch unreachable,
468 .link_libc = true,450 .link_libc = true,
469 .pic = false, // Long calls don't work with PIC.451 .pic = false, // Long calls don't work with PIC.
470 .skip_modules = &.{
471 "behavior",
472 "c-import",
473 "compiler-rt",
474 "universal-libc",
475 },
476 },452 },
477 .{453 .{
478 .target = std.Target.Query.parse(.{454 .target = std.Target.Query.parse(.{
...@@ -481,49 +457,22 @@ const test_targets = blk: {...@@ -481,49 +457,22 @@ const test_targets = blk: {
481 }) catch unreachable,457 }) catch unreachable,
482 .link_libc = true,458 .link_libc = true,
483 .pic = false, // Long calls don't work with PIC.459 .pic = false, // Long calls don't work with PIC.
484 .skip_modules = &.{
485 "behavior",
486 "c-import",
487 "compiler-rt",
488 "universal-libc",
489 },
490 },460 },
491461
492 .{462 .{
493 .target = .{463 .target = std.Target.Query.parse(.{
494 .cpu_arch = .thumbeb,464 .arch_os_abi = "thumbeb-linux-eabi",
495 .os_tag = .linux,465 .cpu_features = "baseline+long_calls",
496 .abi = .eabi,466 }) catch unreachable,
497 },467 .pic = false, // Long calls don't work with PIC.
498 },
499 .{
500 .target = .{
501 .cpu_arch = .thumbeb,
502 .os_tag = .linux,
503 .abi = .eabihf,
504 },
505 },
506 .{
507 .target = .{
508 .cpu_arch = .thumbeb,
509 .os_tag = .linux,
510 .abi = .musleabi,
511 },
512 .link_libc = true,
513 .skip_modules = &.{"std"},
514 },468 },
515 .{469 .{
516 .target = .{470 .target = std.Target.Query.parse(.{
517 .cpu_arch = .thumbeb,471 .arch_os_abi = "thumbeb-linux-eabihf",
518 .os_tag = .linux,472 .cpu_features = "baseline+long_calls",
519 .abi = .musleabihf,473 }) catch unreachable,
520 },474 .pic = false, // Long calls don't work with PIC.
521 .link_libc = true,
522 .skip_modules = &.{"std"},
523 },475 },
524 // Calls are normally lowered to branch instructions that only support +/- 16 MB range when
525 // targeting Thumb. This is not sufficient for the std test binary linked statically with
526 // musl, so use long calls to avoid out-of-range relocations.
527 .{476 .{
528 .target = std.Target.Query.parse(.{477 .target = std.Target.Query.parse(.{
529 .arch_os_abi = "thumbeb-linux-musleabi",478 .arch_os_abi = "thumbeb-linux-musleabi",
...@@ -531,12 +480,6 @@ const test_targets = blk: {...@@ -531,12 +480,6 @@ const test_targets = blk: {
531 }) catch unreachable,480 }) catch unreachable,
532 .link_libc = true,481 .link_libc = true,
533 .pic = false, // Long calls don't work with PIC.482 .pic = false, // Long calls don't work with PIC.
534 .skip_modules = &.{
535 "behavior",
536 "c-import",
537 "compiler-rt",
538 "universal-libc",
539 },
540 },483 },
541 .{484 .{
542 .target = std.Target.Query.parse(.{485 .target = std.Target.Query.parse(.{
...@@ -545,12 +488,6 @@ const test_targets = blk: {...@@ -545,12 +488,6 @@ const test_targets = blk: {
545 }) catch unreachable,488 }) catch unreachable,
546 .link_libc = true,489 .link_libc = true,
547 .pic = false, // Long calls don't work with PIC.490 .pic = false, // Long calls don't work with PIC.
548 .skip_modules = &.{
549 "behavior",
550 "c-import",
551 "compiler-rt",
552 "universal-libc",
553 },
554 },491 },
555492
556 .{493 .{