[src/pgoyette-compat]: src/sys/modules Keep only a single copy of the list of...

[pgoyette <pgoyette%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3557fdcb5489
branches:  pgoyette-compat
changeset: 446177:3557fdcb5489
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Mon Nov 26 11:21:15 2018 +0000

description:
Keep only a single copy of the list of compat_netbsd32* modules.

diffstat:

 sys/modules/Makefile |  19 +++----------------
 1 files changed, 3 insertions(+), 16 deletions(-)

diffs (40 lines):

diff -r bcb3f6841f46 -r 3557fdcb5489 sys/modules/Makefile
--- a/sys/modules/Makefile      Mon Nov 26 10:43:36 2018 +0000
+++ b/sys/modules/Makefile      Mon Nov 26 11:21:15 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.202.2.40 2018/11/26 01:52:50 pgoyette Exp $
+#      $NetBSD: Makefile,v 1.202.2.41 2018/11/26 11:21:15 pgoyette Exp $
 
 .include <bsd.own.mk>
 
@@ -271,7 +271,8 @@
 SUBDIR+=       wmimsi
 .endif
 
-.if ${MACHINE_CPU} == "arm" \
+.if ${MACHINE_ARCH} == "x86_64" \
+    || ${MACHINE_CPU} == "arm" \
     || (!empty(MACHINE_ARCH:Mmips64*) && !defined(BSD_MK_COMPAT_FILE))
 SUBDIR+=       compat_netbsd32
 SUBDIR+=       compat_netbsd32_09      compat_netbsd32_12
@@ -291,20 +292,6 @@
 
 .if ${MACHINE_ARCH} == "x86_64"
 SUBDIR+=       compat_linux32
-SUBDIR+=       compat_netbsd32
-SUBDIR+=       compat_netbsd32_09      compat_netbsd32_12
-SUBDIR+=       compat_netbsd32_13      compat_netbsd32_16
-SUBDIR+=       compat_netbsd32_20      compat_netbsd32_30
-SUBDIR+=       compat_netbsd32_40      compat_netbsd32_50
-SUBDIR+=       compat_netbsd32_60      compat_netbsd32_80
-SUBDIR+=       compat_netbsd32_43
-SUBDIR+=       compat_netbsd32_mqueue
-SUBDIR+=       compat_netbsd32_nfssrv
-SUBDIR+=       compat_netbsd32_ptrace
-SUBDIR+=       compat_netbsd32_sysvipc
-SUBDIR+=       compat_netbsd32_sysvipc_10
-SUBDIR+=       compat_netbsd32_sysvipc_14
-SUBDIR+=       compat_netbsd32_sysvipc_50
 .endif
 
 .if ${MACHINE_ARCH} == "i386"