@@ -425,54 +425,30 @@ const test_targets = blk: {
425
425
.link_libc = true ,
426
426
},
427
427
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 = .{
430
- .cpu_arch = .thumb ,
431
- .os_tag = .linux ,
432
- .abi = .eabi ,
433
- },
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" },
432
+ .target = std .Target .Query .parse (.{
433
+ .arch_os_abi = "thumb-linux-eabi" ,
434
+ .cpu_features = "baseline+long_calls" ,
435
+ }) catch unreachable ,
436
+ .pic = false , // Long calls don't work with PIC.
450
437
},
451
438
.{
452
- .target = .{
453
- .cpu_arch = .thumb ,
454
- .os_tag = .linux ,
455
- .abi = .musleabihf ,
456
- },
457
- .link_libc = true ,
458
- .skip_modules = &.{"std" },
439
+ .target = std .Target .Query .parse (.{
440
+ .arch_os_abi = "thumb-linux-eabihf" ,
441
+ .cpu_features = "baseline+long_calls" ,
442
+ }) catch unreachable ,
443
+ .pic = false , // Long calls don't work with PIC.
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
446
.target = std .Target .Query .parse (.{
465
447
.arch_os_abi = "thumb-linux-musleabi" ,
466
448
.cpu_features = "baseline+long_calls" ,
467
449
}) catch unreachable ,
468
450
.link_libc = true ,
469
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
454
.target = std .Target .Query .parse (.{
@@ -481,62 +457,29 @@ const test_targets = blk: {
481
457
}) catch unreachable ,
482
458
.link_libc = true ,
483
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
},
491
461
492
462
.{
493
- .target = .{
494
- .cpu_arch = .thumbeb ,
495
- .os_tag = .linux ,
496
- .abi = .eabi ,
497
- },
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" },
463
+ .target = std .Target .Query .parse (.{
464
+ .arch_os_abi = "thumbeb-linux-eabi" ,
465
+ .cpu_features = "baseline+long_calls" ,
466
+ }) catch unreachable ,
467
+ .pic = false , // Long calls don't work with PIC.
514
468
},
515
469
.{
516
- .target = .{
517
- .cpu_arch = .thumbeb ,
518
- .os_tag = .linux ,
519
- .abi = .musleabihf ,
520
- },
521
- .link_libc = true ,
522
- .skip_modules = &.{"std" },
470
+ .target = std .Target .Query .parse (.{
471
+ .arch_os_abi = "thumbeb-linux-eabihf" ,
472
+ .cpu_features = "baseline+long_calls" ,
473
+ }) catch unreachable ,
474
+ .pic = false , // Long calls don't work with PIC.
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
477
.target = std .Target .Query .parse (.{
529
478
.arch_os_abi = "thumbeb-linux-musleabi" ,
530
479
.cpu_features = "baseline+long_calls" ,
531
480
}) catch unreachable ,
532
481
.link_libc = true ,
533
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
485
.target = std .Target .Query .parse (.{
@@ -545,12 +488,6 @@ const test_targets = blk: {
545
488
}) catch unreachable ,
546
489
.link_libc = true ,
547
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
},
555
492
556
493
.{
0 commit comments