aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Jonas Schievink <jonasschievink@gmail.com> 2020-11-04 02:08:00 +0100
committerGravatar Jonas Schievink <jonasschievink@gmail.com> 2020-11-04 02:08:00 +0100
commit1762486eddee0dbacaa702be3afbbae8c183f0c2 (patch)
tree76257725aec0eb6361df76029b66291ae732c91d
parent94d3357f0b4e27895e9a9e5eab3d7cb91e10abd4 (diff)
downloadcortex-m-1762486eddee0dbacaa702be3afbbae8c183f0c2.tar.gz
cortex-m-1762486eddee0dbacaa702be3afbbae8c183f0c2.tar.zst
cortex-m-1762486eddee0dbacaa702be3afbbae8c183f0c2.zip
Fix panic handler removal
-rw-r--r--asm/lib.rs1
-rw-r--r--bin/thumbv6m-none-eabi-lto.abin15040 -> 15124 bytes
-rw-r--r--bin/thumbv6m-none-eabi.abin18136 -> 17944 bytes
-rw-r--r--bin/thumbv7em-none-eabi-lto.abin19292 -> 19372 bytes
-rw-r--r--bin/thumbv7em-none-eabi.abin22532 -> 22340 bytes
-rw-r--r--bin/thumbv7em-none-eabihf-lto.abin20272 -> 20356 bytes
-rw-r--r--bin/thumbv7em-none-eabihf.abin23616 -> 23424 bytes
-rw-r--r--bin/thumbv7m-none-eabi-lto.abin18036 -> 18120 bytes
-rw-r--r--bin/thumbv7m-none-eabi.abin21364 -> 21172 bytes
-rw-r--r--bin/thumbv8m.base-none-eabi-lto.abin18300 -> 18384 bytes
-rw-r--r--bin/thumbv8m.base-none-eabi.abin21836 -> 21640 bytes
-rw-r--r--bin/thumbv8m.main-none-eabi-lto.abin22964 -> 23044 bytes
-rw-r--r--bin/thumbv8m.main-none-eabi.abin27188 -> 26992 bytes
-rw-r--r--bin/thumbv8m.main-none-eabihf-lto.abin23944 -> 24028 bytes
-rw-r--r--bin/thumbv8m.main-none-eabihf.abin28236 -> 28040 bytes
-rw-r--r--xtask/src/lib.rs2
16 files changed, 2 insertions, 1 deletions
diff --git a/asm/lib.rs b/asm/lib.rs
index ec46d5b..b57642e 100644
--- a/asm/lib.rs
+++ b/asm/lib.rs
@@ -126,6 +126,7 @@ shims! {
/// handler gets linked in, this causes a linker error. We always build this file with optimizations
/// enabled, but even without them the panic handler should never be linked in.
#[panic_handler]
+#[link_section = ".text.asm_panic_handler"]
fn panic(_: &core::panic::PanicInfo) -> ! {
extern "C" {
#[link_name = "cortex-m internal error: panic handler not optimized out, please file an \
diff --git a/bin/thumbv6m-none-eabi-lto.a b/bin/thumbv6m-none-eabi-lto.a
index f7c31d3..74cee4d 100644
--- a/bin/thumbv6m-none-eabi-lto.a
+++ b/bin/thumbv6m-none-eabi-lto.a
Binary files differ
diff --git a/bin/thumbv6m-none-eabi.a b/bin/thumbv6m-none-eabi.a
index 5fbc73c..0b15653 100644
--- a/bin/thumbv6m-none-eabi.a
+++ b/bin/thumbv6m-none-eabi.a
Binary files differ
diff --git a/bin/thumbv7em-none-eabi-lto.a b/bin/thumbv7em-none-eabi-lto.a
index d2d6b00..919e00b 100644
--- a/bin/thumbv7em-none-eabi-lto.a
+++ b/bin/thumbv7em-none-eabi-lto.a
Binary files differ
diff --git a/bin/thumbv7em-none-eabi.a b/bin/thumbv7em-none-eabi.a
index 665ff58..bf5e14b 100644
--- a/bin/thumbv7em-none-eabi.a
+++ b/bin/thumbv7em-none-eabi.a
Binary files differ
diff --git a/bin/thumbv7em-none-eabihf-lto.a b/bin/thumbv7em-none-eabihf-lto.a
index cea5763..68dd787 100644
--- a/bin/thumbv7em-none-eabihf-lto.a
+++ b/bin/thumbv7em-none-eabihf-lto.a
Binary files differ
diff --git a/bin/thumbv7em-none-eabihf.a b/bin/thumbv7em-none-eabihf.a
index 7517720..fa8220c 100644
--- a/bin/thumbv7em-none-eabihf.a
+++ b/bin/thumbv7em-none-eabihf.a
Binary files differ
diff --git a/bin/thumbv7m-none-eabi-lto.a b/bin/thumbv7m-none-eabi-lto.a
index 5a51123..a65077c 100644
--- a/bin/thumbv7m-none-eabi-lto.a
+++ b/bin/thumbv7m-none-eabi-lto.a
Binary files differ
diff --git a/bin/thumbv7m-none-eabi.a b/bin/thumbv7m-none-eabi.a
index 803a0ba..a4ebdb9 100644
--- a/bin/thumbv7m-none-eabi.a
+++ b/bin/thumbv7m-none-eabi.a
Binary files differ
diff --git a/bin/thumbv8m.base-none-eabi-lto.a b/bin/thumbv8m.base-none-eabi-lto.a
index 9e10b8e..b683c22 100644
--- a/bin/thumbv8m.base-none-eabi-lto.a
+++ b/bin/thumbv8m.base-none-eabi-lto.a
Binary files differ
diff --git a/bin/thumbv8m.base-none-eabi.a b/bin/thumbv8m.base-none-eabi.a
index abfa14f..46fb179 100644
--- a/bin/thumbv8m.base-none-eabi.a
+++ b/bin/thumbv8m.base-none-eabi.a
Binary files differ
diff --git a/bin/thumbv8m.main-none-eabi-lto.a b/bin/thumbv8m.main-none-eabi-lto.a
index 69d58e5..b4fd6fc 100644
--- a/bin/thumbv8m.main-none-eabi-lto.a
+++ b/bin/thumbv8m.main-none-eabi-lto.a
Binary files differ
diff --git a/bin/thumbv8m.main-none-eabi.a b/bin/thumbv8m.main-none-eabi.a
index 4d4d5c6..3da4938 100644
--- a/bin/thumbv8m.main-none-eabi.a
+++ b/bin/thumbv8m.main-none-eabi.a
Binary files differ
diff --git a/bin/thumbv8m.main-none-eabihf-lto.a b/bin/thumbv8m.main-none-eabihf-lto.a
index 6ec3bd8..87fdb8a 100644
--- a/bin/thumbv8m.main-none-eabihf-lto.a
+++ b/bin/thumbv8m.main-none-eabihf-lto.a
Binary files differ
diff --git a/bin/thumbv8m.main-none-eabihf.a b/bin/thumbv8m.main-none-eabihf.a
index 2d4703a..6144c4f 100644
--- a/bin/thumbv8m.main-none-eabihf.a
+++ b/bin/thumbv8m.main-none-eabihf.a
Binary files differ
diff --git a/xtask/src/lib.rs b/xtask/src/lib.rs
index 2ac15a4..d1f483b 100644
--- a/xtask/src/lib.rs
+++ b/xtask/src/lib.rs
@@ -47,7 +47,7 @@ fn trim_panic_handler(obj_file: &str) {
let name = section.name().unwrap();
if name.starts_with(".ARM")
|| name.starts_with(".rel.ARM")
- || name.contains("cortex_m_asm_panic")
+ || name.contains("asm_panic_handler")
|| name == ".strtab"
|| name == ".symtab"
{