aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2026-04-25 17:06:55 +0000
committerDimitry Andric <dim@FreeBSD.org>2026-04-25 17:06:55 +0000
commit7f207b6443fe92c31a75b491272a0fad032d39ae (patch)
tree32efb0253a57df54af50bb5cad47a41c443d5342
parentb6d823e39072daae9df4b47a15ea7142b7a55f1a (diff)
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
-rw-r--r--stand/powerpc/boot1.chrp/Makefile6
1 files changed, 0 insertions, 6 deletions
diff --git a/stand/powerpc/boot1.chrp/Makefile b/stand/powerpc/boot1.chrp/Makefile
index 8d0f970212d4..0b77bce2b097 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 <bsd.linker.mk>
-.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