Module Name: src
Committed By: pgoyette
Date: Thu Sep 27 02:44:24 UTC 2018
Modified Files:
src/sys/arch/acorn32/conf [pgoyette-compat]: files.acorn32
src/sys/arch/arm/conf [pgoyette-compat]: files.arm
src/sys/modules/compat_netbsd32 [pgoyette-compat]: Makefile
src/sys/modules/compat_netbsd32_13 [pgoyette-compat]: Makefile
src/sys/modules/compat_netbsd32_16 [pgoyette-compat]: Makefile
Log Message:
WIP - clean up some of the Makefiles and conf/files stuff for the
netbsd32 modules.
To generate a diff of this commit:
cvs rdiff -u -r1.29.64.2 -r1.29.64.3 src/sys/arch/acorn32/conf/files.acorn32
cvs rdiff -u -r1.138.2.3 -r1.138.2.4 src/sys/arch/arm/conf/files.arm
cvs rdiff -u -r1.20.12.13 -r1.20.12.14 \
src/sys/modules/compat_netbsd32/Makefile
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/modules/compat_netbsd32_13/Makefile
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/modules/compat_netbsd32_16/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/acorn32/conf/files.acorn32
diff -u src/sys/arch/acorn32/conf/files.acorn32:1.29.64.2 src/sys/arch/acorn32/conf/files.acorn32:1.29.64.3
--- src/sys/arch/acorn32/conf/files.acorn32:1.29.64.2 Thu Sep 27 01:35:41 2018
+++ src/sys/arch/acorn32/conf/files.acorn32 Thu Sep 27 02:44:24 2018
@@ -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 "dev/pckbport/files.pckbport"
# 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"
Index: src/sys/arch/arm/conf/files.arm
diff -u src/sys/arch/arm/conf/files.arm:1.138.2.3 src/sys/arch/arm/conf/files.arm:1.138.2.4
--- src/sys/arch/arm/conf/files.arm:1.138.2.3 Thu Sep 27 01:35:41 2018
+++ src/sys/arch/arm/conf/files.arm Thu Sep 27 02:44:24 2018
@@ -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 @@ file arch/arm/arm32/bcopy_page.S arm32
#
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)
Index: src/sys/modules/compat_netbsd32/Makefile
diff -u src/sys/modules/compat_netbsd32/Makefile:1.20.12.13 src/sys/modules/compat_netbsd32/Makefile:1.20.12.14
--- src/sys/modules/compat_netbsd32/Makefile:1.20.12.13 Mon Sep 24 10:21:00 2018
+++ src/sys/modules/compat_netbsd32/Makefile Thu Sep 27 02:44:24 2018
@@ -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 @@ SRCS+= netbsd32_exec_aout.c
.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>
Index: src/sys/modules/compat_netbsd32_13/Makefile
diff -u src/sys/modules/compat_netbsd32_13/Makefile:1.1.2.4 src/sys/modules/compat_netbsd32_13/Makefile:1.1.2.5
--- src/sys/modules/compat_netbsd32_13/Makefile:1.1.2.4 Fri Sep 14 05:37:08 2018
+++ src/sys/modules/compat_netbsd32_13/Makefile Thu Sep 27 02:44:24 2018
@@ -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_compat_13.c
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>
Index: src/sys/modules/compat_netbsd32_16/Makefile
diff -u src/sys/modules/compat_netbsd32_16/Makefile:1.1.2.4 src/sys/modules/compat_netbsd32_16/Makefile:1.1.2.5
--- src/sys/modules/compat_netbsd32_16/Makefile:1.1.2.4 Sun Sep 23 01:33:26 2018
+++ src/sys/modules/compat_netbsd32_16/Makefile Thu Sep 27 02:44:24 2018
@@ -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 @@ SRCS+= netbsd32_compat_16.c
.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>
