Date: Sun, 25 Feb 2024 00:58:27 GMT From: Warner Losh <imp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 5b3b9a58584b - main - loader: Move ldscripts to match more standard practices Message-ID: <202402250058.41P0wRVE081530@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5b3b9a58584b101e3ea0fd8dd50dc8d9157c058e commit 5b3b9a58584b101e3ea0fd8dd50dc8d9157c058e Author: Warner Losh <imp@FreeBSD.org> AuthorDate: 2024-02-25 00:56:14 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2024-02-25 00:56:14 +0000 loader: Move ldscripts to match more standard practices In the larger open source community, ld scripts are foo.ldscrpt rather than ldscript.arch like we use here. This moves the EFI ldscripts. Sponsored by: Netflix Reviewed by: tsoome, kevans, emaste Differential Revision: https://reviews.freebsd.org/D44056 --- stand/efi/boot1/Makefile | 2 +- stand/efi/loader/Makefile | 2 +- stand/efi/loader/arch/amd64/{ldscript.amd64 => amd64.ldscript} | 0 stand/efi/loader/arch/arm/{ldscript.arm => arm.ldscript} | 0 stand/efi/loader/arch/arm64/{ldscript.arm64 => arm64.ldscript} | 0 stand/efi/loader/arch/riscv/{ldscript.riscv => riscv.ldscript} | 0 6 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stand/efi/boot1/Makefile b/stand/efi/boot1/Makefile index e03b95d2276f..fd5069004dff 100644 --- a/stand/efi/boot1/Makefile +++ b/stand/efi/boot1/Makefile @@ -64,7 +64,7 @@ CFLAGS+= -I${LDRSRC} 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 index 5a755c1d329f..2031400814e9 100644 --- a/stand/efi/loader/Makefile +++ b/stand/efi/loader/Makefile @@ -100,7 +100,7 @@ FILESMODE_${LOADER}.efi= ${BINMODE} 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 similarity index 100% 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 similarity index 100% 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 similarity index 100% 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 similarity index 100% rename from stand/efi/loader/arch/riscv/ldscript.riscv rename to stand/efi/loader/arch/riscv/riscv.ldscript
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202402250058.41P0wRVE081530>