diff options
| author | Warner Losh <imp@FreeBSD.org> | 2024-02-25 00:56:14 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2024-02-25 00:56:14 +0000 |
| commit | 5b3b9a58584b101e3ea0fd8dd50dc8d9157c058e (patch) | |
| tree | fd077bebd6798aecce713f0aff1b1bd59d7739ac /stand | |
| parent | 5e248c23d995a059d24f4784d5a256cddd42e557 (diff) | |
| download | src-5b3b9a58584b101e3ea0fd8dd50dc8d9157c058e.tar.gz src-5b3b9a58584b101e3ea0fd8dd50dc8d9157c058e.zip | |
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
Diffstat (limited to 'stand')
| -rw-r--r-- | stand/efi/boot1/Makefile | 2 | ||||
| -rw-r--r-- | stand/efi/loader/Makefile | 2 | ||||
| -rw-r--r-- | stand/efi/loader/arch/amd64/amd64.ldscript (renamed from stand/efi/loader/arch/amd64/ldscript.amd64) | 0 | ||||
| -rw-r--r-- | stand/efi/loader/arch/arm/arm.ldscript (renamed from stand/efi/loader/arch/arm/ldscript.arm) | 0 | ||||
| -rw-r--r-- | stand/efi/loader/arch/arm64/arm64.ldscript (renamed from stand/efi/loader/arch/arm64/ldscript.arm64) | 0 | ||||
| -rw-r--r-- | stand/efi/loader/arch/riscv/riscv.ldscript (renamed from stand/efi/loader/arch/riscv/ldscript.riscv) | 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 index 57014aefc025..57014aefc025 100644 --- a/stand/efi/loader/arch/amd64/ldscript.amd64 +++ b/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 index 13affe12bbba..13affe12bbba 100644 --- a/stand/efi/loader/arch/arm/ldscript.arm +++ b/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 index bacb81b5032f..bacb81b5032f 100644 --- a/stand/efi/loader/arch/arm64/ldscript.arm64 +++ b/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 index 342ec62cf03e..342ec62cf03e 100644 --- a/stand/efi/loader/arch/riscv/ldscript.riscv +++ b/stand/efi/loader/arch/riscv/riscv.ldscript |