From dcfeff93f67a1188722a358e0fbfcd604993e573 Mon Sep 17 00:00:00 2001
From: John Levon <john.levon@joyent.com>
Date: Thu, 15 Aug 2019 09:12:46 -0700
Subject: 11561 loader script needs to place .eh_frame after .text Reviewed by:
 Toomas Soome <tsoome@me.com> Approved by: Robert Mustacchi <rm@joyent.com>

---
 usr/src/boot/sys/boot/efi/loader/arch/amd64/ldscript.amd64 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'usr/src')

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)
-- 
cgit v1.2.3