From nobody Tue Aug 8 17:49:53 2023 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 4RL10x4ZNyz4psyx; Tue, 8 Aug 2023 17:49:53 +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 4RL10x40xxz4T55; Tue, 8 Aug 2023 17:49:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691516993; 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=o+HNAH49Mbyg6/TP/CRJ6hOVlNy9Ick2Tcb2cqCo8Og=; b=HiZdADKcGI5RZbXWmli83QDvBqIquIYufHK85yvVy48lc1R0Tujv23wqQd83sfNK6tcUGw IGhotokr8yytFZHMsN6YcAhVQR63/4O6QahEVnfmpGGQfHVfZG94JTgnCKhoo8DjB5WeXA WLhDbcAsMu2VPiAKqlhAkAbh7mFoTuLw5bG3N2qA2S/1xr/YGjvd9ol1AHlZyzL9rqf2Ky p7mHRFcRKPCHFGJiy/sU7Zq/Fhkk44seXfFVujE+iJ42xoV8Jibb8Q6MDa3nKf9bVN24gl ZXxqtF9YKLftMj1Oc3iJrkN2BTkBZFFEi37T3oSXtZJZ9eSBokZhoDuv08myVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691516993; 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=o+HNAH49Mbyg6/TP/CRJ6hOVlNy9Ick2Tcb2cqCo8Og=; b=moUEgYI4UxkE33Lst8yPRupkS6+Iq/GGbsEW079xBtct36EyRkFITfqKE7tjnLg4/xLzlD Kfi781L9w/ZJd7oxtJ5NmXjhdkP8ScykYFUePaVXWmCAycNlGIuBLXiwSMY13/0RuvSsEB 4COgN9F40GFfGJJk59ok+OGmjPp33ImirK6jHG/t5LiF2uh6UU9DBbKy7vrAdGbkNH5FJu 0dhBB7P5NS+qabKA+mW3ule5Zx+RIpxCT+aeedd42sN1pIjNava/b9Zqfeom6hFD0ClCmV UL2D+tMEchCN4HSo5zWXBq5xFHzWrQOgPVhBX8Gh7XV5mNuVxLI+sJOqIXoNsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691516993; a=rsa-sha256; cv=none; b=aybqSXG9D/9dYlf3nT7YmZVMNjPdR5no0r3Mm0HBbvOa36xfTdwAiokr28Rk3wbN8JHygN PRHTl0IOJ78t2k/vRmIXTqY0RUHS9hJhgN5kJbreIl6kM2/QFgH3405rn4CyYbyYRZE9Mg RFsvlauFDjUmmYm/6y+UZG5VfJ0EtRh/uqbIv5Pf8Px/lSS+1DZnF4+UI81p4fqQ3sTSR5 N1qqEJnGbR532pMnjJnNzveQ2y9qMETxBxeG2C0lAMCK+eGo8ECI3On4QglgUopbMoilMM va9wJaJJ/Q4ja2TLsEaVL61cg2bF7Ut2S4y9ggELBW3mJ421tqid2LONn/6zsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RL10x33XHzj9y; Tue, 8 Aug 2023 17:49:53 +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 378Hnru8057048; Tue, 8 Aug 2023 17:49:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 378HnrQX057046; Tue, 8 Aug 2023 17:49:53 GMT (envelope-from git) Date: Tue, 8 Aug 2023 17:49:53 GMT Message-Id: <202308081749.378HnrQX057046@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: 3e1f69523bf0 - main - modules: Use MACHINE_CPUARCH more 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: 3e1f69523bf00ecf89f21c015e2a7bc2a36104e3 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3e1f69523bf00ecf89f21c015e2a7bc2a36104e3 commit 3e1f69523bf00ecf89f21c015e2a7bc2a36104e3 Author: Warner Losh AuthorDate: 2023-08-08 16:50:39 +0000 Commit: Warner Losh CommitDate: 2023-08-08 17:44:51 +0000 modules: Use MACHINE_CPUARCH more Replace two cases of MACHINE_ARCH with MACHINE_CPUARCH and also use `aarch64` instead of the improper `arm64` for that test. Noticed by: Mark Millard Sponsored by: Netflix --- sys/modules/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 2f9e9ec0f931..0ef69528b45e 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -634,11 +634,12 @@ _cxgbe= cxgbe .endif # This has only been tested on amd64 and arm64 -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "arm64" +.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "aarch64" _mpi3mr=mpi3mr .endif -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "arm64" || ${MACHINE_ARCH:Mpowerpc64*} +.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "aarch64" || \ + ${MACHINE_ARCH:Mpowerpc64*} _ice= ice .if ${MK_SOURCELESS_UCODE} != "no" _ice_ddp= ice_ddp