Module Name: src
Committed By: pgoyette
Date: Wed Sep 12 01:26:40 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: files.netbsd32
netbsd32_netbsd.c
src/sys/modules [pgoyette-compat]: Makefile
Added Files:
src/sys/modules/compat_netbsd32_16 [pgoyette-compat]: Makefile
Log Message:
Add a compat_netbsd32_16 to handle the sigcode stuff.
To generate a diff of this commit:
cvs rdiff -u -r1.39.14.2 -r1.39.14.3 src/sys/compat/netbsd32/files.netbsd32
cvs rdiff -u -r1.214.2.4 -r1.214.2.5 \
src/sys/compat/netbsd32/netbsd32_netbsd.c
cvs rdiff -u -r1.202.2.30 -r1.202.2.31 src/sys/modules/Makefile
cvs rdiff -u -r0 -r1.1.2.1 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/compat/netbsd32/files.netbsd32
diff -u src/sys/compat/netbsd32/files.netbsd32:1.39.14.2 src/sys/compat/netbsd32/files.netbsd32:1.39.14.3
--- src/sys/compat/netbsd32/files.netbsd32:1.39.14.2 Tue Sep 11 05:00:42 2018
+++ src/sys/compat/netbsd32/files.netbsd32 Wed Sep 12 01:26:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.netbsd32,v 1.39.14.2 2018/09/11 05:00:42 pgoyette Exp $
+# $NetBSD: files.netbsd32,v 1.39.14.3 2018/09/12 01:26:40 pgoyette Exp $
#
# config file description for machine-independent netbsd32 compat code.
# included by ports that need it.
@@ -37,8 +37,10 @@ file compat/netbsd32/netbsd32_compat_10.
file compat/netbsd32/netbsd32_compat_12.c compat_netbsd32 & (compat_12 | compat_sunos)
file compat/netbsd32/netbsd32_compat_13.c compat_netbsd32 & compat_13
file compat/netbsd32/netbsd32_compat_14.c compat_netbsd32 & compat_14
+file compat/netbsd32/netbsd32_compat_16.c compat_netbsd32 & compat_16
file compat/netbsd32/netbsd32_compat_20.c compat_netbsd32 & compat_20
file compat/netbsd32/netbsd32_compat_30.c compat_netbsd32 & compat_30
+file compat/netbsd32/netbsd32_compat_40.c compat_netbsd32 & compat_40
file compat/netbsd32/netbsd32_compat_43.c compat_netbsd32 & (compat_43 | compat_sunos | compat_linux32)
file compat/netbsd32/netbsd32_compat_50.c compat_netbsd32 & compat_50
file compat/netbsd32/netbsd32_rndpseudo_50.c compat_netbsd32 & compat_50
Index: src/sys/compat/netbsd32/netbsd32_netbsd.c
diff -u src/sys/compat/netbsd32/netbsd32_netbsd.c:1.214.2.4 src/sys/compat/netbsd32/netbsd32_netbsd.c:1.214.2.5
--- src/sys/compat/netbsd32/netbsd32_netbsd.c:1.214.2.4 Wed Sep 12 01:05:21 2018
+++ src/sys/compat/netbsd32/netbsd32_netbsd.c Wed Sep 12 01:26:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_netbsd.c,v 1.214.2.4 2018/09/12 01:05:21 pgoyette Exp $ */
+/* $NetBSD: netbsd32_netbsd.c,v 1.214.2.5 2018/09/12 01:26:40 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001, 2008 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.214.2.4 2018/09/12 01:05:21 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.214.2.5 2018/09/12 01:26:40 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ddb.h"
@@ -102,11 +102,6 @@ void syscall(void);
#define LIMITCHECK(a, b) ((a) != RLIM_INFINITY && (a) > (b))
-#ifdef COMPAT_16
-extern char netbsd32_sigcode[], netbsd32_esigcode[];
-struct uvm_object *emul_netbsd32_object;
-#endif
-
extern struct sysctlnode netbsd32_sysctl_root;
#ifdef MODULAR
@@ -134,15 +129,9 @@ struct emul emul_netbsd32 = {
#endif
.e_sendsig = netbsd32_sendsig,
.e_trapsignal = trapsignal,
-#ifdef COMPAT_16
- .e_sigcode = netbsd32_sigcode,
- .e_esigcode = netbsd32_esigcode,
- .e_sigobject = &emul_netbsd32_object,
-#else
.e_sigcode = NULL,
.e_esigcode = NULL,
.e_sigobject = NULL,
-#endif
.e_setregs = netbsd32_setregs,
.e_proc_exec = NULL,
.e_proc_fork = NULL,
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.202.2.30 src/sys/modules/Makefile:1.202.2.31
--- src/sys/modules/Makefile:1.202.2.30 Wed Sep 12 01:05:20 2018
+++ src/sys/modules/Makefile Wed Sep 12 01:26:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.202.2.30 2018/09/12 01:05:20 pgoyette Exp $
+# $NetBSD: Makefile,v 1.202.2.31 2018/09/12 01:26:39 pgoyette Exp $
.include <bsd.own.mk>
@@ -268,10 +268,10 @@ SUBDIR+= wmimsi
|| (!empty(MACHINE_ARCH:Mmips64*) && !defined(BSD_MK_COMPAT_FILE))
SUBDIR+= compat_netbsd32
SUBDIR+= compat_netbsd32_09 compat_netbsd32_12
-SUBDIR+= compat_netbsd32_13 compat_netbsd32_20
-SUBDIR+= compat_netbsd32_30 compat_netbsd32_40
-SUBDIR+= compat_netbsd32_50 compat_netbsd32_60
-SUBDIR+= compat_netbsd32_80
+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
@@ -283,10 +283,10 @@ SUBDIR+= compat_netbsd32_sysvipc
SUBDIR+= compat_linux32
SUBDIR+= compat_netbsd32
SUBDIR+= compat_netbsd32_09 compat_netbsd32_12
-SUBDIR+= compat_netbsd32_13 compat_netbsd32_20
-SUBDIR+= compat_netbsd32_30 compat_netbsd32_40
-SUBDIR+= compat_netbsd32_50 compat_netbsd32_60
-SUBDIR+= compat_netbsd32_80
+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
Added files:
Index: src/sys/modules/compat_netbsd32_16/Makefile
diff -u /dev/null src/sys/modules/compat_netbsd32_16/Makefile:1.1.2.1
--- /dev/null Wed Sep 12 01:26:40 2018
+++ src/sys/modules/compat_netbsd32_16/Makefile Wed Sep 12 01:26:40 2018
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.1.2.1 2018/09/12 01:26:40 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/compat/netbsd32
+
+KMOD= compat_netbsd32_16
+
+CPPFLAGS+= -DCOMPAT_NETBSD32
+CPPFLAGS+= -DCOMPAT_16 -DCOMPAT_20 -DCOMPAT_30
+CPPFLAGS+= -DCOMPAT_40 -DCOMPAT_50 -DCOMPAT_60 -DCOMPAT_70 -DCOMPAT_80
+
+SRCS+= netbsd32_compat_16.c
+
+.include <bsd.kmodule.mk>
