git: 3140e27ee5c4 - main - sys/modules/Makefile: Add a section for arm64 + x86 + powerpc64.

The branch main has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=3140e27ee5c4f8c8cd05ab3071c8af36607c408c

commit 3140e27ee5c4f8c8cd05ab3071c8af36607c408c
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2023-03-08 23:12:25 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2023-03-08 23:12:25 +0000

    sys/modules/Makefile: Add a section for arm64 + x86 + powerpc64.
    
    This reduces some duplication between the existing arm64 + x86 section
    and the powerpc64 section.  To make the diff simpler, enable mlx4 on
    powerpc64 since it compiles.
    
    Reviewed by:    pkubaj, imp, emaste
    Differential Revision:  https://reviews.freebsd.org/D38973
---
 sys/modules/Makefile | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 0bce649ac978..3737dddb57ab 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -533,13 +533,8 @@ _rdma=		rdma
 .endif
 
 .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \
-    ${MACHINE_CPUARCH} == "i386"
-_ena=		ena
+    ${MACHINE_CPUARCH} == "i386" || ${MACHINE_ARCH:Mpowerpc64*} != ""
 _ipmi=		ipmi
-_iwlwifi=	iwlwifi
-.if ${MK_SOURCELESS_UCODE} != "no"
-_iwlwififw=	iwlwififw
-.endif
 _mlx4=		mlx4
 _mlx5=		mlx5
 .if (${MK_INET_SUPPORT} != "no" && ${MK_INET6_SUPPORT} != "no") || \
@@ -551,6 +546,15 @@ _mlx5en=	mlx5en
 _mlx4ib=	mlx4ib
 _mlx5ib=	mlx5ib
 .endif
+.endif
+
+.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \
+    ${MACHINE_CPUARCH} == "i386"
+_ena=		ena
+_iwlwifi=	iwlwifi
+.if ${MK_SOURCELESS_UCODE} != "no"
+_iwlwififw=	iwlwififw
+.endif
 _ossl=		ossl
 _rtw88=		rtw88
 .if ${MK_SOURCELESS_UCODE} != "no"
@@ -844,17 +848,8 @@ _nvme=		nvme
 .endif
 
 .if ${MACHINE_ARCH:Mpowerpc64*} != ""
-_ipmi=		ipmi
 _ixl=		ixl
-_mlx5=		mlx5
 _nvram=		opal_nvram
-.if ${MK_OFED} != "no" || defined(ALL_MODULES)
-_mlx5ib=	mlx5ib
-.endif
-.if (${MK_INET_SUPPORT} != "no" && ${MK_INET6_SUPPORT} != "no") || \
-       defined(ALL_MODULES)
-_mlx5en=	mlx5en
-.endif
 .endif
 
 .if ${MACHINE_CPUARCH} == "powerpc" && ${MACHINE_ARCH} != "powerpcspe"