From nobody Sun Feb 25 00:58:28 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 4Tj5391lNRz5BxfK; Sun, 25 Feb 2024 00:58:29 +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 4Tj53911B4z4tGB; Sun, 25 Feb 2024 00:58:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708822709; 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=1t3xo7N1AzsiGTyIbsClNm7kGj0HLmgLlebdTvzrJL4=; b=Ig2W5P/IISfWVTNy5lZQLrc8oqrGpMYaj3AC9zKOp6mxa4GdSNnqyHxR+93DfI1vd+SixA Dvga88YKupMHARl9Tcjf5dgP5g3LLUD2ox6+grmoFUORP0bvn4E2+ZisxtVCPSM2d5/8PT VXDpAaiPU/8UVey1j+MIc6XhcSWRiXDw5muhU6NCZUnJ3xd5dyk7VUEv5Ku0KK1Rz8xiKe phTi7MwQJWXoxlBJlvUfYiMPpPaFD4PsCoix2Oze/HgDiwfwidJ9XWXw35erjvhbXyHTg7 GJtWJUW3m3dmlrE08zb3CYfq1dnHZMHQ/MDM+hgt4ytlaoiiBaIndVwKj8FiyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708822709; a=rsa-sha256; cv=none; b=U9t2BV3LbznelX4ws6Evevb7XaFfDQYyxgaNJq5KFpcdmsy7fyUapHR3IoEfKcSOEaT2pa 671U3JnAacRpdE+m0Yrgqg9ebbTmowi1WeN5ShFdycr9FiAO0hJ++vJxnFYG4QyIm3Y2r5 8vxoF5oPqGepBL3m7cmfB7De4XhavhNYgAOd185vEUdmF7EThEtxq2dMHlii0BTKGpMMOX 0YTHSH1fMVCYt4Ciygd7qtD56F+K0aeTMtkm6788UqBzshfaBDvN9e8L+qk89MrAu/RL8A bHvOVcHbWsr8ekUqalsrtfqGHv1iE0KwlqzB8NnRRWdWxHbUXpMl7a+YiDmXqA== 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=1708822709; 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=1t3xo7N1AzsiGTyIbsClNm7kGj0HLmgLlebdTvzrJL4=; b=prlQqIAkEHBxoy0DeUCxb1zg4mS5QPh5UkZLxdjmNDJrT69Zpaqlo3QWafb3IBl5cFgwwL SlA0VwlONB5BYiOuYd930Eoq3SzZNpCvQ2Dg/orz/+4LdZj6r60u2bjCMfndLjGkjO9DG+ JKBRvN6fmcM2ifcGc1N7m4HK8LachuRsjdcE2J8QQiFlINLnZgVZzKJj+pvummKQWt8xWg NDJjorrVXS5mi05JjG+VrbgUV/9ZqZAIf5bfShDSyW6siDwm/BaE4LubRKt71F7GeM/fqV iF9lVKULcGnbOSAe5IahZKOoMOjXdo6yXdAZGgiyouZ6zUSKtx2YVkNYbObu0A== 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 4Tj5390595zMYQ; Sun, 25 Feb 2024 00:58:29 +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 41P0wSi6081572; Sun, 25 Feb 2024 00:58:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41P0wSCT081569; Sun, 25 Feb 2024 00:58:28 GMT (envelope-from git) Date: Sun, 25 Feb 2024 00:58:28 GMT Message-Id: <202402250058.41P0wSCT081569@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: acb474c084b8 - main - kboot: Centralize ldscript addition 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: acb474c084b8e3b7bb738a286f9218f926a15823 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=acb474c084b8e3b7bb738a286f9218f926a15823 commit acb474c084b8e3b7bb738a286f9218f926a15823 Author: Warner Losh AuthorDate: 2024-02-25 00:56:23 +0000 Commit: Warner Losh CommitDate: 2024-02-25 00:56:23 +0000 kboot: Centralize ldscript addition Make the pattern for ldscripts always be arch/$MACHINE_ARCH/$MACHINE_ARCH.ldscript so we can add it from a central Makefile. This also moves from ldscript.arch to arch.ldscript to match the loader's new convention. Sponsored by: Netflix Reviewed by: tsoome, kevans Differential Revision: https://reviews.freebsd.org/D44057 --- stand/kboot/kboot/Makefile | 3 +++ stand/kboot/kboot/arch/aarch64/Makefile.inc | 2 -- stand/kboot/kboot/arch/aarch64/{ldscript.aarch64 => aarch64.ldscript} | 0 stand/kboot/kboot/arch/amd64/Makefile.inc | 2 -- stand/kboot/kboot/arch/amd64/{ldscript.amd64 => amd64.ldscript} | 0 stand/kboot/kboot/arch/powerpc64/Makefile.inc | 2 -- .../kboot/arch/powerpc64/{ldscript.powerpc => powerpc64.ldscript} | 0 7 files changed, 3 insertions(+), 6 deletions(-) diff --git a/stand/kboot/kboot/Makefile b/stand/kboot/kboot/Makefile index b571c3acada1..c6cb47fbbba2 100644 --- a/stand/kboot/kboot/Makefile +++ b/stand/kboot/kboot/Makefile @@ -51,6 +51,9 @@ HELP_FILENAME= loader.help.kboot .PATH: ${.CURDIR}/arch/${MACHINE_ARCH} .include "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc" +# Bring in our ldscript +LDFLAGS= -nostdlib -static -T ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}.ldscript + # Always add MI sources .include "${BOOTSRC}/loader.mk" CFLAGS+= -I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH} diff --git a/stand/kboot/kboot/arch/aarch64/Makefile.inc b/stand/kboot/kboot/arch/aarch64/Makefile.inc index 744a15f363d3..3e856f5322b3 100644 --- a/stand/kboot/kboot/arch/aarch64/Makefile.inc +++ b/stand/kboot/kboot/arch/aarch64/Makefile.inc @@ -8,5 +8,3 @@ CFLAGS+= -I${SYSDIR}/contrib/dev/acpica/include # load address. set in linker script RELOC?= 0x0 CFLAGS+= -DRELOC=${RELOC} - -LDFLAGS= -nostdlib -static -T ${.CURDIR}/arch/${MACHINE_ARCH}/ldscript.${MACHINE_ARCH} diff --git a/stand/kboot/kboot/arch/aarch64/ldscript.aarch64 b/stand/kboot/kboot/arch/aarch64/aarch64.ldscript similarity index 100% rename from stand/kboot/kboot/arch/aarch64/ldscript.aarch64 rename to stand/kboot/kboot/arch/aarch64/aarch64.ldscript diff --git a/stand/kboot/kboot/arch/amd64/Makefile.inc b/stand/kboot/kboot/arch/amd64/Makefile.inc index 55b1819ccdee..edb8a1de0bba 100644 --- a/stand/kboot/kboot/arch/amd64/Makefile.inc +++ b/stand/kboot/kboot/arch/amd64/Makefile.inc @@ -1,5 +1,3 @@ SRCS+= amd64_tramp.S elf64_freebsd.c load_addr.c fdt_arch.c CFLAGS+= -I${SYSDIR}/contrib/dev/acpica/include - -LDFLAGS= -nostdlib -static -T ${.CURDIR}/arch/${MACHINE_ARCH}/ldscript.amd64 diff --git a/stand/kboot/kboot/arch/amd64/ldscript.amd64 b/stand/kboot/kboot/arch/amd64/amd64.ldscript similarity index 100% rename from stand/kboot/kboot/arch/amd64/ldscript.amd64 rename to stand/kboot/kboot/arch/amd64/amd64.ldscript diff --git a/stand/kboot/kboot/arch/powerpc64/Makefile.inc b/stand/kboot/kboot/arch/powerpc64/Makefile.inc index 338d1222ab65..11a67a93d9e0 100644 --- a/stand/kboot/kboot/arch/powerpc64/Makefile.inc +++ b/stand/kboot/kboot/arch/powerpc64/Makefile.inc @@ -2,6 +2,4 @@ CFLAGS+= -mcpu=powerpc64 SRCS+= ppc64_elf_freebsd.c kerneltramp.S load_addr.c fdt_arch.c -LDFLAGS= -nostdlib -static -T ${.CURDIR}/arch/${MACHINE_ARCH}/ldscript.powerpc - MK_PIE= no diff --git a/stand/kboot/kboot/arch/powerpc64/ldscript.powerpc b/stand/kboot/kboot/arch/powerpc64/powerpc64.ldscript similarity index 100% rename from stand/kboot/kboot/arch/powerpc64/ldscript.powerpc rename to stand/kboot/kboot/arch/powerpc64/powerpc64.ldscript