Skip to content

Commit ce36c98

Browse files
Use the right runners for all thumb targets
1 parent ef5f929 commit ce36c98

File tree

1 file changed

+19
-6
lines changed
  • src/test/run-make/thumb-none-qemu/example/.cargo

1 file changed

+19
-6
lines changed

src/test/run-make/thumb-none-qemu/example/.cargo/config

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,24 @@
1+
[target.thumbv6m-none-eabi]
2+
runner = "qemu-system-arm -cpu cortex-m0 -machine lm3s6965evb -nographic -semihosting-config enable=on,target=native -kernel"
3+
14
[target.thumbv7m-none-eabi]
2-
# uncomment this to make `cargo run` execute programs on QEMU
35
runner = "qemu-system-arm -cpu cortex-m3 -machine lm3s6965evb -nographic -semihosting-config enable=on,target=native -kernel"
46

5-
[target.thumbv6m-none-eabi]
6-
# uncomment this to make `cargo run` execute programs on QEMU
7-
# For now, we use cortex-m3 instead of cortex-m0 which are not supported by QEMU
8-
runner = "qemu-system-arm -cpu cortex-m3 -machine lm3s6965evb -nographic -semihosting-config enable=on,target=native -kernel"
7+
[target.thumbv7em-none-eabi]
8+
runner = "qemu-system-arm -cpu cortex-m4 -machine lm3s6965evb -nographic -semihosting-config enable=on,target=native -kernel"
9+
10+
[target.thumbv7em-none-eabihf]
11+
runner = "qemu-system-arm -cpu cortex-m4 -machine lm3s6965evb -nographic -semihosting-config enable=on,target=native -kernel"
12+
13+
[target.thumbv8m.base-none-eabi]
14+
# FIXME: Should be the Cortex-M23, bt Qemu does not currently support it
15+
runner = "qemu-system-arm -cpu cortex-m33 -machine lm3s6965evb -nographic -semihosting-config enable=on,target=native -kernel"
16+
17+
[target.thumbv8m.main-none-eabi]
18+
runner = "qemu-system-arm -cpu cortex-m33 -machine lm3s6965evb -nographic -semihosting-config enable=on,target=native -kernel"
19+
20+
[target.thumbv8m.main-none-eabihf]
21+
runner = "qemu-system-arm -cpu cortex-m33 -machine lm3s6965evb -nographic -semihosting-config enable=on,target=native -kernel"
922

1023
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
1124
# uncomment ONE of these three option to make `cargo run` start a GDB session
@@ -28,4 +41,4 @@ rustflags = [
2841
# "-C", "linker=arm-none-eabi-gcc",
2942
# "-C", "link-arg=-Wl,-Tlink.x",
3043
# "-C", "link-arg=-nostartfiles",
31-
]
44+
]

0 commit comments

Comments
 (0)