From nobody Sun Feb 25 00:58:27 2024 X-Original-To: dev-commits-src-main@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 4Tj5381vsXz5BxW1; Sun, 25 Feb 2024 00:58:28 +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 4Tj5381BgZz4tG9; Sun, 25 Feb 2024 00:58:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708822708; 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=FfgJe/GAe/sGr3x0tNuyGKGKdM9ZARcBeVFcRurVD4M=; b=ZPDhTbWYTaWh5i0IudaVG9fZp35hcsNePPWswXWajW+7nNXej0upQzw+K7Dy+RZF3OVpvh H9el/r6pjmdCgl+gOjd+atkxKQRBM4rp+5ENnJWNCbCBu2qKCJ1lhM5GdOMWGiZFMAeTZu uMK17mnc0XWrkBZtZHiwYEhtk9dcdE6erEPVl2IWf+Zij/5uEizIzylzhlpYSps3jsVZpg 4ertlY1PUSwAlCkyXxKcXUUprsP3pmsn1Wh5P2ksrNPxtiRZBZFf9eiEd/fNG8T0eYFLUM g+08S4YwbU+dwSezAPUIg1PuoR5ooMxycD8v4Ozsc4ogav3hNRKCY1p4crUZgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708822708; a=rsa-sha256; cv=none; b=Zx6O5/BboXPkehkHsNysK9WX5G5qbumRkv3D5Dry+wQPBJwOVmnPdE4WxrYGoHcxsMLRuk O+CgKZNTWgEp7Su/BIcz4FdaaUblBF7Elp53kuKjvyaw1ffn2YXGGggK/VE9n8aaUKLWuI zsN2lmE8vNjTx6id7Bl1VYUv4gfjgCvr+fyszYSh3W0NxcgO3SGx8Psu1TArLlBzIIOpzk VEX1S+QnUTBnu2BdDsYFp5b2wGRJx5SGDEh9+DO1hNYyrRyqDR5+E+AY+nCQVijRuGhDET HNQknYRuzNu2EAEfLxzsBQuGO5U1tOny9D+33DLItmRxZ5BlAxbQr8WwutE1EA== 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=1708822708; 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=FfgJe/GAe/sGr3x0tNuyGKGKdM9ZARcBeVFcRurVD4M=; b=LygPjKA6ZVxgCQtyTS7k/V5etkd4bXQ7ByLjHGOv4ps0psL7wFXqebB5P3z3N3Pd5n/k5C gQqRhrcF79t7jZKkeuc5AXRmRHENIdG/VMCq77AYAgDXws0YSDsM2zlJpTSRp3T/v5UHqQ SDJU0NKPtkwNfOpoT2/1nsMkQhT4F1eOHsJjsKoNLNabMi8040t2ue7pLt35SbpL7X4mzL ySaY30yC8VNeHj8VQ0Y7bB9qC2JFChf+BCc0fsepf4yW73d3EoRDduNj4Bl8AK4EJnGjeg CjgWsOk+2aXwxm6xiedcMa+waRfkmBY0kaorgF/6PgiUuJwQslN9nFq2jh3M8g== 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 4Tj5376whJzNJZ; Sun, 25 Feb 2024 00:58:27 +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 41P0wRhW081533; Sun, 25 Feb 2024 00:58:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41P0wRVE081530; Sun, 25 Feb 2024 00:58:27 GMT (envelope-from git) Date: Sun, 25 Feb 2024 00:58:27 GMT Message-Id: <202402250058.41P0wRVE081530@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 5b3b9a58584b - main - loader: Move ldscripts to match more standard practices List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 5b3b9a58584b101e3ea0fd8dd50dc8d9157c058e Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5b3b9a58584b101e3ea0fd8dd50dc8d9157c058e commit 5b3b9a58584b101e3ea0fd8dd50dc8d9157c058e Author: Warner Losh AuthorDate: 2024-02-25 00:56:14 +0000 Commit: Warner Losh 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