diff options
| author |  bors[bot] <26634292+bors[bot]@users.noreply.github.com>
| 2021-02-09 21:16:20 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2021-02-09 21:16:20 +0000 |
| commit | 7481f09d67aee7081d71cf6e042f2984c12a830f (patch) | |
| tree | 72f6fcce29d40d237088a3ca90b89589cecae18f | |
| parent | 2281fd667a05f6fc6e9a12d8045cff49687a13ad (diff) | |
| parent | 3a5162b25598c41edd8f8fb5d70c67796590cc92 (diff) | |
| download | cortex-m-7481f09d67aee7081d71cf6e042f2984c12a830f.tar.gz cortex-m-7481f09d67aee7081d71cf6e042f2984c12a830f.tar.zst cortex-m-7481f09d67aee7081d71cf6e042f2984c12a830f.zip | |
Merge #330
330: Fix rust-lld: error: undefined symbol: __syscall r=jonas-schievink a=ovidiusabou
Encountered while building an example from stm32-rs/stm32f3xx-hal
Co-authored-by: Ovidiu Sabou <ovidiu@sabou.org>
| -rw-r--r-- | cortex-m-semihosting/src/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cortex-m-semihosting/src/lib.rs b/cortex-m-semihosting/src/lib.rs index 05455ce..a67b84d 100644 --- a/cortex-m-semihosting/src/lib.rs +++ b/cortex-m-semihosting/src/lib.rs @@ -194,7 +194,7 @@ pub mod nr; #[cfg(all(thumb, not(feature = "inline-asm")))] extern "C" { - fn __syscall(nr: usize, arg: usize) -> usize; + fn __sh_syscall(nr: usize, arg: usize) -> usize; } /// Performs a semihosting operation, takes a pointer to an argument block @@ -208,7 +208,7 @@ pub unsafe fn syscall<T>(nr: usize, arg: &T) -> usize { pub unsafe fn syscall1(_nr: usize, _arg: usize) -> usize { match () { #[cfg(all(thumb, not(feature = "inline-asm"), not(feature = "no-semihosting")))] - () => __syscall(_nr, _arg), + () => __sh_syscall(_nr, _arg), #[cfg(all(thumb, feature = "inline-asm", not(feature = "no-semihosting")))] () => { |