From 7f207b6443fe92c31a75b491272a0fad032d39ae Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sat, 25 Apr 2026 19:06:55 +0200 Subject: [PATCH] Revert "Tentative fix for powerpc boot1.chrp linking problem." This reverts base 4822a2cf990048c6eed7822fd34a1aeeb7c39cdf. The change in base aa0bc7cca153f67f8becec8a8fb259ff5fd30fd0 already fixed the original issue, which is that newer versions of lld complain "section '.text' address (0x38000) is smaller than image base (0x10000000); specify --image-base". Reported by: ivy PR: 292067 MFC after: 1 month --- stand/powerpc/boot1.chrp/Makefile | 6 ------ 1 file changed, 6 deletions(-) diff --git a/stand/powerpc/boot1.chrp/Makefile b/stand/powerpc/boot1.chrp/Makefile index 8d0f970212d..0b77bce2b09 100644 --- a/stand/powerpc/boot1.chrp/Makefile +++ b/stand/powerpc/boot1.chrp/Makefile @@ -23,12 +23,6 @@ CFLAGS+=-I${LDRSRC} # LDFLAGS=-nostdlib -static -Wl,-N -Wl,-Ttext=0x38000 -Wl,--image-base=0x38000 -.include -.if (${LINKER_TYPE} == "bfd" && ${LINKER_VERSION} >= 24400) || \ - ${LINKER_TYPE} == "lld" -LDFLAGS+=-Wl,--image-base=0 -.endif - .PATH: ${SYSDIR}/libkern ${SRCTOP}/lib/libc/powerpc/gen ${.CURDIR} # The following inserts out objects into a template HFS