Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F177830374
D44056.1795381835.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Flag For Later
Award Token
Authored By
Unknown
Size
1 KB
Referenced Files
None
Subscribers
None
D44056.1795381835.diff
View Options
diff --git a/stand/efi/boot1/Makefile b/stand/efi/boot1/Makefile
--- a/stand/efi/boot1/Makefile
+++ b/stand/efi/boot1/Makefile
@@ -64,7 +64,7 @@
FILES= ${BOOT1}.efi
FILESMODE_${BOOT1}.efi= ${BINMODE}
-LDSCRIPT= ${EFISRC}/loader/arch/${MACHINE}/ldscript.${MACHINE}
+LDSCRIPT= ${EFISRC}/loader/arch/${MACHINE}/${MACHINE}.ldscript
LDFLAGS+= -Wl,-T${LDSCRIPT},-Bsymbolic,-znotext -pie
.if ${LINKER_TYPE} == "bfd" && ${LINKER_VERSION} >= 23400
LDFLAGS+= -Wl,--no-dynamic-linker
diff --git a/stand/efi/loader/Makefile b/stand/efi/loader/Makefile
--- a/stand/efi/loader/Makefile
+++ b/stand/efi/loader/Makefile
@@ -100,7 +100,7 @@
LINKS+= ${BINDIR}/${LOADER}.efi ${BINDIR}/loader.efi
.endif
-LDSCRIPT= ${.CURDIR}/../loader/arch/${MACHINE}/ldscript.${MACHINE}
+LDSCRIPT= ${.CURDIR}/../loader/arch/${MACHINE}/${MACHINE}.ldscript
LDFLAGS+= -Wl,-T${LDSCRIPT},-Bsymbolic,-znotext -pie
.if ${LINKER_TYPE} == "bfd" && ${LINKER_VERSION} >= 23400
LDFLAGS+= -Wl,--no-dynamic-linker
diff --git a/stand/efi/loader/arch/amd64/ldscript.amd64 b/stand/efi/loader/arch/amd64/amd64.ldscript
rename from stand/efi/loader/arch/amd64/ldscript.amd64
rename to stand/efi/loader/arch/amd64/amd64.ldscript
diff --git a/stand/efi/loader/arch/arm/ldscript.arm b/stand/efi/loader/arch/arm/arm.ldscript
rename from stand/efi/loader/arch/arm/ldscript.arm
rename to stand/efi/loader/arch/arm/arm.ldscript
diff --git a/stand/efi/loader/arch/arm64/ldscript.arm64 b/stand/efi/loader/arch/arm64/arm64.ldscript
rename from stand/efi/loader/arch/arm64/ldscript.arm64
rename to stand/efi/loader/arch/arm64/arm64.ldscript
diff --git a/stand/efi/loader/arch/riscv/ldscript.riscv b/stand/efi/loader/arch/riscv/riscv.ldscript
rename from stand/efi/loader/arch/riscv/ldscript.riscv
rename to stand/efi/loader/arch/riscv/riscv.ldscript
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sun, Nov 22, 9:10 PM (8 h, 23 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41904414
Default Alt Text
D44056.1795381835.diff (1 KB)
Attached To
Mode
D44056: loader: Move ldscripts to match more standard practices
Attached
Detach File
Event Timeline