summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Levon <john.levon@joyent.com>2019-08-15 09:12:46 -0700
committerJohn Levon <john.levon@joyent.com>2019-08-15 13:31:06 -0700
commitdcfeff93f67a1188722a358e0fbfcd604993e573 (patch)
treee66c0642f2bee72cfbf28fc15e411ad5a4801803
parenta8ffe4975d219124d53dcd9de30126f3a595d28f (diff)
downloadillumos-joyent-dcfeff93f67a1188722a358e0fbfcd604993e573.tar.gz
11561 loader script needs to place .eh_frame after .text
Reviewed by: Toomas Soome <tsoome@me.com> Approved by: Robert Mustacchi <rm@joyent.com>
-rw-r--r--usr/src/boot/sys/boot/efi/loader/arch/amd64/ldscript.amd6410
1 files changed, 5 insertions, 5 deletions
diff --git a/usr/src/boot/sys/boot/efi/loader/arch/amd64/ldscript.amd64 b/usr/src/boot/sys/boot/efi/loader/arch/amd64/ldscript.amd64
index bf3f69706e..e2374317fc 100644
--- a/usr/src/boot/sys/boot/efi/loader/arch/amd64/ldscript.amd64
+++ b/usr/src/boot/sys/boot/efi/loader/arch/amd64/ldscript.amd64
@@ -8,11 +8,6 @@ SECTIONS
ImageBase = .;
.hash : { *(.hash) } /* this MUST come first! */
. = ALIGN(4096);
- .eh_frame :
- {
- *(.eh_frame)
- }
- . = ALIGN(4096);
.text : {
multiboot.o(.text)
*(.text .stub .text.* .gnu.linkonce.t.*)
@@ -21,6 +16,11 @@ SECTIONS
*(.plt)
} =0xCCCCCCCC
. = ALIGN(4096);
+ .eh_frame :
+ {
+ *(.eh_frame)
+ }
+ . = ALIGN(4096);
.data : {
*(.rodata .rodata.* .gnu.linkonce.r.*)
*(.rodata1)