diff options
| author |  bors[bot] <26634292+bors[bot]@users.noreply.github.com>
| 2020-07-05 14:06:42 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2020-07-05 14:06:42 +0000 |
| commit | d08f531dd5642507e7e26a0e9a4b521cddfd5bfc (patch) | |
| tree | c8f7e5317b57906cc0845db845ddc0676f7963b8 | |
| parent | 1bbc1bc59bf92e74cf38502d34071dcc268d402b (diff) | |
| parent | 434d4af0ebc3b3f409a6c1707f80506144fce63d (diff) | |
| download | cortex-m-d08f531dd5642507e7e26a0e9a4b521cddfd5bfc.tar.gz cortex-m-d08f531dd5642507e7e26a0e9a4b521cddfd5bfc.tar.zst cortex-m-d08f531dd5642507e7e26a0e9a4b521cddfd5bfc.zip | |
Merge #278
278: Mark main() with a C ABI r=jonas-schievink a=mciantyre
See #277. The PR updates `Reset` to describe `main()` as having a C ABI, rather than a Rust ABI.
Co-authored-by: Ian McIntyre <ianpmcintyre@gmail.com>
| -rw-r--r-- | cortex-m-rt/src/lib.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cortex-m-rt/src/lib.rs b/cortex-m-rt/src/lib.rs index 1988df6..4dabb29 100644 --- a/cortex-m-rt/src/lib.rs +++ b/cortex-m-rt/src/lib.rs @@ -897,12 +897,11 @@ pub unsafe extern "C" fn Reset() -> ! { static mut __edata: u32; static __sidata: u32; - } - - extern "Rust" { // This symbol will be provided by the user via `#[entry]` fn main() -> !; + } + extern "Rust" { // This symbol will be provided by the user via `#[pre_init]` fn __pre_init(); } |