Move dtrace/opensolaris/zfs module option to common section

These are not target-specific modules, so the logic to build them should
be common.  This also enables them for arm64.

Sponsored by:	The FreeBSD Foundation

diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 28f9ab4180a109d813db56ba9c6ed3ffebe9cce5..c993266558d5033ed9528613714cefbb3cfbdf8a 100644 (file)
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -98,7 +98,6 @@ SUBDIR=       \
        ${_dpt} \
        ${_drm} \
        ${_drm2} \
-       ${_dtrace} \
        dummynet \
        ${_ed} \
        ${_elink} \
@@ -268,7 +267,6 @@ SUBDIR=     \
        ${_nvme} \
        ${_nvram} \
        ${_nxge} \
-       ${_opensolaris} \
        oce \
        otus \
        otusfw \
@@ -394,13 +392,20 @@ SUBDIR=   \
        ${_x86bios} \
        ${_xe} \
        xl \
-       ${_zfs} \
        zlib
 
 .if ${MK_AUTOFS} != "no" || defined(ALL_MODULES)
 _autofs=       autofs
 .endif
 
+.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
+.if ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips" && \
+       ${MACHINE_CPUARCH} != "sparc64"
+SUBDIR+=       dtrace
+.endif
+SUBDIR+=       opensolaris
+.endif
+
 .if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
 .if exists(${.CURDIR}/../opencrypto)
 _crypto=       crypto
@@ -479,6 +484,10 @@ _txp=              txp
 _cxgbe=                cxgbe
 .endif
 
+.if ${MK_ZFS} != "no" || defined(ALL_MODULES)
+SUBDIR+=       zfs
+.endif
+
 .if ${MACHINE_CPUARCH} != "aarch64" && ${MACHINE_CPUARCH} != "arm" && \
        ${MACHINE_CPUARCH} != "mips" && ${MACHINE_CPUARCH} != "powerpc"
 _syscons=      syscons
@@ -509,9 +518,6 @@ _cs=                cs
 _dpms=         dpms
 _drm=          drm
 _drm2=         drm2
-.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
-_dtrace=       dtrace
-.endif
 _ed=           ed
 _em=           em
 _ep=           ep
@@ -537,9 +543,6 @@ _linux=             linux
 _linuxkpi=     linuxkpi
 .endif
 _ndis=         ndis
-.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
-_opensolaris=  opensolaris
-.endif
 _pccard=       pccard
 .if ${MK_OFED} != "no" || defined(ALL_MODULES)
 _rdma=         rdma
@@ -555,9 +558,6 @@ _vxge=      vxge
 _wbwd=         wbwd
 _wi=           wi
 _xe=           xe
-.if ${MK_ZFS} != "no" || defined(ALL_MODULES)
-_zfs=          zfs
-.endif
 .if ${MACHINE} != "pc98"
 _aac=          aac
 _aacraid=      aacraid
@@ -716,23 +716,14 @@ _cbb=             cbb
 _cfi=          cfi
 _cpufreq=      cpufreq
 _drm=          drm
-.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
-_dtrace=       dtrace
-.endif
 _exca=         exca
 _nvram=                powermac_nvram
-.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
-_opensolaris=  opensolaris
-.endif
 _pccard=       pccard
 _wi=           wi
 .endif
 
 .if ${MACHINE_ARCH} == "powerpc64"
 _drm2=         drm2
-.if ${MK_ZFS} != "no" || defined(ALL_MODULES)
-_zfs=          zfs
-.endif
 .endif
 
 .if ${MACHINE_CPUARCH} == "sparc64"
@@ -740,12 +731,6 @@ _auxio=            auxio
 _em=           em
 _epic=         epic
 _igb=          igb
-.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
-_opensolaris=  opensolaris
-.endif
-.if ${MK_ZFS} != "no" || defined(ALL_MODULES)
-_zfs=          zfs
-.endif
 .endif
 
 .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64"