From nobody Fri Oct 28 20:12:06 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 4MzYc74q6cz4h0Ls; Fri, 28 Oct 2022 20:12:07 +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 4MzYc70xNFz4LyF; Fri, 28 Oct 2022 20:12:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666987927; 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=xnyNZLCUG34k3OMjEqp3Xdolk465YUEv8zrmCTF0GvY=; b=JjZ5KqWFNk5YFay2oKqPBVXer1hyZxdzoDU4dBFM7vBZ8D8l2C3OBbslOA81GIoI/GMgtP QD1SEHsFGAOHxJsp6XbrRBzyLO0aPLQAfdg+cAX9GWBJVnMUEc3TwUUFPdtAK2Zw6xHYjD 8LuIkA82rVR+EABek52wRa6JvkBd4s6ckbb9siQciod4553hDvdeAZoY7ZULJIun4e9C8p 2LmxdSOnmiqVGDX6CWqdC+kE8m5A1ApsVncUfBTyj8eY7ryEkFBDnQy/AunkHLYOvuLinP b9U1RUrXmWOwKNV42PgK1mqkVCqStK1lbVhci1MHbs2Jwe4/jARlGIb6sTTAqQ== 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 4MzYc66qByzqrv; Fri, 28 Oct 2022 20:12:06 +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 29SKC6Eq050406; Fri, 28 Oct 2022 20:12:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29SKC6bH050405; Fri, 28 Oct 2022 20:12:06 GMT (envelope-from git) Date: Fri, 28 Oct 2022 20:12:06 GMT Message-Id: <202210282012.29SKC6bH050405@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: 31bfa27894c7 - main - sys/modules: Catchup to armv[45] being removed 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: 31bfa27894c7b508100487c258b1bc6dbbc5ff33 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666987927; 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=xnyNZLCUG34k3OMjEqp3Xdolk465YUEv8zrmCTF0GvY=; b=uavAlNPIH/mkWRwGPI8Gg2RF21m+L38YHMk2UHIF3iA7KZ3n28PeyXbXhmioLzFNw7VzyJ N/V9uHOSyphgFoCS4slzLwM5o+SQB4UJG6faY7C71nZfJ12evg6WignNcvkQSMX15iIkcM c3mng/T1rcRKVhFlHVd8AKB8/UnZKTvH3ssQ8ZFE3NU5898R+VKqwFTTeLld+MT40Bc+tJ TcQxTbFZcJOps6OS4CH7x+UA1S6qH79Eyb02kocOs+sZDLy27av/J5Y3ohaZtyf7+m0nL6 myzdxGrndb6+L38kdnpt98AuBACBQL8rOzEZFAb3w+zTkUZpX5Pyvrkxapd8Qw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666987927; a=rsa-sha256; cv=none; b=krTPOmQ+uVoMhKXmo1poVuNAKOpPfrmpHollx1WvDAHj7PV+hOvh7WudyaCssFnl4NQmrb ZKmgsCmToIlAYWN2YOXS4B9i2kooNAg8hBfRqunxL/nW0Ur1exQC88TWUCTod/0K2edWaw CB9jGv36aYq/9dfYWUQSkFY7anK/aJ90DHOr2bnrfAYs0xKX/ZkrasUC1DLyd5zkjCkLFm eJZcmkJMLL/q0CnqmcN5aimbHh82EbXS3H+Al45soxcbOmxn4bydATp0KC0jIcJvqgx4uu fLi2Du+3D/SiSscn66rn2WLkxm7d318GpLmXpvOzyg5qzB4Qlb4fdhCvYqbzwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=31bfa27894c7b508100487c258b1bc6dbbc5ff33 commit 31bfa27894c7b508100487c258b1bc6dbbc5ff33 Author: Warner Losh AuthorDate: 2022-10-28 19:45:30 +0000 Commit: Warner Losh CommitDate: 2022-10-28 20:11:04 +0000 sys/modules: Catchup to armv[45] being removed Now that armv[45] are removed, simplify some tests for armv[67] that are now either always true, or always true when we're on arm. Sponsored by: Netflix --- sys/modules/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 410aeb7d481f..6f718acab38b 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -417,11 +417,9 @@ _autofs= autofs .endif .if ${MK_DTRACE} != "no" || defined(ALL_MODULES) -.if ${MACHINE_CPUARCH} != "arm" || ${MACHINE_ARCH:Marmv[67]*} != "" .if ${KERN_OPTS:MKDTRACE_HOOKS} SUBDIR+= dtrace .endif -.endif SUBDIR+= opensolaris .endif @@ -848,7 +846,7 @@ _nvram+= powermac_nvram .endif -.if ${MACHINE_ARCH:Marmv[67]*} != "" || ${MACHINE_CPUARCH} == "aarch64" +.if ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "aarch64" _bcm283x_clkman= bcm283x_clkman _bcm283x_pwm= bcm283x_pwm .endif