From 25449e73a11feff3f4ee886e8b185e542d98b620 Mon Sep 17 00:00:00 2001
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sat, 25 Nov 2017 21:45:51 +0000
Subject: [PATCH] Avoid emitting a PT_INTERP section for powerpc64 kernels and
 arrange for the first instruction to be at the start of the text segment.
 This allows the kernel to be booted correctly by stock kexec-lite.

MFC after:	2 weeks
---
 sys/conf/ldscript.powerpc64 | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/sys/conf/ldscript.powerpc64 b/sys/conf/ldscript.powerpc64
index 23c93fd85fc..250f54ec209 100644
--- a/sys/conf/ldscript.powerpc64
+++ b/sys/conf/ldscript.powerpc64
@@ -10,7 +10,7 @@ SECTIONS
 {
   /* Read-only sections, merged into text segment: */
 
-  . = kernbase + SIZEOF_HEADERS;
+  . = kernbase;
   PROVIDE (begin = . - SIZEOF_HEADERS);
 
   .text      :
@@ -24,7 +24,10 @@ SECTIONS
   _etext = .;
   PROVIDE (etext = .);
 
-  .interp     : { *(.interp) 	}
+  /* Do not emit PT_INTERP section, which confuses some loaders (kexec-lite) */
+  .interpX    : { *(.interp) 	} : NONE
+  /DISCARD/   : { *(.interp)	} 
+
   .hash          : { *(.hash)		}
   .dynsym        : { *(.dynsym)		}
   .dynstr        : { *(.dynstr)		}