Merge #62

62: Preserve .eh_frame and .eh_frame_hdr r=almindor a=Disasm Preserving the `.eh_frame` section improves gdb stack traces on nightly. Preserving the `.eh_frame_hdr` section fixes the linker problem `rust-lld: error: no memory region specified for section '.eh_frame_hdr'` introduced in rust-lang/rust#73564 Co-authored-by: Vadim Kaushan <admin@disasm.info>
rust-embedded · Jul 15, 2020 · db65c40 · db65c40
2 parents 9f1892e + 48d45c3
commit db65c40
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/riscv-rt/CHANGELOG.md b/riscv-rt/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+### Changed
+
+- Preserve `.eh_frame` and `.eh_frame_hdr` sections
+
 ## [v0.7.1] - 2020-06-02
 
 ### Added

diff --git a/riscv-rt/link.x b/riscv-rt/link.x
@@ -111,11 +111,8 @@ SECTIONS
     KEEP(*(.got .got.*));
   }
 
-  /* Discard .eh_frame, we are not doing unwind on panic so it is not needed */
-  /DISCARD/ :
-  {
-    *(.eh_frame);
-  }
+  .eh_frame (INFO) : { KEEP(*(.eh_frame)) }
+  .eh_frame_hdr (INFO) : { *(.eh_frame_hdr) }
 }
 
 /* Do not exceed this mark in the error messages above                                    | */