| author |  Alex Rønne Petersen <alex@alexrp.com> 2025-01-06 21:51:56+01:00 |
| committer |  GitHub <noreply@github.com> 2025-01-06 21:51:56+01:00 |
| log | 0fb80b0633fc5ebc92776449cb4e76068b5845f5 |
| tree | 3d72f6598837e534f7a306f3f94b70a6be8591d3 |
| parent | a7a5f3506b74651235ba7112ce38b7c3205d0527 |
| parent | 03ac40d5709060168e10c9c3187ffb5a161e773b |
| signature |  Signed by PGP key B5690EEEBB952194 |
Merge pull request #22430 from alexrp/thumbeb
Some QEMU fixes + disable some tests for `thumbeb` in addition to `armeb`5 files changed, 14 insertions(+), 11 deletions(-)
lib- test
- behavior
lib/std/fmt.zig+1-1
| ... | @@ -2596,7 +2596,7 @@ test "positional/alignment/width/precision" { | ... | @@ -2596,7 +2596,7 @@ test "positional/alignment/width/precision" { |
| 2596 | } | 2596 | } |
| 2597 | 2597 | ||
| 2598 | test "vector" { | 2598 | test "vector" { |
| 2599 | if (builtin.cpu.arch == .armeb and builtin.zig_backend == .stage2_llvm) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/22060 | 2599 | if ((builtin.cpu.arch == .armeb or builtin.cpu.arch == .thumbeb) and builtin.zig_backend == .stage2_llvm) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/22060 |
| 2600 | if (builtin.target.cpu.arch == .riscv64) { | 2600 | if (builtin.target.cpu.arch == .riscv64) { |
| 2601 | // https://github.com/ziglang/zig/issues/4486 | 2601 | // https://github.com/ziglang/zig/issues/4486 |
| 2602 | return error.SkipZigTest; | 2602 | return error.SkipZigTest; |
lib/std/simd.zig+1-1
| ... | @@ -462,7 +462,7 @@ pub fn prefixScan(comptime op: std.builtin.ReduceOp, comptime hop: isize, vec: a | ... | @@ -462,7 +462,7 @@ pub fn prefixScan(comptime op: std.builtin.ReduceOp, comptime hop: isize, vec: a |
| 462 | 462 | ||
| 463 | test "vector prefix scan" { | 463 | test "vector prefix scan" { |
| 464 | if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; | 464 | if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; |
| 465 | if (builtin.cpu.arch == .armeb and builtin.zig_backend == .stage2_llvm) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/22060 | 465 | if ((builtin.cpu.arch == .armeb or builtin.cpu.arch == .thumbeb) and builtin.zig_backend == .stage2_llvm) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/22060 |
| 466 | if (builtin.cpu.arch == .aarch64_be and builtin.zig_backend == .stage2_llvm) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/21893 | 466 | if (builtin.cpu.arch == .aarch64_be and builtin.zig_backend == .stage2_llvm) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/21893 |
| 467 | 467 | ||
| 468 | if (comptime builtin.cpu.arch.isMIPS()) { | 468 | if (comptime builtin.cpu.arch.isMIPS()) { |
lib/std/zig/system.zig+6-3
| ... | @@ -83,8 +83,8 @@ pub fn getExternalExecutor( | ... | @@ -83,8 +83,8 @@ pub fn getExternalExecutor( |
| 83 | return switch (candidate.cpu.arch) { | 83 | return switch (candidate.cpu.arch) { |
| 84 | .aarch64 => Executor{ .qemu = "qemu-aarch64" }, | 84 | .aarch64 => Executor{ .qemu = "qemu-aarch64" }, |
| 85 | .aarch64_be => Executor{ .qemu = "qemu-aarch64_be" }, | 85 | .aarch64_be => Executor{ .qemu = "qemu-aarch64_be" }, |
| 86 | .arm => Executor{ .qemu = "qemu-arm" }, | 86 | .arm, .thumb => Executor{ .qemu = "qemu-arm" }, |
| 87 | .armeb => Executor{ .qemu = "qemu-armeb" }, | 87 | .armeb, .thumbeb => Executor{ .qemu = "qemu-armeb" }, |
| 88 | .hexagon => Executor{ .qemu = "qemu-hexagon" }, | 88 | .hexagon => Executor{ .qemu = "qemu-hexagon" }, |
| 89 | .loongarch64 => Executor{ .qemu = "qemu-loongarch64" }, | 89 | .loongarch64 => Executor{ .qemu = "qemu-loongarch64" }, |
| 90 | .m68k => Executor{ .qemu = "qemu-m68k" }, | 90 | .m68k => Executor{ .qemu = "qemu-m68k" }, |
| ... | @@ -116,7 +116,10 @@ pub fn getExternalExecutor( | ... | @@ -116,7 +116,10 @@ pub fn getExternalExecutor( |
| 116 | }, | 116 | }, |
| 117 | .sparc64 => Executor{ .qemu = "qemu-sparc64" }, | 117 | .sparc64 => Executor{ .qemu = "qemu-sparc64" }, |
| 118 | .x86 => Executor{ .qemu = "qemu-i386" }, | 118 | .x86 => Executor{ .qemu = "qemu-i386" }, |
| 119 | .x86_64 => Executor{ .qemu = "qemu-x86_64" }, | 119 | .x86_64 => switch (candidate.abi) { |
| 120 | .gnux32, .muslx32 => return bad_result, | ||
| 121 | else => Executor{ .qemu = "qemu-x86_64" }, | ||
| 122 | }, | ||
| 120 | .xtensa => Executor{ .qemu = "qemu-xtensa" }, | 123 | .xtensa => Executor{ .qemu = "qemu-xtensa" }, |
| 121 | else => return bad_result, | 124 | else => return bad_result, |
| 122 | }; | 125 | }; |
test/behavior/align.zig+2-2
| ... | @@ -347,7 +347,7 @@ test "@alignCast functions" { | ... | @@ -347,7 +347,7 @@ test "@alignCast functions" { |
| 347 | 347 | ||
| 348 | // function alignment is a compile error on wasm32/wasm64 | 348 | // function alignment is a compile error on wasm32/wasm64 |
| 349 | if (native_arch == .wasm32 or native_arch == .wasm64) return error.SkipZigTest; | 349 | if (native_arch == .wasm32 or native_arch == .wasm64) return error.SkipZigTest; |
| 350 | if (native_arch == .thumb) return error.SkipZigTest; | 350 | if (native_arch == .thumb or native_arch == .thumbeb) return error.SkipZigTest; |
| 351 | 351 | ||
| 352 | try expect(fnExpectsOnly1(simple4) == 0x19); | 352 | try expect(fnExpectsOnly1(simple4) == 0x19); |
| 353 | } | 353 | } |
| ... | @@ -512,7 +512,7 @@ test "align(N) on functions" { | ... | @@ -512,7 +512,7 @@ test "align(N) on functions" { |
| 512 | 512 | ||
| 513 | // function alignment is a compile error on wasm32/wasm64 | 513 | // function alignment is a compile error on wasm32/wasm64 |
| 514 | if (native_arch == .wasm32 or native_arch == .wasm64) return error.SkipZigTest; | 514 | if (native_arch == .wasm32 or native_arch == .wasm64) return error.SkipZigTest; |
| 515 | if (native_arch == .thumb) return error.SkipZigTest; | 515 | if (native_arch == .thumb or native_arch == .thumbeb) return error.SkipZigTest; |
| 516 | 516 | ||
| 517 | try expect((@intFromPtr(&overaligned_fn) & (0x1000 - 1)) == 0); | 517 | try expect((@intFromPtr(&overaligned_fn) & (0x1000 - 1)) == 0); |
| 518 | } | 518 | } |
test/behavior/vector.zig+4-4
| ... | @@ -640,7 +640,7 @@ test "vector division operators" { | ... | @@ -640,7 +640,7 @@ test "vector division operators" { |
| 640 | }; | 640 | }; |
| 641 | 641 | ||
| 642 | try comptime S.doTheTest(); | 642 | try comptime S.doTheTest(); |
| 643 | if (builtin.cpu.arch == .armeb and builtin.zig_backend == .stage2_llvm) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/22060 | 643 | if ((builtin.cpu.arch == .armeb or builtin.cpu.arch == .thumbeb) and builtin.zig_backend == .stage2_llvm) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/22060 |
| 644 | try S.doTheTest(); | 644 | try S.doTheTest(); |
| 645 | } | 645 | } |
| 646 | 646 | ||
| ... | @@ -1100,7 +1100,7 @@ test "@addWithOverflow" { | ... | @@ -1100,7 +1100,7 @@ test "@addWithOverflow" { |
| 1100 | } | 1100 | } |
| 1101 | }; | 1101 | }; |
| 1102 | try comptime S.doTheTest(); | 1102 | try comptime S.doTheTest(); |
| 1103 | if (builtin.cpu.arch == .armeb and builtin.zig_backend == .stage2_llvm) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/22060 | 1103 | if ((builtin.cpu.arch == .armeb or builtin.cpu.arch == .thumbeb) and builtin.zig_backend == .stage2_llvm) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/22060 |
| 1104 | try S.doTheTest(); | 1104 | try S.doTheTest(); |
| 1105 | } | 1105 | } |
| 1106 | 1106 | ||
| ... | @@ -1134,7 +1134,7 @@ test "@subWithOverflow" { | ... | @@ -1134,7 +1134,7 @@ test "@subWithOverflow" { |
| 1134 | } | 1134 | } |
| 1135 | }; | 1135 | }; |
| 1136 | try comptime S.doTheTest(); | 1136 | try comptime S.doTheTest(); |
| 1137 | if (builtin.cpu.arch == .armeb and builtin.zig_backend == .stage2_llvm) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/22060 | 1137 | if ((builtin.cpu.arch == .armeb or builtin.cpu.arch == .thumbeb) and builtin.zig_backend == .stage2_llvm) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/22060 |
| 1138 | try S.doTheTest(); | 1138 | try S.doTheTest(); |
| 1139 | } | 1139 | } |
| 1140 | 1140 | ||
| ... | @@ -1158,7 +1158,7 @@ test "@mulWithOverflow" { | ... | @@ -1158,7 +1158,7 @@ test "@mulWithOverflow" { |
| 1158 | } | 1158 | } |
| 1159 | }; | 1159 | }; |
| 1160 | try comptime S.doTheTest(); | 1160 | try comptime S.doTheTest(); |
| 1161 | if (builtin.cpu.arch == .armeb and builtin.zig_backend == .stage2_llvm) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/22060 | 1161 | if ((builtin.cpu.arch == .armeb or builtin.cpu.arch == .thumbeb) and builtin.zig_backend == .stage2_llvm) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/22060 |
| 1162 | try S.doTheTest(); | 1162 | try S.doTheTest(); |
| 1163 | } | 1163 | } |
| 1164 | 1164 |