From 20ae0afeacd034e5f5030ab2ed8abef24dfb94bb Mon Sep 17 00:00:00 2001 From: Brandon Bergren Date: Tue, 25 Feb 2020 00:45:09 +0000 Subject: [PATCH] [PowerPC] Fix LLD10 linking of ofw loader on ppc Before this change, LLD10 was creating several extra PT_LOAD sections, which OFW does not understand. Like we do for the kernel already, specify the program headers manually. Additionally, to work around a crash in our base ld.bfd, we need to actually assign something to the output section. LLD does not need this. One side effect of this change is the removal of the GNU_STACK header. This is more correct, since we are using a statically-allocated stack and RWX mappings across the board this early in boot. Reviewed by: jhibbits, Fangrui Song Sponsored by: Tag1 Consulting, Inc. Differential Revision: https://reviews.freebsd.org/D23778 --- stand/powerpc/ofw/ldscript.powerpc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/stand/powerpc/ofw/ldscript.powerpc b/stand/powerpc/ofw/ldscript.powerpc index e0dc5e2614a8..5fa27eaf6a13 100644 --- a/stand/powerpc/ofw/ldscript.powerpc +++ b/stand/powerpc/ofw/ldscript.powerpc @@ -6,11 +6,15 @@ OUTPUT_ARCH(powerpc:common) ENTRY(_start) SEARCH_DIR(/usr/lib); PROVIDE (__stack = 0); +PHDRS +{ + text PT_LOAD; +} SECTIONS { /* Read-only sections, merged into text segment: */ . = 0x02c00000 + SIZEOF_HEADERS; - .interp : { *(.interp) } + .interp : { *(.interp) } :text .hash : { *(.hash) } .dynsym : { *(.dynsym) } .dynstr : { *(.dynstr) }