From nobody Tue Apr 16 20:13:14 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJwG24PP9z5H0T4; Tue, 16 Apr 2024 20:13:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VJwG21k2mz4v1p; Tue, 16 Apr 2024 20:13:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713298394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WknelCd620ggGRmxoVTRXKzdsLqHBTQZL5KX17+uyAQ=; b=roiubT4CNz7or5BdFuPd98RTGCfg1HPWVRP7vJ7kvJ4MJfB0Ihc2AopIIPBozWnJT/gCzw Kj7LvKwP2aYzyhNmcnod8kPQRV5FFAdz0OVKQV1n0kbQsLhBbu96KoS/vQaqFHRTedgUqp zvTldfSZz9qO+8pNOaa68Plud5iqOaPkgls39pG/49uIc7uxdq7Meb505ytKMlJcOQDhG+ kUixlR9ccQA/N/gVz1JTt1l3eGjGXVBUhZZEDmLApzKV00Zg7OySMxw5+fe//JpbX+upPw /J2rl34vduF1YM4f6vv3khWAm1sQA6jqx+l1+fq/SL6QV2B5we1UlB95netibg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713298394; a=rsa-sha256; cv=none; b=ZsTbU/Kz93+KfhH6pqAB8CeO8MIL/FXeWkcf39Tt4Uutqo7OQcd0Jo2wgnxrDVJIkRugZ2 a0mdpKUwI2b3MeDzUfReb8k4PszE2PHDgYsR8aSEWP2IhHxKkwEMheCFwxAd76BcI4mBVy gKKMkcVsPJQWHX0Rr1SwZs5XTCzKS3fcUt0k2cSTS/m1YRY9tdwmBy5jOlOsZIg0oBb97Z Qdkb6axETilOhqs1fY+NF20xCN8TP81pHjq2QuL4SjKCN0uCRkMfpyBqUo7ZJABmE/3aYi OuzX+rKspFUnfLSiD0+tInfaO+XE23ZCYIUypjMVI5wKiIVe6cr1NZqt9zpOvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713298394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WknelCd620ggGRmxoVTRXKzdsLqHBTQZL5KX17+uyAQ=; b=gy8ZtrvYVWiW2Wr46nUhDDo0jhcLRGLZXClOGw6kX7j7Is9/t60fcyHqbdHGhAjE4hbgmQ deTlCXdpNDjwysh0CpQ1qRSOOPxRIXUgHDag0qve2/36zlXfZ3dJvi8mvxN/58IBMHoSHJ dbusZ4Se1dWpb0gCN5GcnnMd/shTujkHj1uTpMfLfsDaZeY3GpJjKqvHItC8v0+HHZCAWK Zo2T+gS91j8fYB5b8Z6bIwc4MelqwWAMfHI69QFGRAbyuXHxWjUP0xSLPDGbAEY9ShCNxv WnS+J9w65Tj+w+HvAYfPPiJnWlOR2YqIpkn/KpmdmofiSzTkd5vA28tdJuPqxQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJwG21C1dzxdj; Tue, 16 Apr 2024 20:13:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43GKDEqu039074; Tue, 16 Apr 2024 20:13:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GKDExX039071; Tue, 16 Apr 2024 20:13:14 GMT (envelope-from git) Date: Tue, 16 Apr 2024 20:13:14 GMT Message-Id: <202404162013.43GKDExX039071@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 5f4d3f8e8835 - stable/14 - loader: Move ldscripts to match more standard practices List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5f4d3f8e88354c97b1153998e728f132548886b3 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5f4d3f8e88354c97b1153998e728f132548886b3 commit 5f4d3f8e88354c97b1153998e728f132548886b3 Author: Warner Losh AuthorDate: 2024-02-25 00:56:14 +0000 Commit: Warner Losh CommitDate: 2024-04-16 19:54:27 +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 (cherry picked from commit 5b3b9a58584b101e3ea0fd8dd50dc8d9157c058e) --- 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