Merge #285

285: `xtask assemble` fixes r=thalesfragoso a=jonas-schievink

Closes #284 

Co-authored-by: Jonas Schievink <[email protected]>

Author: bors[bot]

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 \

bin/thumbv6m-none-eabi-lto.a

@@ -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"
         {