git: 31bfa27894c7 - main - sys/modules: Catchup to armv[45] being removed
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 28 Oct 2022 20:12:06 UTC
The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=31bfa27894c7b508100487c258b1bc6dbbc5ff33 commit 31bfa27894c7b508100487c258b1bc6dbbc5ff33 Author: Warner Losh <imp@FreeBSD.org> AuthorDate: 2022-10-28 19:45:30 +0000 Commit: Warner Losh <imp@FreeBSD.org> 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