diff options
| author | Alex Rønne Petersen <alex@alexrp.com> | 2025-01-06 21:51:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-06 21:51:56 +0100 |
| commit | 0fb80b0633fc5ebc92776449cb4e76068b5845f5 (patch) | |
| tree | 3d72f6598837e534f7a306f3f94b70a6be8591d3 /lib/std | |
| parent | a7a5f3506b74651235ba7112ce38b7c3205d0527 (diff) | |
| parent | 03ac40d5709060168e10c9c3187ffb5a161e773b (diff) | |
| download | zig-0fb80b0633fc5ebc92776449cb4e76068b5845f5.tar.gz zig-0fb80b0633fc5ebc92776449cb4e76068b5845f5.zip | |
Merge pull request #22430 from alexrp/thumbeb
Some QEMU fixes + disable some tests for `thumbeb` in addition to `armeb`
Diffstat (limited to 'lib/std')
| -rw-r--r-- | lib/std/fmt.zig | 2 | ||||
| -rw-r--r-- | lib/std/simd.zig | 2 | ||||
| -rw-r--r-- | lib/std/zig/system.zig | 9 |
3 files changed, 8 insertions, 5 deletions
diff --git a/lib/std/fmt.zig b/lib/std/fmt.zig index b45194a837..2b5e78975e 100644 --- a/lib/std/fmt.zig +++ b/lib/std/fmt.zig @@ -2596,7 +2596,7 @@ test "positional/alignment/width/precision" { } test "vector" { - if (builtin.cpu.arch == .armeb and builtin.zig_backend == .stage2_llvm) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/22060 + 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 if (builtin.target.cpu.arch == .riscv64) { // https://github.com/ziglang/zig/issues/4486 return error.SkipZigTest; diff --git a/lib/std/simd.zig b/lib/std/simd.zig index 3413ad127f..e06a873f09 100644 --- a/lib/std/simd.zig +++ b/lib/std/simd.zig @@ -462,7 +462,7 @@ pub fn prefixScan(comptime op: std.builtin.ReduceOp, comptime hop: isize, vec: a test "vector prefix scan" { if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; - if (builtin.cpu.arch == .armeb and builtin.zig_backend == .stage2_llvm) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/22060 + 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 if (builtin.cpu.arch == .aarch64_be and builtin.zig_backend == .stage2_llvm) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/21893 if (comptime builtin.cpu.arch.isMIPS()) { diff --git a/lib/std/zig/system.zig b/lib/std/zig/system.zig index 591e369ff7..6e4fc1adef 100644 --- a/lib/std/zig/system.zig +++ b/lib/std/zig/system.zig @@ -83,8 +83,8 @@ pub fn getExternalExecutor( return switch (candidate.cpu.arch) { .aarch64 => Executor{ .qemu = "qemu-aarch64" }, .aarch64_be => Executor{ .qemu = "qemu-aarch64_be" }, - .arm => Executor{ .qemu = "qemu-arm" }, - .armeb => Executor{ .qemu = "qemu-armeb" }, + .arm, .thumb => Executor{ .qemu = "qemu-arm" }, + .armeb, .thumbeb => Executor{ .qemu = "qemu-armeb" }, .hexagon => Executor{ .qemu = "qemu-hexagon" }, .loongarch64 => Executor{ .qemu = "qemu-loongarch64" }, .m68k => Executor{ .qemu = "qemu-m68k" }, @@ -116,7 +116,10 @@ pub fn getExternalExecutor( }, .sparc64 => Executor{ .qemu = "qemu-sparc64" }, .x86 => Executor{ .qemu = "qemu-i386" }, - .x86_64 => Executor{ .qemu = "qemu-x86_64" }, + .x86_64 => switch (candidate.abi) { + .gnux32, .muslx32 => return bad_result, + else => Executor{ .qemu = "qemu-x86_64" }, + }, .xtensa => Executor{ .qemu = "qemu-xtensa" }, else => return bad_result, }; |