Skip to content

Commit 1ff0a25

Browse files
bors[bot]aurabindo
andauthored
Merge #202
202: Enable building semihosting for Armv8m r=korken89 a=aurabindo Semihosting protocol has not changed for Arvmv8m and hence it need not be disabled for this architecture. Co-authored-by: Aurabindo Jayamohanan <[email protected]>
2 parents b27d17f + 0aa5b90 commit 1ff0a25

File tree

2 files changed

+1
-24
lines changed

2 files changed

+1
-24
lines changed

cortex-m-rt/Cargo.toml

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,10 @@ autoexamples = true
1919
r0 = "0.2.2"
2020
cortex-m-rt-macros = { path = "macros", version = "0.1.5" }
2121

22-
[target.thumbv7em-none-eabihf.dev-dependencies]
23-
cortex-m-semihosting = "0.3.1"
24-
25-
[target.thumbv7em-none-eabi.dev-dependencies]
26-
cortex-m-semihosting = "0.3.1"
27-
28-
[target.thumbv7m-none-eabi.dev-dependencies]
29-
cortex-m-semihosting = "0.3.1"
30-
31-
[target.thumbv6m-none-eabi.dev-dependencies]
32-
cortex-m-semihosting = "0.3.1"
33-
3422
[dev-dependencies]
3523
cortex-m = "0.6"
3624
panic-halt = "0.2.0"
25+
cortex-m-semihosting = "0.3"
3726

3827
[dev-dependencies.rand]
3928
default-features = false

cortex-m-rt/examples/qemu.rs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,15 @@
22
#![no_main]
33
#![no_std]
44

5-
65
extern crate cortex_m;
76
extern crate cortex_m_rt as rt;
8-
9-
#[cfg(not(armv8m))]
107
extern crate cortex_m_semihosting as semihosting;
118

129
extern crate panic_halt;
1310

1411
use cortex_m::asm;
1512
use rt::entry;
1613

17-
#[cfg(not(armv8m))]
1814
#[entry]
1915
fn main() -> ! {
2016
use core::fmt::Write;
@@ -30,11 +26,3 @@ fn main() -> ! {
3026
semihosting::debug::exit(semihosting::debug::EXIT_SUCCESS);
3127
}
3228
}
33-
34-
#[cfg(armv8m)]
35-
#[entry]
36-
fn main() -> ! {
37-
loop {
38-
asm::nop();
39-
}
40-
}

0 commit comments

Comments
 (0)