diff options
| author |  bors[bot] <26634292+bors[bot]@users.noreply.github.com>
| 2020-11-04 01:55:20 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2020-11-04 01:55:20 +0000 |
| commit | 5b5b8b1862f779d3a4a2266ae416c1145d5680e6 (patch) | |
| tree | 7059fa13a2f96c6a06270d0582902ace9255824d /xtask/src/lib.rs | |
| parent | 94d3357f0b4e27895e9a9e5eab3d7cb91e10abd4 (diff) | |
| parent | 577f15bc181cfb14da66a9c520aff9cd5c0fe214 (diff) | |
| download | cortex-m-5b5b8b1862f779d3a4a2266ae416c1145d5680e6.tar.gz cortex-m-5b5b8b1862f779d3a4a2266ae416c1145d5680e6.tar.zst cortex-m-5b5b8b1862f779d3a4a2266ae416c1145d5680e6.zip | |
Merge #285
285: `xtask assemble` fixes r=thalesfragoso a=jonas-schievink
Closes #284
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
Diffstat (limited to 'xtask/src/lib.rs')
| -rw-r--r-- | xtask/src/lib.rs | 4 |
1 files changed, 3 insertions, 1 deletions
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" { |