Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/pgoyette-compat]: src/sys Add a compat_netbsd32_16 to handle the sigcode...



details:   https://anonhg.NetBSD.org/src/rev/a1331612884d
branches:  pgoyette-compat
changeset: 830674:a1331612884d
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Wed Sep 12 01:26:39 2018 +0000

description:
Add a compat_netbsd32_16 to handle the sigcode stuff.

diffstat:

 sys/compat/netbsd32/files.netbsd32      |   4 +++-
 sys/compat/netbsd32/netbsd32_netbsd.c   |  15 ++-------------
 sys/modules/Makefile                    |  18 +++++++++---------
 sys/modules/compat_netbsd32_16/Makefile |  15 +++++++++++++++
 4 files changed, 29 insertions(+), 23 deletions(-)

diffs (124 lines):

diff -r 52ea6bd08dc2 -r a1331612884d sys/compat/netbsd32/files.netbsd32
--- a/sys/compat/netbsd32/files.netbsd32        Wed Sep 12 01:05:20 2018 +0000
+++ b/sys/compat/netbsd32/files.netbsd32        Wed Sep 12 01:26:39 2018 +0000
@@ -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_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
diff -r 52ea6bd08dc2 -r a1331612884d sys/compat/netbsd32/netbsd32_netbsd.c
--- a/sys/compat/netbsd32/netbsd32_netbsd.c     Wed Sep 12 01:05:20 2018 +0000
+++ b/sys/compat/netbsd32/netbsd32_netbsd.c     Wed Sep 12 01:26:39 2018 +0000
@@ -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 @@
 
 #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 @@
 #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,
diff -r 52ea6bd08dc2 -r a1331612884d sys/modules/Makefile
--- a/sys/modules/Makefile      Wed Sep 12 01:05:20 2018 +0000
+++ b/sys/modules/Makefile      Wed Sep 12 01:26:39 2018 +0000
@@ -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 @@
     || (!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_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
diff -r 52ea6bd08dc2 -r a1331612884d sys/modules/compat_netbsd32_16/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/modules/compat_netbsd32_16/Makefile   Wed Sep 12 01:26:39 2018 +0000
@@ -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>



Home | Main Index | Thread Index | Old Index