Module Name: src
Committed By: pgoyette
Date: Mon Sep 10 10:49:10 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_compat_12.c
netbsd32_compat_13.c netbsd32_compat_20.c netbsd32_compat_30.c
syscalls.master
src/sys/modules [pgoyette-compat]: Makefile
src/sys/modules/compat_netbsd32 [pgoyette-compat]: Makefile
Added Files:
src/sys/modules/compat_netbsd32_13 [pgoyette-compat]: Makefile
src/sys/modules/compat_netbsd32_20 [pgoyette-compat]: Makefile
src/sys/modules/compat_netbsd32_30 [pgoyette-compat]: Makefile
Log Message:
More compat_netbsd32_xx modules
To generate a diff of this commit:
cvs rdiff -u -r1.33.36.1 -r1.33.36.2 \
src/sys/compat/netbsd32/netbsd32_compat_12.c
cvs rdiff -u -r1.26 -r1.26.28.1 src/sys/compat/netbsd32/netbsd32_compat_13.c
cvs rdiff -u -r1.36.10.1 -r1.36.10.2 \
src/sys/compat/netbsd32/netbsd32_compat_20.c
cvs rdiff -u -r1.31.16.1 -r1.31.16.2 \
src/sys/compat/netbsd32/netbsd32_compat_30.c
cvs rdiff -u -r1.120.2.4 -r1.120.2.5 src/sys/compat/netbsd32/syscalls.master
cvs rdiff -u -r1.202.2.26 -r1.202.2.27 src/sys/modules/Makefile
cvs rdiff -u -r1.20.12.1 -r1.20.12.2 src/sys/modules/compat_netbsd32/Makefile
cvs rdiff -u -r0 -r1.1.2.1 src/sys/modules/compat_netbsd32_13/Makefile
cvs rdiff -u -r0 -r1.1.2.1 src/sys/modules/compat_netbsd32_20/Makefile
cvs rdiff -u -r0 -r1.1.2.1 src/sys/modules/compat_netbsd32_30/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/netbsd32_compat_12.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_12.c:1.33.36.1 src/sys/compat/netbsd32/netbsd32_compat_12.c:1.33.36.2
--- src/sys/compat/netbsd32/netbsd32_compat_12.c:1.33.36.1 Mon Sep 10 09:54:47 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_12.c Mon Sep 10 10:49:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_12.c,v 1.33.36.1 2018/09/10 09:54:47 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_12.c,v 1.33.36.2 2018/09/10 10:49:09 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_12.c,v 1.33.36.1 2018/09/10 09:54:47 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_12.c,v 1.33.36.2 2018/09/10 10:49:09 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -210,22 +210,22 @@ compat_12_netbsd32_getdirentries(struct
return (compat_12_sys_getdirentries(l, &ua, retval));
}
-static struct syscall_package compat_netbsd32_09_syscalls[] = {
- { NETBSD32_SYS_reboot, 0,
- (sy_call_t *)compat_12_netbsd32_reboot },
- { NETBSD32_SYS_msync, 0,
- (sy_call_t *)compat_12_netbsd32_msync },
- { NETBSD32_SYS_swapon, 0,
- (sy_call_t *)compat_12_netbsd32_swapon },
- { NETBSD32_SYS_stat12, 0,
- (sy_call_t *)compat_12_netbsd32_stat12 },
- { NETBSD32_SYS_fstat12, 0,
- (sy_call_t *)compat_12_netbsd32_fstat12 },
- { NETBSD32_SYS_lstat12, 0,
- (sy_call_t *)compat_12_netbsd32_lstat12 },
- { NETBSD32_SYS_getdirentries, 0,
- (sy_call_t *)compat_12_netbsd32_getdirentries },
- { 0, 0, NULL }
+static struct syscall_package compat_netbsd32_12_syscalls[] = {
+ { NETBSD32_SYS_reboot, 0,
+ (sy_call_t *)compat_12_netbsd32_reboot },
+ { NETBSD32_SYS_msync, 0,
+ (sy_call_t *)compat_12_netbsd32_msync },
+ { NETBSD32_SYS_swapon, 0,
+ (sy_call_t *)compat_12_netbsd32_swapon },
+ { NETBSD32_SYS_stat12, 0,
+ (sy_call_t *)compat_12_netbsd32_stat12 },
+ { NETBSD32_SYS_fstat12, 0,
+ (sy_call_t *)compat_12_netbsd32_fstat12 },
+ { NETBSD32_SYS_lstat12, 0,
+ (sy_call_t *)compat_12_netbsd32_lstat12 },
+ { NETBSD32_SYS_getdirentries, 0,
+ (sy_call_t *)compat_12_netbsd32_getdirentries },
+ { 0, 0, NULL }
};
MODULE(MODULE_CLASS_EXEC, compat_netbsd32_12, "compat_netbsd32,compat_12");
@@ -236,8 +236,10 @@ compat_netbsd32_12_modcmd(modcmd_t cmd,
switch (cmd) {
case MODULE_CMD_INIT:
+ return syscall_establish(NULL, compat_netbsd32_12_syscalls);
case MODULE_CMD_FINI:
+ return syscall_disestablish(NULL, compat_netbsd32_12_syscalls);
default:
return ENOTTY;
Index: src/sys/compat/netbsd32/netbsd32_compat_13.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_13.c:1.26 src/sys/compat/netbsd32/netbsd32_compat_13.c:1.26.28.1
--- src/sys/compat/netbsd32/netbsd32_compat_13.c:1.26 Fri Jan 24 22:44:00 2014
+++ src/sys/compat/netbsd32/netbsd32_compat_13.c Mon Sep 10 10:49:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_13.c,v 1.26 2014/01/24 22:44:00 christos Exp $ */
+/* $NetBSD: netbsd32_compat_13.c,v 1.26.28.1 2018/09/10 10:49:09 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,10 +27,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_13.c,v 1.26 2014/01/24 22:44:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_13.c,v 1.26.28.1 2018/09/10 10:49:09 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
+#include <sys/module.h>
#include <sys/mount.h>
#include <sys/proc.h>
#include <sys/signal.h>
@@ -38,6 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_com
#include <sys/syscallargs.h>
#include <compat/netbsd32/netbsd32.h>
+#include <compat/netbsd32/netbsd32_syscallvar.h>
#include <compat/netbsd32/netbsd32_syscallargs.h>
#include <compat/sys/stat.h>
@@ -90,3 +92,31 @@ compat_13_netbsd32_sigsuspend(struct lwp
native_sigset13_to_sigset(&ess, &bss);
return (sigsuspend1(l, &bss));
}
+
+static struct syscall_package compat_netbsd32_13_syscalls[] = {
+ { NETBSD32_SYS_sigaltstack13, 0,
+ (sy_call_t *)compat_13_netbsd32_sigaltstack13 },
+ { NETBSD32_SYS_sigprocmask, 0,
+ (sy_call_t *)compat_13_netbsd32_sigprocmask },
+ { NETBSD32_SYS_sigsuspend, 0,
+ (sy_call_t *)compat_13_netbsd32_sigsuspend },
+ { 0, 0, NULL }
+};
+
+MODULE(MODULE_CLASS_EXEC, compat_netbsd32_13, "compat_netbsd32,compat_13");
+
+static int
+compat_netbsd32_13_modcmd(modcmd_t cmd, void *arg)
+{
+
+ switch (cmd) {
+ case MODULE_CMD_INIT:
+ return syscall_establish(NULL, compat_netbsd32_13_syscalls);
+
+ case MODULE_CMD_FINI:
+ return syscall_disestablish(NULL, compat_netbsd32_13_syscalls);
+
+ default:
+ return ENOTTY;
+ }
+}
Index: src/sys/compat/netbsd32/netbsd32_compat_20.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_20.c:1.36.10.1 src/sys/compat/netbsd32/netbsd32_compat_20.c:1.36.10.2
--- src/sys/compat/netbsd32/netbsd32_compat_20.c:1.36.10.1 Mon May 21 04:36:03 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_20.c Mon Sep 10 10:49:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_20.c,v 1.36.10.1 2018/05/21 04:36:03 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_20.c,v 1.36.10.2 2018/09/10 10:49:09 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,10 +27,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_20.c,v 1.36.10.1 2018/05/21 04:36:03 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_20.c,v 1.36.10.2 2018/09/10 10:49:09 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
+#include <sys/module.h>
#include <sys/mount.h>
#include <sys/stat.h>
#include <sys/time.h>
@@ -45,6 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_com
#include <sys/dirent.h>
#include <compat/netbsd32/netbsd32.h>
+#include <compat/netbsd32/netbsd32_syscallvar.h>
#include <compat/netbsd32/netbsd32_syscallargs.h>
#include <compat/netbsd32/netbsd32_conv.h>
@@ -216,3 +218,27 @@ compat_20_netbsd32_fhstatfs(struct lwp *
#endif
return (compat_30_sys_fhstatvfs1(l, &ua, retval));
}
+
+static struct syscall_package compat_netbsd32_20_syscalls[] = {
+ { NETBSD32_SYS_getfsstat, 0,
+ (sy_call_t *)compat_20_netbsd32_getfsstat },
+ { 0, 0, NULL }
+};
+
+MODULE(MODULE_CLASS_EXEC, compat_netbsd32_20, "compat_netbsd32,compat_20");
+
+static int
+compat_netbsd32_20_modcmt(modcmd_t cmd, void *arg)
+{
+
+ switch (cmd) {
+ case MODULE_CMD_INIT:
+ return syscall_establish(NULL, compat_netbsd32_20_syscalls);
+
+ case MODULE_CMD_FINI:
+ return syscall_disestablish(NULL, compat_netbsd32_20_syscalls);
+
+ default:
+ return ENOTTY;
+ }
+}
Index: src/sys/compat/netbsd32/netbsd32_compat_30.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_30.c:1.31.16.1 src/sys/compat/netbsd32/netbsd32_compat_30.c:1.31.16.2
--- src/sys/compat/netbsd32/netbsd32_compat_30.c:1.31.16.1 Thu Sep 6 06:55:46 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_30.c Mon Sep 10 10:49:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_30.c,v 1.31.16.1 2018/09/06 06:55:46 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_30.c,v 1.31.16.2 2018/09/10 10:49:09 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,11 +27,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_30.c,v 1.31.16.1 2018/09/06 06:55:46 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_30.c,v 1.31.16.2 2018/09/10 10:49:09 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mount.h>
+#include <sys/mount.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
#include <sys/stat.h>
@@ -50,6 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_com
#include <sys/vfs_syscalls.h>
#include <compat/netbsd32/netbsd32.h>
+#include <compat/netbsd32/netbsd32_syscallvar.h>
#include <compat/netbsd32/netbsd32_syscallargs.h>
#include <compat/netbsd32/netbsd32_conv.h>
#include <compat/sys/mount.h>
@@ -293,3 +295,45 @@ compat_30_netbsd32_fhopen(struct lwp *l,
NETBSD32TO64_UAP(flags);
return (compat_30_sys_fhopen(l, &ua, retval));
}
+
+static struct syscall_package compat_netbsd32_30_syscalls[] = {
+ { NETBSD32_SYS_getdents, 0,
+ (sy_call_t *)compat_30_netbsd32_getdents },
+ { NETBSD32_SYS_stat13, 0,
+ (sy_call_t *)compat_30_netbsd32___stat13 },
+ { NETBSD32_SYS_fstat13, 0,
+ (sy_call_t *)compat_30_netbsd32___fstat13 },
+ { NETBSD32_SYS_lstat13, 0,
+ (sy_call_t *)compat_30_netbsd32___lstat13 },
+ { NETBSD32_SYS_fhstat, 0,
+ (sy_call_t *)compat_30_netbsd32_fhstat },
+ { NETBSD32_SYS_fhstatvfs1, 0,
+ (sy_call_t *)compat_30_netbsd32_fhstatvfs1 },
+ { NETBSD32_SYS_socket, 0,
+ (sy_call_t *)compat_30_netbsd32_socket },
+ { NETBSD32_SYS_getfh, 0,
+ (sy_call_t *)compat_30_netbsd32_getfh },
+ { NETBSD32_SYS_fhstat30, 0,
+ (sy_call_t *)compat_30_netbsd32___fhstat30 },
+ { NETBSD32_SYS_fhopen, 0,
+ (sy_call_t *)compat_30_netbsd32___fhopen },
+ { 0, 0, NULL }
+};
+
+MODULE(MODULE_CLASS_EXEC, compat_netbsd32_30, "compat_netbsd32,compat_30");
+
+static int
+compat_netbsd32_30_modcmd(modcmd_t cmd, void *arg)
+{
+
+ switch (cmd) {
+ case MODULE_CMD_INIT:
+ return syscall_establish(NULL, compat_netbsd32_30_syscalls);
+
+ case MODULE_CMD_FINI:
+ return syscall_disestablish(NULL, compat_netbsd32_30_syscalls);
+
+ default:
+ return ENOTTY;
+ }
+}
Index: src/sys/compat/netbsd32/syscalls.master
diff -u src/sys/compat/netbsd32/syscalls.master:1.120.2.4 src/sys/compat/netbsd32/syscalls.master:1.120.2.5
--- src/sys/compat/netbsd32/syscalls.master:1.120.2.4 Mon Sep 10 09:54:47 2018
+++ src/sys/compat/netbsd32/syscalls.master Mon Sep 10 10:49:09 2018
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.120.2.4 2018/09/10 09:54:47 pgoyette Exp $
+ $NetBSD: syscalls.master,v 1.120.2.5 2018/09/10 10:49:09 pgoyette Exp $
; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -86,7 +86,8 @@
16 STD { int|netbsd32||chown(netbsd32_charp path, uid_t uid, \
gid_t gid); }
17 STD { int|netbsd32||break(netbsd32_charp nsize); }
-18 COMPAT_20 { int|netbsd32||getfsstat(netbsd32_statfsp_t buf, \
+18 COMPAT_20 MODULAR compat_netbsd32_20 \
+ { int|netbsd32||getfsstat(netbsd32_statfsp_t buf, \
netbsd32_long bufsize, int flags); }
19 COMPAT_43 { netbsd32_long|netbsd32||olseek(int fd, \
netbsd32_long offset, int whence); }
@@ -141,19 +142,22 @@
netbsd32_sigactionp_t nsa, \
netbsd32_sigactionp_t osa); }
47 NOARGS { gid_t|sys||getgid(void); }
-48 COMPAT_13 { int|netbsd32||sigprocmask(int how, \
+48 COMPAT_13 MODULAR compat_netbsd32_13 \
+ { int|netbsd32||sigprocmask(int how, \
int mask); } sigprocmask13
49 STD { int|netbsd32||__getlogin(netbsd32_charp namebuf, \
u_int namelen); }
50 STD { int|netbsd32||setlogin(netbsd32_charp namebuf); }
51 STD { int|netbsd32||acct(netbsd32_charp path); }
52 COMPAT_13 { int|sys||sigpending(void); } sigpending13
-53 COMPAT_13 { int|netbsd32||sigaltstack13( \
+53 COMPAT_13 MODULAR compat_netbsd32_13 \
+ { int|netbsd32||sigaltstack13( \
netbsd32_sigaltstack13p_t nss, \
netbsd32_sigaltstack13p_t oss); }
54 STD { int|netbsd32||ioctl(int fd, netbsd32_u_long com, \
... netbsd32_voidp data); }
-55 COMPAT_12 { int|netbsd32||reboot(int opt); }
+55 COMPAT_12 MODULAR compat_netbsd32_12 \
+ { int|netbsd32||reboot(int opt); }
56 STD { int|netbsd32||revoke(netbsd32_charp path); }
57 STD { int|netbsd32||symlink(netbsd32_charp path, \
netbsd32_charp link); }
@@ -168,7 +172,8 @@
netbsd32_charp where, netbsd32_intp size, \
int arg); }
64 COMPAT_43 { int|sys||getpagesize(void); } ogetpagesize
-65 COMPAT_12 { int|netbsd32||msync(netbsd32_voidp addr, \
+65 COMPAT_12 MODULAR compat_netbsd32_12 \
+ { int|netbsd32||msync(netbsd32_voidp addr, \
netbsd32_size_t len); }
; XXX COMPAT_??? for 4.4BSD-compatible vfork(2)?
66 NOARGS { int|sys||vfork(void); }
@@ -200,7 +205,8 @@
netbsd32_itimerval50p_t itv, \
netbsd32_itimerval50p_t oitv); }
84 COMPAT_43 { int|sys||wait(void); } owait
-85 COMPAT_12 { int|netbsd32||oswapon(netbsd32_charp name); }
+85 COMPAT_12 MODULAR compat_netbsd32_12 \
+ { int|netbsd32||oswapon(netbsd32_charp name); }
86 COMPAT_50 { int|netbsd32||getitimer(int which, \
netbsd32_itimerval50p_t itv); }
87 COMPAT_43 { int|netbsd32||ogethostname(netbsd32_charp hostname, \
@@ -219,7 +225,8 @@
95 STD { int|netbsd32||fsync(int fd); }
96 STD { int|netbsd32||setpriority(int which, int who, \
int prio); }
-97 COMPAT_30 { int|netbsd32||socket(int domain, int type, \
+97 COMPAT_30 MODULAR compat_netbsd32_30 \
+ { int|netbsd32||socket(int domain, int type, \
int protocol); }
98 STD { int|netbsd32||connect(int s, \
netbsd32_sockaddrp_t name, int namelen); }
@@ -242,7 +249,8 @@
netbsd32_sigvecp_t nsv, netbsd32_sigvecp_t osv); }
109 COMPAT_43 { int|netbsd32||sigblock(int mask); }
110 COMPAT_43 { int|netbsd32||sigsetmask(int mask); }
-111 COMPAT_13 { int|netbsd32||sigsuspend(int mask); } sigsuspend13
+111 COMPAT_13 MODULAR compat_netbsd32_13 \
+ { int|netbsd32||sigsuspend(int mask); } sigsuspend13
112 COMPAT_43 { int|netbsd32||osigstack(netbsd32_sigstackp_t nss, \
netbsd32_sigstackp_t oss); }
113 COMPAT_43 { int|netbsd32||orecvmsg(int s, \
@@ -328,7 +336,8 @@
netbsd32_statfsp_t buf); }
159 UNIMPL
160 UNIMPL
-161 COMPAT_30 { int|netbsd32||getfh(netbsd32_charp fname, \
+161 COMPAT_30 MODULAR compat_netbsd32_30 \
+ { int|netbsd32||getfh(netbsd32_charp fname, \
netbsd32_compat_30_fhandlep_t fhp); }
162 COMPAT_09 modular compat_netbsd32_09 \
{ int|netbsd32||ogetdomainname( \
@@ -379,10 +388,13 @@
185 EXCL netbsd32_lfs_markv
186 EXCL netbsd32_lfs_segclean
187 EXCL netbsd32_lfs_segwait
-188 COMPAT_12 { int|netbsd32||stat12(netbsd32_charp path, \
+188 COMPAT_12 MODULAR compat_netbsd32_12 \
+ { int|netbsd32||stat12(netbsd32_charp path, \
netbsd32_stat12p_t ub); }
-189 COMPAT_12 { int|netbsd32||fstat12(int fd, netbsd32_stat12p_t sb); }
-190 COMPAT_12 { int|netbsd32||lstat12(netbsd32_charp path, \
+189 COMPAT_12 MODULAR compat_netbsd32_12 \
+ { int|netbsd32||fstat12(int fd, netbsd32_stat12p_t sb); }
+190 COMPAT_12 MODULAR compat_netbsd32_12 \
+ { int|netbsd32||lstat12(netbsd32_charp path, \
netbsd32_stat12p_t ub); }
191 STD { netbsd32_long|netbsd32||pathconf(netbsd32_charp path, \
int name); }
@@ -565,7 +577,8 @@
netbsd32_charp to); }
271 STD { int|netbsd32||swapctl(int cmd, netbsd32_voidp arg, \
int misc); }
-272 COMPAT_30 { int|netbsd32||getdents(int fd, netbsd32_charp buf, \
+272 COMPAT_30 MODULAR compat_netbsd32_30 \
+ { int|netbsd32||getdents(int fd, netbsd32_charp buf, \
netbsd32_size_t count); }
273 STD { int|netbsd32||minherit(netbsd32_voidp addr, \
netbsd32_size_t len, int inherit); }
@@ -577,11 +590,14 @@
netbsd32_timeval50p_t tptr); }
277 STD { int|netbsd32|13|msync(netbsd32_voidp addr, \
netbsd32_size_t len, int flags); }
-278 COMPAT_30 { int|netbsd32|13|stat(netbsd32_charp path, \
+278 COMPAT_30 MODULAR compat_netbsd32_30 \
+ { int|netbsd32|13|stat(netbsd32_charp path, \
netbsd32_stat13p_t ub); }
-279 COMPAT_30 { int|netbsd32|13|fstat(int fd, \
+279 COMPAT_30 MODULAR compat_netbsd32_30 \
+ { int|netbsd32|13|fstat(int fd, \
netbsd32_stat13p_t sb); }
-280 COMPAT_30 { int|netbsd32|13|lstat(netbsd32_charp path, \
+280 COMPAT_30 MODULAR compat_netbsd32_30 \
+ { int|netbsd32|13|lstat(netbsd32_charp path, \
netbsd32_stat13p_t ub); }
281 STD { int|netbsd32|14|sigaltstack(\
netbsd32_sigaltstackp_t nss, \
@@ -617,9 +633,11 @@
296 STD { int|netbsd32||__getcwd(netbsd32_charp bufp, \
netbsd32_size_t length); }
297 STD { int|netbsd32||fchroot(int fd); }
-298 COMPAT_30 { int|netbsd32||fhopen(netbsd32_fhandlep_t fhp, \
+298 COMPAT_30 MODULAR compat_netbsd32_30 \
+ { int|netbsd32||fhopen(netbsd32_fhandlep_t fhp, \
int flags); }
-299 COMPAT_30 { int|netbsd32||fhstat(netbsd32_fhandlep_t fhp, \
+299 COMPAT_30 MODULAR compat_netbsd32_30 \
+ { int|netbsd32||fhstat(netbsd32_fhandlep_t fhp, \
netbsd32_stat13p_t sb); }
300 COMPAT_20 { int|netbsd32||fhstatfs(netbsd32_fhandlep_t fhp, \
netbsd32_stat50p_t buf); }
@@ -721,7 +739,8 @@
netbsd32_statvfsp_t buf, int flags); }
358 STD { int|netbsd32||fstatvfs1(int fd, \
netbsd32_statvfsp_t buf, int flags); }
-359 COMPAT_30 { int|netbsd32||fhstatvfs1(netbsd32_fhandlep_t fhp, \
+359 COMPAT_30 MODULAR compat_netbsd32_30 \
+ { int|netbsd32||fhstatvfs1(netbsd32_fhandlep_t fhp, \
netbsd32_statvfsp_t buf, int flags); }
360 STD { int|netbsd32||extattrctl(netbsd32_charp path, \
int cmd, netbsd32_charp filename, \
@@ -807,7 +826,8 @@
390 STD { int|netbsd32|30|getdents(int fd, \
netbsd32_charp buf, netbsd32_size_t count); }
391 IGNORED old posix fadvise
-392 COMPAT_30 { int|netbsd32|30|fhstat( \
+392 COMPAT_30 MODULAR compat_netbsd32_30 \
+ { int|netbsd32|30|fhstat( \
netbsd32_fhandlep_t fhp, \
netbsd32_stat50p_t sb); }
#if defined(NTP) || !defined(_KERNEL_OPT)
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.202.2.26 src/sys/modules/Makefile:1.202.2.27
--- src/sys/modules/Makefile:1.202.2.26 Mon Sep 10 08:43:50 2018
+++ src/sys/modules/Makefile Mon Sep 10 10:49:10 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.202.2.26 2018/09/10 08:43:50 pgoyette Exp $
+# $NetBSD: Makefile,v 1.202.2.27 2018/09/10 10:49:10 pgoyette Exp $
.include <bsd.own.mk>
@@ -267,9 +267,8 @@ SUBDIR+= wmimsi
.if ${MACHINE_CPU} == "arm" \
|| (!empty(MACHINE_ARCH:Mmips64*) && !defined(BSD_MK_COMPAT_FILE))
SUBDIR+= compat_netbsd32
-SUBDIR+= compat_netbsd32_09 compat_netbsd32_10
-SUBDIR+= compat_netbsd32_12 compat_netbsd32_13
-SUBDIR+= compat_netbsd32_14 compat_netbsd32_20
+SUBDIR+= compat_netbsd32_09 compat_netbsd32_12
+SUBDIR+= compat_netbsd32_13 compat_netbsd32_20
SUBDIR+= compat_netbsd32_30 compat_netbsd32_50
SUBDIR+= compat_netbsd32_60 compat_netbsd32_80
SUBDIR+= compat_netbsd32_43
@@ -282,9 +281,8 @@ SUBDIR+= compat_netbsd32_sysvipc
.if ${MACHINE_ARCH} == "x86_64"
SUBDIR+= compat_linux32
SUBDIR+= compat_netbsd32
-SUBDIR+= compat_netbsd32_09 compat_netbsd32_10
-SUBDIR+= compat_netbsd32_12 compat_netbsd32_13
-SUBDIR+= compat_netbsd32_14 compat_netbsd32_20
+SUBDIR+= compat_netbsd32_09 compat_netbsd32_12
+SUBDIR+= compat_netbsd32_13 compat_netbsd32_20
SUBDIR+= compat_netbsd32_30 compat_netbsd32_50
SUBDIR+= compat_netbsd32_60 compat_netbsd32_80
SUBDIR+= compat_netbsd32_43
Index: src/sys/modules/compat_netbsd32/Makefile
diff -u src/sys/modules/compat_netbsd32/Makefile:1.20.12.1 src/sys/modules/compat_netbsd32/Makefile:1.20.12.2
--- src/sys/modules/compat_netbsd32/Makefile:1.20.12.1 Wed Mar 21 02:01:34 2018
+++ src/sys/modules/compat_netbsd32/Makefile Mon Sep 10 10:49:10 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20.12.1 2018/03/21 02:01:34 pgoyette Exp $
+# $NetBSD: Makefile,v 1.20.12.2 2018/09/10 10:49:10 pgoyette Exp $
.include "../Makefile.inc"
.include "../Makefile.assym"
@@ -24,8 +24,8 @@ CPPFLAGS+= -DCOREDUMP -DNTP -DVMSWAP
CPPFLAGS+= -DNTP -DKTRACE -DMODULAR
.PATH: ${S}/compat/netbsd32
-SRCS+= netbsd32_compat_09.c netbsd32_compat_10.c
-SRCS+= netbsd32_compat_12.c netbsd32_compat_13.c
+SRCS+= netbsd32_compat_10.c # belongs to compat_netbsd32_sysvipc_10
+SRCS+= netbsd32_compat_13.c
SRCS+= netbsd32_compat_14.c netbsd32_compat_20.c
SRCS+= netbsd32_compat_30.c netbsd32_compat_43.c
SRCS+= netbsd32_compat_50.c netbsd32_compat_60.c
Added files:
Index: src/sys/modules/compat_netbsd32_13/Makefile
diff -u /dev/null src/sys/modules/compat_netbsd32_13/Makefile:1.1.2.1
--- /dev/null Mon Sep 10 10:49:10 2018
+++ src/sys/modules/compat_netbsd32_13/Makefile Mon Sep 10 10:49:10 2018
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1.2.1 2018/09/10 10:49:10 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/compat/netbsd32
+
+KMOD= compat_netbsd32_13
+
+CPPFLAGS+= -DCOMPAT_13 -DCOMPAT_14 -DCOMPAT_16 -DCOMPAT_20 -DCOMPAT_30
+CPPFLAGS+= -DCOMPAT_40 -DCOMPAT_50 -DCOMPAT_60 -DCOMPAT_70 -DCOMPAT_80
+
+SRCS+= netbsd32_compat_12.c
+
+.include <bsd.kmodule.mk>
Index: src/sys/modules/compat_netbsd32_20/Makefile
diff -u /dev/null src/sys/modules/compat_netbsd32_20/Makefile:1.1.2.1
--- /dev/null Mon Sep 10 10:49:10 2018
+++ src/sys/modules/compat_netbsd32_20/Makefile Mon Sep 10 10:49:10 2018
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1.2.1 2018/09/10 10:49:10 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/compat/netbsd32
+
+KMOD= compat_netbsd32_20
+
+CPPFLAGS+= -DCOMPAT_20 -DCOMPAT_30
+CPPFLAGS+= -DCOMPAT_40 -DCOMPAT_50 -DCOMPAT_60 -DCOMPAT_70 -DCOMPAT_80
+
+SRCS+= netbsd32_compat_20.c
+
+.include <bsd.kmodule.mk>
Index: src/sys/modules/compat_netbsd32_30/Makefile
diff -u /dev/null src/sys/modules/compat_netbsd32_30/Makefile:1.1.2.1
--- /dev/null Mon Sep 10 10:49:10 2018
+++ src/sys/modules/compat_netbsd32_30/Makefile Mon Sep 10 10:49:10 2018
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1.2.1 2018/09/10 10:49:10 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/compat/netbsd32
+
+KMOD= compat_netbsd32_30
+
+CPPFLAGS+= -DCOMPAT_30
+CPPFLAGS+= -DCOMPAT_40 -DCOMPAT_50 -DCOMPAT_60 -DCOMPAT_70 -DCOMPAT_80
+
+SRCS+= netbsd32_compat_30.c
+
+.include <bsd.kmodule.mk>
