Module Name: src
Committed By: pgoyette
Date: Sun Jun 16 21:52:02 UTC 2024
Modified Files:
src/sys/modules/compat_13: Makefile
src/sys/modules/compat_16: Makefile
src/sys/modules/compat_netbsd32_13: Makefile
src/sys/modules/compat_netbsd32_16: Makefile
Added Files:
src/sys/modules: Makefile.compat
Log Message:
Introduce sys/modules/Makefile.compat and hook some compat_1[36]
machdep code into the modules. kern/58346
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/modules/Makefile.compat
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/compat_13/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/compat_16/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/modules/compat_netbsd32_13/Makefile
cvs rdiff -u -r1.4 -r1.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/modules/compat_13/Makefile
diff -u src/sys/modules/compat_13/Makefile:1.2 src/sys/modules/compat_13/Makefile:1.3
--- src/sys/modules/compat_13/Makefile:1.2 Sun Jan 27 02:08:44 2019
+++ src/sys/modules/compat_13/Makefile Sun Jun 16 21:52:01 2024
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2019/01/27 02:08:44 pgoyette Exp $
+# $NetBSD: Makefile,v 1.3 2024/06/16 21:52:01 pgoyette Exp $
-.include "../Makefile.inc"
+.include <bsd.init.mk>
.PATH: ${S}/compat/common
@@ -12,10 +12,9 @@ CPPFLAGS+= -DCOMPAT_40 -DCOMPAT_50 -DCOM
SRCS+= compat_13_mod.c
SRCS+= uvm_13.c kern_sig_13.c
-.if ${MACHINE_ARCH} == "x86_64"
-.PATH: ${S}/arch/amd64/amd64
-
-SRCS+= compat_13_machdep.c
+.if ${MACHINE_CPU} == "m68k"
+COMPAT_MACHDEP_SRCS+= compat_13_sigreturn13.s
.endif
+.include "../Makefile.compat"
.include <bsd.kmodule.mk>
Index: src/sys/modules/compat_16/Makefile
diff -u src/sys/modules/compat_16/Makefile:1.2 src/sys/modules/compat_16/Makefile:1.3
--- src/sys/modules/compat_16/Makefile:1.2 Sun Jan 27 02:08:44 2019
+++ src/sys/modules/compat_16/Makefile Sun Jun 16 21:52:01 2024
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2019/01/27 02:08:44 pgoyette Exp $
+# $NetBSD: Makefile,v 1.3 2024/06/16 21:52:01 pgoyette Exp $
-.include "../Makefile.inc"
+.include <bsd.init.mk>
.PATH: ${S}/compat/common
@@ -12,4 +12,14 @@ CPPFLAGS+= -DCOMPAT_40 -DCOMPAT_50 -DCOM
SRCS+= compat_16_mod.c
SRCS+= kern_sig_16.c
+COMPAT_MACHDEP_SRCS= compat_16_machdep.c
+.if ${MACHINE_CPU} == "m68k"
+COMPAT_MACHDEP_SRCS+= compat_16_sigreturn14.s
+.endif
+.if ${MACHINE_CPU} == "powerpc"
+COMPAT_MACHDEP_SRCS+= sigcode.S
+.endif
+
+.include "../Makefile.compat"
+
.include <bsd.kmodule.mk>
Index: src/sys/modules/compat_netbsd32_13/Makefile
diff -u src/sys/modules/compat_netbsd32_13/Makefile:1.4 src/sys/modules/compat_netbsd32_13/Makefile:1.5
--- src/sys/modules/compat_netbsd32_13/Makefile:1.4 Thu Sep 26 02:01:03 2019
+++ src/sys/modules/compat_netbsd32_13/Makefile Sun Jun 16 21:52:02 2024
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2019/09/26 02:01:03 christos Exp $
+# $NetBSD: Makefile,v 1.5 2024/06/16 21:52:02 pgoyette Exp $
-.include "../Makefile.inc"
+.include <bsd.init.mk>
.PATH: ${S}/compat/netbsd32
@@ -13,14 +13,8 @@ CPPFLAGS+= -I${NETBSDSRCDIR}/sys/externa
SRCS+= netbsd32_compat_13.c
-.if ${MACHINE_ARCH} == "x86_64"
-.PATH: ${S}/arch/amd64/amd64
-SRCS+= netbsd32_machdep_13.c
-.endif
-
-.if ${MACHINE_ARCH} == "arm"
-.PATH: ${S}/arch/arm/arm32
-SRCS+= netbsd32_machdep_13.c
-.endif
+COMPAT_MACHDEP_SRCS= netbsd32_machdep_13.c
+
+.include "../Makefile.compat"
.include <bsd.kmodule.mk>
Index: src/sys/modules/compat_netbsd32_16/Makefile
diff -u src/sys/modules/compat_netbsd32_16/Makefile:1.4 src/sys/modules/compat_netbsd32_16/Makefile:1.5
--- src/sys/modules/compat_netbsd32_16/Makefile:1.4 Thu Sep 26 02:01:03 2019
+++ src/sys/modules/compat_netbsd32_16/Makefile Sun Jun 16 21:52:02 2024
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2019/09/26 02:01:03 christos Exp $
+# $NetBSD: Makefile,v 1.5 2024/06/16 21:52:02 pgoyette Exp $
+
+.include <bsd.init.mk>
-.include "../Makefile.inc"
.include "../Makefile.assym"
.PATH: ${S}/compat/netbsd32
@@ -14,15 +15,11 @@ CPPFLAGS+= -I${NETBSDSRCDIR}/sys/externa
SRCS+= netbsd32_compat_16.c
-.if ${MACHINE_ARCH} == "x86_64"
-.PATH: ${S}/arch/amd64/amd64
-SRCS+= netbsd32_sigcode.S
-SRCS+= netbsd32_machdep_16.c
+COMPAT_MACHDEP_SRCS= netbsd32_machdep_16.c
+.if ${MACHINE_CPU} == "powerpc" || ${MACHINE_CPU} == "x86_64"
+COMPAT_MACHDEP_SRCS+= netbsd32_sigcode.S
.endif
-.if ${MACHINE_ARCH} == "arm"
-.PATH: ${S}/arch/arm/arm32
-SRCS+= netbsd32_machdep_16.c
-.endif
+.include "../Makefile.compat"
.include <bsd.kmodule.mk>
Added files:
Index: src/sys/modules/Makefile.compat
diff -u /dev/null src/sys/modules/Makefile.compat:1.1
--- /dev/null Sun Jun 16 21:52:02 2024
+++ src/sys/modules/Makefile.compat Sun Jun 16 21:52:01 2024
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile.compat,v 1.1 2024/06/16 21:52:01 pgoyette Exp $
+
+COMPAT_ARCH= ${MACHINE_CPU:C/x86_64/amd64/}
+
+.if empty(KMOD:Mnetbsd32)
+COMPAT_SUBDIR= ${COMPAT_ARCH}
+.else
+COMPAT_SUBDIR= ${COMPAT_ARCH:C/arm/arm32/}
+.endif
+
+COMPAT_PATH= ${S}/arch/${COMPAT_ARCH}/${COMPAT_SUBDIR}
+
+.for _s in ${COMPAT_MACHDEP_SRCS}
+.if exists(${COMPAT_PATH}/${_s})
+.PATH: ${COMPAT_PATH}
+SRCS+= ${_s}
+.endif
+.endfor
