Skip to content

Commit 8fc9313

Browse files
committed
tests/no-std-qemu: Test armv8r-none-eabihf
1 parent 3e33f24 commit 8fc9313

File tree

4 files changed

+13
-4
lines changed

4 files changed

+13
-4
lines changed

tests/no-std-qemu/.cargo/config.toml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,13 @@ runner = "qemu-system-arm -M versatilepb -cpu arm1176 -display none -semihosting
3939

4040
# Armv7-A
4141
[target.armv7a-none-eabi]
42-
runner = "qemu-system-arm -M xilinx-zynq-a9 -display none -semihosting -kernel"
42+
runner = "qemu-system-arm -M xilinx-zynq-a9 -cpu cortex-a9 -display none -semihosting -kernel"
4343
[target.armv7a-none-eabihf]
44-
runner = "qemu-system-arm -M xilinx-zynq-a9 -display none -semihosting -kernel"
44+
runner = "qemu-system-arm -M xilinx-zynq-a9 -cpu cortex-a9 -display none -semihosting -kernel"
45+
46+
# Armv8-R
47+
[target.armv8r-none-eabihf]
48+
runner = "qemu-system-arm -M mps3-an536 -cpu cortex-r52 -display none -semihosting -kernel"
4549

4650
# RISC-V
4751
[target.'cfg(all(target_arch = "riscv32", target_os = "none"))']

tests/no-std-qemu/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ portable-atomic = { path = "../..", features = ["float"] }
1010

1111
paste = "1"
1212
semihosting = { version = "0.1", features = ["stdio", "panic-handler"] }
13-
semihosting-no-std-test-rt = { features = ["qemu-system"], git = "https://github.com/taiki-e/semihosting.git", rev = "da13733" }
13+
semihosting-no-std-test-rt = { features = ["qemu-system"], git = "https://github.com/taiki-e/semihosting.git", rev = "89d3a6a" }
1414

1515
[lints]
1616
workspace = true

tools/build.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,10 @@ build() {
437437
# NB: sync with tools/no-std.sh
438438
case "${target}" in
439439
armv4t* | thumbv4t*) test_dir=tests/gba ;;
440-
arm* | thumb* | riscv*) test_dir=tests/no-std-qemu ;;
440+
arm* | thumb* | riscv*)
441+
test_dir=tests/no-std-qemu
442+
args+=(--features semihosting-no-std-test-rt/disable-link-check)
443+
;;
441444
avr*) test_dir=tests/avr ;;
442445
msp430*) test_dir=tests/msp430 ;;
443446
xtensa*) test_dir=tests/xtensa ;;

tools/no-std.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ default_targets=(
2323
# thumbv6-none-eabi # TODO: "rustc-LLVM ERROR: Cannot select: intrinsic %llvm.arm.hint" will be fixed in https://github.com/rust-lang/rust/pull/150138
2424
# v7-A
2525
armv7a-none-eabi
26+
# v8-R
27+
armv8r-none-eabihf
2628
# v6-M
2729
thumbv6m-none-eabi
2830
# v7-M

0 commit comments

Comments
 (0)