Page MenuHomeFreeBSD
Files F153850220

D44057.id134966.diff
No OneTemporary
Actions

D44057.id134966.diff
View Options

diff --git a/stand/kboot/kboot/Makefile b/stand/kboot/kboot/Makefile
--- a/stand/kboot/kboot/Makefile
+++ b/stand/kboot/kboot/Makefile
@@ -51,6 +51,9 @@
.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}
.include "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc"
+# Bring in our ldscript
+LDFLAGS= -nostdlib -static -T ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}.ldscript
+
# Always add MI sources
.include "${BOOTSRC}/loader.mk"
CFLAGS+= -I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH}
diff --git a/stand/kboot/kboot/arch/aarch64/Makefile.inc b/stand/kboot/kboot/arch/aarch64/Makefile.inc
--- a/stand/kboot/kboot/arch/aarch64/Makefile.inc
+++ b/stand/kboot/kboot/arch/aarch64/Makefile.inc
@@ -8,5 +8,3 @@
# load address. set in linker script
RELOC?= 0x0
CFLAGS+= -DRELOC=${RELOC}
-
-LDFLAGS= -nostdlib -static -T ${.CURDIR}/arch/${MACHINE_ARCH}/ldscript.${MACHINE_ARCH}
diff --git a/stand/kboot/kboot/arch/aarch64/ldscript.aarch64 b/stand/kboot/kboot/arch/aarch64/aarch64.ldscript
rename from stand/kboot/kboot/arch/aarch64/ldscript.aarch64
rename to stand/kboot/kboot/arch/aarch64/aarch64.ldscript
diff --git a/stand/kboot/kboot/arch/amd64/Makefile.inc b/stand/kboot/kboot/arch/amd64/Makefile.inc
--- a/stand/kboot/kboot/arch/amd64/Makefile.inc
+++ b/stand/kboot/kboot/arch/amd64/Makefile.inc
@@ -1,5 +1,3 @@
SRCS+= amd64_tramp.S elf64_freebsd.c load_addr.c fdt_arch.c
CFLAGS+= -I${SYSDIR}/contrib/dev/acpica/include
-
-LDFLAGS= -nostdlib -static -T ${.CURDIR}/arch/${MACHINE_ARCH}/ldscript.amd64
diff --git a/stand/kboot/kboot/arch/amd64/ldscript.amd64 b/stand/kboot/kboot/arch/amd64/amd64.ldscript
rename from stand/kboot/kboot/arch/amd64/ldscript.amd64
rename to stand/kboot/kboot/arch/amd64/amd64.ldscript
diff --git a/stand/kboot/kboot/arch/powerpc64/Makefile.inc b/stand/kboot/kboot/arch/powerpc64/Makefile.inc
--- a/stand/kboot/kboot/arch/powerpc64/Makefile.inc
+++ b/stand/kboot/kboot/arch/powerpc64/Makefile.inc
@@ -2,6 +2,4 @@
SRCS+= ppc64_elf_freebsd.c kerneltramp.S load_addr.c fdt_arch.c
-LDFLAGS= -nostdlib -static -T ${.CURDIR}/arch/${MACHINE_ARCH}/ldscript.powerpc
-
MK_PIE= no
diff --git a/stand/kboot/kboot/arch/powerpc64/ldscript.powerpc b/stand/kboot/kboot/arch/powerpc64/powerpc64.ldscript
rename from stand/kboot/kboot/arch/powerpc64/ldscript.powerpc
rename to stand/kboot/kboot/arch/powerpc64/powerpc64.ldscript

File Metadata

Mime Type
text/plain
Expires
Sat, Apr 25, 6:13 AM (21 h, 10 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32113193
Default Alt Text
D44057.id134966.diff (2 KB)

Event Timeline