[src/pgoyette-compat]: src/sys WIP - clean up some of the Makefiles and conf/...

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

details:   https://anonhg.NetBSD.org/src/rev/6f0cc3bc7553
branches:  pgoyette-compat
changeset: 830799:6f0cc3bc7553
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Thu Sep 27 02:44:24 2018 +0000

description:
WIP - clean up some of the Makefiles and conf/files stuff for the
netbsd32 modules.

diffstat:

 sys/arch/acorn32/conf/files.acorn32     |   9 +--------
 sys/arch/arm/conf/files.arm             |  11 +++++------
 sys/modules/compat_netbsd32/Makefile    |   8 ++++++--
 sys/modules/compat_netbsd32_13/Makefile |   7 ++++++-
 sys/modules/compat_netbsd32_16/Makefile |   7 +++++--
 5 files changed, 23 insertions(+), 19 deletions(-)

diffs (117 lines):

diff -r c07a1d2b925d -r 6f0cc3bc7553 sys/arch/acorn32/conf/files.acorn32
--- a/sys/arch/acorn32/conf/files.acorn32       Thu Sep 27 02:41:20 2018 +0000
+++ b/sys/arch/acorn32/conf/files.acorn32       Thu Sep 27 02:44:24 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.acorn32,v 1.29.64.2 2018/09/27 01:35:41 pgoyette Exp $
+#      $NetBSD: files.acorn32,v 1.29.64.3 2018/09/27 02:44:24 pgoyette Exp $
 #
 # First try for arm-specific configuration info
 #
@@ -187,11 +187,4 @@
 # Include USB stuff
 #include "dev/usb/files.usb"
 
-#
-# Files for compat_netbsd32
-#
-#file  arch/acorn32/acorn32/netbsd32_machdep.c         compat_netbsd32
-#file  arch/acorn32/acorn32/netbsd32_machdep_16.c      compat_netbsd32 &
-                                                               compat_16
-
 include "arch/acorn32/conf/majors.acorn32"
diff -r c07a1d2b925d -r 6f0cc3bc7553 sys/arch/arm/conf/files.arm
--- a/sys/arch/arm/conf/files.arm       Thu Sep 27 02:41:20 2018 +0000
+++ b/sys/arch/arm/conf/files.arm       Thu Sep 27 02:44:24 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.arm,v 1.138.2.3 2018/09/27 01:35:41 pgoyette Exp $
+#      $NetBSD: files.arm,v 1.138.2.4 2018/09/27 02:44:24 pgoyette Exp $
 
 # temporary define to allow easy moving to ../arch/arm/arm32
 defflag                                ARM32
@@ -227,11 +227,10 @@
 #
 include "compat/netbsd32/files.netbsd32"
 file   arch/arm/arm32/netbsd32_machdep.c       arm32 & compat_netbsd32
-file   arch/arm/arm32/netbsd32_machdep.c        arm32 & compat_netbsd32
-file   arch/arm/arm32/netbsd32_machdep_16.c     arm32 & compat_netbsd32 &
-                                                                compat_16
-file   arch/arm/arm32/netbsd32_machdep_13.c     arm32 & compat_netbsd32 &
-                                                                compat_13
+file   arch/arm/arm32/netbsd32_machdep_16.c    arm32 & compat_netbsd32 &
+                                                       compat_16
+file   arch/arm/arm32/netbsd32_machdep_13.c    arm32 & compat_netbsd32 &
+                                                       compat_13
 
 
 # Linux binary compatibility (COMPAT_LINUX)
diff -r c07a1d2b925d -r 6f0cc3bc7553 sys/modules/compat_netbsd32/Makefile
--- a/sys/modules/compat_netbsd32/Makefile      Thu Sep 27 02:41:20 2018 +0000
+++ b/sys/modules/compat_netbsd32/Makefile      Thu Sep 27 02:44:24 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.20.12.13 2018/09/24 10:21:00 pgoyette Exp $
+#      $NetBSD: Makefile,v 1.20.12.14 2018/09/27 02:44:24 pgoyette Exp $
 
 .include "../Makefile.inc"
 .include "../Makefile.assym"
@@ -45,14 +45,18 @@
 .PATH: ${S}/arch/amd64/amd64
 CPPFLAGS+=     -DMTRR
 SRCS+= netbsd32_syscall.c
+SRCS+= netbsd32_machdep.c
 .endif
 
 .if ${MACHINE_ARCH} == "sparc64"
 .PATH: ${S}/arch/sparc64/sparc64
 SRCS+= netbsd32_sigcode.S
+SRCS+= netbsd32_machdep.c
 .endif
 
-.PATH: ${S}/arch/${MACHINE}/${MACHINE}
+.if ${MACHINE_ARCH} == "arm"
+.PATH: ${S}/arch/arm/arm32
 SRCS+= netbsd32_machdep.c
+.endif
 
 .include <bsd.kmodule.mk>
diff -r c07a1d2b925d -r 6f0cc3bc7553 sys/modules/compat_netbsd32_13/Makefile
--- a/sys/modules/compat_netbsd32_13/Makefile   Thu Sep 27 02:41:20 2018 +0000
+++ b/sys/modules/compat_netbsd32_13/Makefile   Thu Sep 27 02:44:24 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1.2.4 2018/09/14 05:37:08 pgoyette Exp $
+#      $NetBSD: Makefile,v 1.1.2.5 2018/09/27 02:44:24 pgoyette Exp $
 
 .include "../Makefile.inc"
 
@@ -17,4 +17,9 @@
 SRCS+=  netbsd32_machdep_13.c
 .endif
 
+.if ${MACHINE_ARCH} == "arm"
+.PATH: ${S}/arch/arm/arm32
+SRCS+=  netbsd32_machdep_13.c
+.endif
+
 .include <bsd.kmodule.mk>
diff -r c07a1d2b925d -r 6f0cc3bc7553 sys/modules/compat_netbsd32_16/Makefile
--- a/sys/modules/compat_netbsd32_16/Makefile   Thu Sep 27 02:41:20 2018 +0000
+++ b/sys/modules/compat_netbsd32_16/Makefile   Thu Sep 27 02:44:24 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1.2.4 2018/09/23 01:33:26 pgoyette Exp $
+#      $NetBSD: Makefile,v 1.1.2.5 2018/09/27 02:44:24 pgoyette Exp $
 
 .include "../Makefile.inc"
 .include "../Makefile.assym"
@@ -16,9 +16,12 @@
 .if ${MACHINE_ARCH} == "x86_64"
 .PATH:  ${S}/arch/amd64/amd64
 SRCS+=  netbsd32_sigcode.S
+SRCS+= netbsd32_machdep_16.c
 .endif
 
-.PATH: ${S}/arch/${MACHINE}/${MACHINE}
+.if ${MACHINE_ARCH} == "arm"
+.PATH: ${S}/arch/arm/arm32
 SRCS+= netbsd32_machdep_16.c
+.endif
 
 .include <bsd.kmodule.mk>