16 files changed, 4 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
diff --git a/bin/thumbv6m-none-eabi.a b/bin/thumbv6m-none-eabi.a
index 5fbc73c..d53c97a 100644
--- a/bin/thumbv6m-none-eabi.a
+++ b/bin/thumbv6m-none-eabi.a
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
diff --git a/bin/thumbv7em-none-eabi.a b/bin/thumbv7em-none-eabi.a
index 665ff58..b8ba53c 100644
--- a/bin/thumbv7em-none-eabi.a
+++ b/bin/thumbv7em-none-eabi.a
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
diff --git a/bin/thumbv7em-none-eabihf.a b/bin/thumbv7em-none-eabihf.a
index 7517720..7d7349f 100644
--- a/bin/thumbv7em-none-eabihf.a
+++ b/bin/thumbv7em-none-eabihf.a
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
diff --git a/bin/thumbv7m-none-eabi.a b/bin/thumbv7m-none-eabi.a
index 803a0ba..59f5da2 100644
--- a/bin/thumbv7m-none-eabi.a
+++ b/bin/thumbv7m-none-eabi.a
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
diff --git a/bin/thumbv8m.base-none-eabi.a b/bin/thumbv8m.base-none-eabi.a
index abfa14f..87560a3 100644
--- a/bin/thumbv8m.base-none-eabi.a
+++ b/bin/thumbv8m.base-none-eabi.a
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
diff --git a/bin/thumbv8m.main-none-eabi.a b/bin/thumbv8m.main-none-eabi.a
index 4d4d5c6..5ea8f33 100644
--- a/bin/thumbv8m.main-none-eabi.a
+++ b/bin/thumbv8m.main-none-eabi.a
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
diff --git a/bin/thumbv8m.main-none-eabihf.a b/bin/thumbv8m.main-none-eabihf.a
index 2d4703a..29d6381 100644
--- a/bin/thumbv8m.main-none-eabihf.a
+++ b/bin/thumbv8m.main-none-eabihf.a
diff --git a/xtask/src/lib.rs b/xtask/src/lib.rs
index 2ac15a4..b1e982e 100644
--- a/xtask/src/lib.rs
+++ b/xtask/src/lib.rs
@@ -41,13 +41,15 @@ fn trim_panic_handler(obj_file: &str) {
     let obj = object::File::parse(&objdata).unwrap();
 
     let mut writer = Object::new(obj.format(), obj.architecture(), obj.endianness());
+    writer.flags = obj.flags(); // Preserve flags of input file
+
     for (sec_index, section) in obj.sections().enumerate() {
         assert_eq!(section.index().0, sec_index);
 
         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"
         {