From nobody Mon Jan 31 11:32:54 2022 X-Original-To: dev-commits-src-branches@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 21CF61982DC5; Mon, 31 Jan 2022 11:32:57 +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 4JnQsg4zhnz3Lm7; Mon, 31 Jan 2022 11:32:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643628776; 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=7MRSfrKzmTIslQoJQdCFoAAbc/o7wl1yYpnl5jqQZ2Q=; b=YmRGevmMNVdSfS7Yre8QO4HzOlSAJ5SupXjYSJelWopzhXFV/ex4Yqi76q/5vxPstMsQ4F IthZHzmk+UxjQYtPG05KhvpJ6kxGGqnk41tcIZr5W9salLPWKXVtBZQnAW8Wb9aUz4yB+W e/he2257axB0H0q4obyB7pCySG08B84ywc2EtraE48P7Br9l+yG6wZzCpRjbYCn+JQdAeg JnPXUGOsGW7nyzkPbDBIi2jz3XcqXlS6IyaHOf92bqfbmgXDHZ+hXx/anWCKvnNWbiIs20 1FyYGaUr9W3ftG/51DA0Lp3SoDmdFcYJfrl1DPkfS672o2XsIY9LSl6xyelGvA== 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 E86691B56D; Mon, 31 Jan 2022 11:32:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20VBWsgI015199; Mon, 31 Jan 2022 11:32:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20VBWshi015198; Mon, 31 Jan 2022 11:32:54 GMT (envelope-from git) Date: Mon, 31 Jan 2022 11:32:54 GMT Message-Id: <202201311132.20VBWshi015198@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 3b8c26507f7b - stable/13 - Use ${MACHINE} for the kernel modeule ldscript List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3b8c26507f7b5325df967abfddc23f38cf940ab6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643628776; 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=7MRSfrKzmTIslQoJQdCFoAAbc/o7wl1yYpnl5jqQZ2Q=; b=gA5Asvxg10kg/0fpOsxocqib+uQP7rX7LNsUh0Uwgkid8w3BN91nGJJ4FOXNhAP6Drv2hL 8HlxwtYGIJ+Qz2T5UscJHQ0sS4p64uMmbMyj77sGz77jxQEZclJzzOIDdsuk+YlMFzJgJX whoTv+/A4trw0MWxXNXZ3NJRGtT7YMQPR5DnrJUgv88kqdUwHO3p1Iwu/Xpvan5ONB0Ivn ucUR9430xxmrLcpGr9dIGB5rptIl4zIt0e1hg8fobmTtWJQ4wOgDjy7njyQ8zsf6Aj4zZV DBxhNNr2NBMjGGbo84TKN0cmfqcJo5UoJtcVXP2G+JVafqBooNvcMazemK2y0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643628776; a=rsa-sha256; cv=none; b=mrivDNeJ2/+BE91b+VEmONCE5JfnhvFv7a8/afoePChNnwi5wXKIz8wVYpagO07Eh8fBOn vgk6xYenyszAxgWNBwo6zZR0CfSusorM6BdmnvkqdVEYICTXUQI3rE7BLh99wF26B2Ysuq XjCFXzaAdKJvlapfPSnL2+J2wk58GVvqHDSqjSpn/z3TQXUcbaLs67+jta20DWfMdhaVKA ZhEVB++2E2tBCSp+yZ5mXCvg3yX0GtlaoLdHxMY6NKFZTA/uTWQrGEz6uuKPed74k7HTJB RfGMUAyYvYJxXs5B0QAv3iTWkFctf9cLftDQcxoR3Qil8GX7W2CAE25yQO//Ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=3b8c26507f7b5325df967abfddc23f38cf940ab6 commit 3b8c26507f7b5325df967abfddc23f38cf940ab6 Author: Andrew Turner AuthorDate: 2022-01-11 11:55:32 +0000 Commit: Andrew Turner CommitDate: 2022-01-31 10:05:54 +0000 Use ${MACHINE} for the kernel modeule ldscript For consistancy with the kernel linker script also use ${MACHINE} for finding the kernel module linker script. As we currently only use this for amd64 and i386 this is a no-op, but I'm planning on using this with arm64 where ${MACHINE} != ${MACHINE_ARCH}. Reviewed by: markj, kib, imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D33841 (cherry picked from commit 2754373f9ac8e73f8fdbba9df26ac03e4864576e) --- sys/conf/kmod.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index c0d4441af029..736ce26d406c 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -236,8 +236,8 @@ EXPORT_SYMS?= NO CLEANFILES+= export_syms .endif -.if exists(${SYSDIR}/conf/ldscript.kmod.${MACHINE_ARCH}) -LDSCRIPT_FLAGS?= -T ${SYSDIR}/conf/ldscript.kmod.${MACHINE_ARCH} +.if exists(${SYSDIR}/conf/ldscript.kmod.${MACHINE}) +LDSCRIPT_FLAGS?= -T ${SYSDIR}/conf/ldscript.kmod.${MACHINE} .endif .if ${__KLD_SHARED} == yes