From 0e54aaf142c8ff8eb7e7181bd54f0ab2abdb33ae Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Sat, 29 Aug 2020 18:17:22 +0200 Subject: Fix shims for v8m.main --- asm/lib.rs | 3 ++- bin/thumbv6m-none-eabi-lto.a | Bin 13596 -> 13592 bytes bin/thumbv6m-none-eabi.a | Bin 18284 -> 18284 bytes bin/thumbv7em-none-eabi-lto.a | Bin 19224 -> 19224 bytes bin/thumbv7em-none-eabi.a | Bin 23360 -> 23360 bytes bin/thumbv7em-none-eabihf-lto.a | Bin 20176 -> 20180 bytes bin/thumbv7em-none-eabihf.a | Bin 24684 -> 24684 bytes bin/thumbv7m-none-eabi-lto.a | Bin 17628 -> 17628 bytes bin/thumbv7m-none-eabi.a | Bin 22020 -> 22020 bytes bin/thumbv8m.base-none-eabi-lto.a | Bin 15496 -> 15496 bytes bin/thumbv8m.base-none-eabi.a | Bin 20936 -> 20936 bytes bin/thumbv8m.main-none-eabi-lto.a | Bin 21228 -> 21228 bytes bin/thumbv8m.main-none-eabi.a | Bin 27220 -> 27220 bytes bin/thumbv8m.main-none-eabihf-lto.a | Bin 22168 -> 22168 bytes bin/thumbv8m.main-none-eabihf.a | Bin 28488 -> 28488 bytes 15 files changed, 2 insertions(+), 1 deletion(-) diff --git a/asm/lib.rs b/asm/lib.rs index 95e05a2..50e1db6 100644 --- a/asm/lib.rs +++ b/asm/lib.rs @@ -73,7 +73,8 @@ shims! { fn __wfi(); } -#[cfg(armv7m)] +// v7m *AND* v8m.main, but *NOT* v8m.base +#[cfg(any(armv7m, armv8m_main))] shims! { fn __basepri_max(val: u8); fn __basepri_r() -> u8; diff --git a/bin/thumbv6m-none-eabi-lto.a b/bin/thumbv6m-none-eabi-lto.a index 517c2a8..32667b1 100644 Binary files a/bin/thumbv6m-none-eabi-lto.a and b/bin/thumbv6m-none-eabi-lto.a differ diff --git a/bin/thumbv6m-none-eabi.a b/bin/thumbv6m-none-eabi.a index 05a27d7..072dd15 100644 Binary files a/bin/thumbv6m-none-eabi.a and b/bin/thumbv6m-none-eabi.a differ diff --git a/bin/thumbv7em-none-eabi-lto.a b/bin/thumbv7em-none-eabi-lto.a index f4b6087..c405e9e 100644 Binary files a/bin/thumbv7em-none-eabi-lto.a and b/bin/thumbv7em-none-eabi-lto.a differ diff --git a/bin/thumbv7em-none-eabi.a b/bin/thumbv7em-none-eabi.a index a33e9d1..d7a2c88 100644 Binary files a/bin/thumbv7em-none-eabi.a and b/bin/thumbv7em-none-eabi.a differ diff --git a/bin/thumbv7em-none-eabihf-lto.a b/bin/thumbv7em-none-eabihf-lto.a index c3bcb56..bd5ad83 100644 Binary files a/bin/thumbv7em-none-eabihf-lto.a and b/bin/thumbv7em-none-eabihf-lto.a differ diff --git a/bin/thumbv7em-none-eabihf.a b/bin/thumbv7em-none-eabihf.a index dbb5558..88ac78e 100644 Binary files a/bin/thumbv7em-none-eabihf.a and b/bin/thumbv7em-none-eabihf.a differ diff --git a/bin/thumbv7m-none-eabi-lto.a b/bin/thumbv7m-none-eabi-lto.a index cf9c68d..a95b069 100644 Binary files a/bin/thumbv7m-none-eabi-lto.a and b/bin/thumbv7m-none-eabi-lto.a differ diff --git a/bin/thumbv7m-none-eabi.a b/bin/thumbv7m-none-eabi.a index 644a375..a97ae6a 100644 Binary files a/bin/thumbv7m-none-eabi.a and b/bin/thumbv7m-none-eabi.a differ diff --git a/bin/thumbv8m.base-none-eabi-lto.a b/bin/thumbv8m.base-none-eabi-lto.a index 2ad27c3..dd7553e 100644 Binary files a/bin/thumbv8m.base-none-eabi-lto.a and b/bin/thumbv8m.base-none-eabi-lto.a differ diff --git a/bin/thumbv8m.base-none-eabi.a b/bin/thumbv8m.base-none-eabi.a index 42523f6..4c68990 100644 Binary files a/bin/thumbv8m.base-none-eabi.a and b/bin/thumbv8m.base-none-eabi.a differ diff --git a/bin/thumbv8m.main-none-eabi-lto.a b/bin/thumbv8m.main-none-eabi-lto.a index bf17ac4..1f5b29d 100644 Binary files a/bin/thumbv8m.main-none-eabi-lto.a and b/bin/thumbv8m.main-none-eabi-lto.a differ diff --git a/bin/thumbv8m.main-none-eabi.a b/bin/thumbv8m.main-none-eabi.a index 7272d7c..2e7280d 100644 Binary files a/bin/thumbv8m.main-none-eabi.a and b/bin/thumbv8m.main-none-eabi.a differ diff --git a/bin/thumbv8m.main-none-eabihf-lto.a b/bin/thumbv8m.main-none-eabihf-lto.a index 9c22c5a..c243d5d 100644 Binary files a/bin/thumbv8m.main-none-eabihf-lto.a and b/bin/thumbv8m.main-none-eabihf-lto.a differ diff --git a/bin/thumbv8m.main-none-eabihf.a b/bin/thumbv8m.main-none-eabihf.a index 3a0a632..b16ae98 100644 Binary files a/bin/thumbv8m.main-none-eabihf.a and b/bin/thumbv8m.main-none-eabihf.a differ -- cgit v1.2.3