diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2021-11-10 06:02:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-10 06:02:54 +0100 |
| commit | 5bc09362dc90a9c4037907c0bb8e0773268344b1 (patch) | |
| tree | d0ab704be3e17ce6426c233c7d477b924648ada8 /library/std/src | |
| parent | 8b09ba6a5d5c644fe0f1c27c7f9c80b334241707 (diff) | |
| parent | f17077002bb8b40aa34fc09316f3dc44309dc589 (diff) | |
Rollup merge of #90690 - solid-rs:fix-kmc-solid-asm-const, r=Mark-Simulacrum
kmc-solid: Avoid the use of `asm_const` This PR removes the use of [the now-separated-out `asm_const` compiler feature][1] in `std::sys::solid` to fix the [`*-kmc-solid_*`](https://doc.rust-lang.org/nightly/rustc/platform-support/kmc-solid.html) Tier 3 targets. [1]: https://github.com/rust-lang/rust/pull/90348
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/sys/solid/abi/mod.rs | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/library/std/src/sys/solid/abi/mod.rs b/library/std/src/sys/solid/abi/mod.rs index 3526440fb85..3205f0db85f 100644 --- a/library/std/src/sys/solid/abi/mod.rs +++ b/library/std/src/sys/solid/abi/mod.rs @@ -4,17 +4,15 @@ mod fs; pub mod sockets; pub use self::fs::*; -pub const SOLID_BP_PROGRAM_EXITED: usize = 15; -pub const SOLID_BP_CSABORT: usize = 16; - #[inline(always)] pub fn breakpoint_program_exited(tid: usize) { unsafe { match () { + // SOLID_BP_PROGRAM_EXITED = 15 #[cfg(target_arch = "arm")] - () => asm!("bkpt #{}", const SOLID_BP_PROGRAM_EXITED, in("r0") tid), + () => asm!("bkpt #15", in("r0") tid), #[cfg(target_arch = "aarch64")] - () => asm!("hlt #{}", const SOLID_BP_PROGRAM_EXITED, in("x0") tid), + () => asm!("hlt #15", in("x0") tid), } } } @@ -23,10 +21,11 @@ pub fn breakpoint_program_exited(tid: usize) { pub fn breakpoint_abort() { unsafe { match () { + // SOLID_BP_CSABORT = 16 #[cfg(target_arch = "arm")] - () => asm!("bkpt #{}", const SOLID_BP_CSABORT), + () => asm!("bkpt #16"), #[cfg(target_arch = "aarch64")] - () => asm!("hlt #{}", const SOLID_BP_CSABORT), + () => asm!("hlt #16"), } } } |