aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2022-10-28 19:45:30 +0000
committerWarner Losh <imp@FreeBSD.org>2022-10-28 20:11:04 +0000
commit31bfa27894c7b508100487c258b1bc6dbbc5ff33 (patch)
treedc6c72f8e4c24b3e4af847ca0d6deef6ead9b6cf
parentc8a63d71feee454949a071ad738288af9ab8e3cd (diff)
downloadsrc-31bfa27894c7b508100487c258b1bc6dbbc5ff33.tar.gz
src-31bfa27894c7b508100487c258b1bc6dbbc5ff33.zip
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
-rw-r--r--sys/modules/Makefile4
1 files changed, 1 insertions, 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