From nobody Tue Jan 11 17:00:55 2022 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 9638D1943A53; Tue, 11 Jan 2022 17:00:55 +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 4JYH5M2TmDz3ky8; Tue, 11 Jan 2022 17:00:55 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 31E911CCBC; Tue, 11 Jan 2022 17:00:55 +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 20BH0tpo003199; Tue, 11 Jan 2022 17:00:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20BH0tbS003198; Tue, 11 Jan 2022 17:00:55 GMT (envelope-from git) Date: Tue, 11 Jan 2022 17:00:55 GMT Message-Id: <202201111700.20BH0tbS003198@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 2754373f9ac8 - main - Use ${MACHINE} for the kernel modeule ldscript 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2754373f9ac8e73f8fdbba9df26ac03e4864576e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641920455; 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=vdm22p5lYY1El2MoHhdkij/jEsVlYJ3pPo33xpe0fdo=; b=uzw3Oi638IyqLz/vBNSFeh9QtOLrxHOf45WTio1om6MKFDXpE9UNG7K59Tyo7IAGUbJvMB PDQPrXd8ZdOvPNUMxtDDfMLU3KHIXJmsLwTnS8lIfV8sv1N6nQNtBCsfmCPj4cZdXbQ7QY mhKWWGHqhn7rip+0WbnLyYYdf9cT/HaO51KSZDWrHWUR5OEUHkQem1sZyIRkRIc+tmpLu7 0IKgkRsqtq4kw7JyaWBNCbPow25hC5QacgFivp0+mbIoY4lzChymBLgXXXrryiF7BF8XVN yxb1FSCA12c83Ywl8kMg/uID6QBNimL67X/sN2s7zEPqJwAXKQEHnHOiS5zHlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641920455; a=rsa-sha256; cv=none; b=UDpkidt+VR1/s5eWMEIMeT6xS5V97jaPwiIR3gmyC+NzTScYD3htyTFnvR2QkuE94obJSr wJObt+g7NKVzzTPqej/UUgKLT4R8rwgftCisA3wQVmV7GuNyH/l2MJezXERrQSunsa5qrs KG5w/R/Hn9w90I55T7psa+7uP45M/p3kK0OYDaTqh0pZhjFC148+eEzpgpe4y2d+iCNlRt A1yztG9np3DY4CuHBAWc2dpAipVVZJInhnxC9NSAnn6M+unv+dKWD4X8b4goPRoR0B0DDv B9bHg0zhYOgTcVhow82l9VlGJnyWukYCKgGuDJA14tbrE9QzHc92p46evCyngw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=2754373f9ac8e73f8fdbba9df26ac03e4864576e commit 2754373f9ac8e73f8fdbba9df26ac03e4864576e Author: Andrew Turner AuthorDate: 2022-01-11 11:55:32 +0000 Commit: Andrew Turner CommitDate: 2022-01-11 16:58:31 +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 --- 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 ee6aaa8aba0b..cf39de5e87cf 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -234,8 +234,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