- Make better use of COMPAT_XX type in syscalls.master
- Remove useless (thanks to COMPAT_XX behaviour) #ifdefs in syscalls.master - Make netbsd32_compat_43.c compiled per COMPAT_LINUX32 because the latter needs stuff from it. Fixes Perry's PR#34951.
This commit is contained in:
cube
parent
e8467243ef
commit
1277ee639e
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: files.netbsd32,v 1.23 2006/08/30 13:57:11 cube Exp $
|
||||
# $NetBSD: files.netbsd32,v 1.24 2006/11/09 14:09:37 cube Exp $
|
||||
#
|
||||
# config file description for machine-independent netbsd32 compat code.
|
||||
# included by ports that need it.
|
||||
|
|
@ -33,4 +33,4 @@ 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_20.c compat_netbsd32 & compat_20
|
||||
file compat/netbsd32/netbsd32_compat_30.c compat_netbsd32 & compat_30
|
||||
file compat/netbsd32/netbsd32_compat_43.c compat_netbsd32 & (compat_43 | compat_sunos)
|
||||
file compat/netbsd32/netbsd32_compat_43.c compat_netbsd32 & (compat_43 | compat_sunos | compat_linux32)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: netbsd32_compat_30.c,v 1.13 2006/08/04 16:29:51 yamt Exp $ */
|
||||
/* $NetBSD: netbsd32_compat_30.c,v 1.14 2006/11/09 14:09:37 cube Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1998, 2001 Matthew R. Green
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_30.c,v 1.13 2006/08/04 16:29:51 yamt Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_30.c,v 1.14 2006/11/09 14:09:37 cube Exp $");
|
||||
|
||||
#include "opt_nfsserver.h"
|
||||
|
||||
|
|
@ -61,12 +61,12 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_30.c,v 1.13 2006/08/04 16:29:51 yamt
|
|||
|
||||
|
||||
int
|
||||
netbsd32_getdents(l, v, retval)
|
||||
compat_30_netbsd32_getdents(l, v, retval)
|
||||
struct lwp *l;
|
||||
void *v;
|
||||
register_t *retval;
|
||||
{
|
||||
struct netbsd32_getdents_args /* {
|
||||
struct compat_30_netbsd32_getdents_args /* {
|
||||
syscallarg(int) fd;
|
||||
syscallarg(netbsd32_charp) buf;
|
||||
syscallarg(netbsd32_size_t) count;
|
||||
|
|
@ -100,12 +100,12 @@ netbsd32_getdents(l, v, retval)
|
|||
}
|
||||
|
||||
int
|
||||
netbsd32___stat13(l, v, retval)
|
||||
compat_30_netbsd32___stat13(l, v, retval)
|
||||
struct lwp *l;
|
||||
void *v;
|
||||
register_t *retval;
|
||||
{
|
||||
struct netbsd32___stat13_args /* {
|
||||
struct compat_30_netbsd32___stat13_args /* {
|
||||
syscallarg(const netbsd32_charp) path;
|
||||
syscallarg(netbsd32_stat13p_t) ub;
|
||||
} */ *uap = v;
|
||||
|
|
@ -135,12 +135,12 @@ netbsd32___stat13(l, v, retval)
|
|||
}
|
||||
|
||||
int
|
||||
netbsd32___fstat13(l, v, retval)
|
||||
compat_30_netbsd32___fstat13(l, v, retval)
|
||||
struct lwp *l;
|
||||
void *v;
|
||||
register_t *retval;
|
||||
{
|
||||
struct netbsd32___fstat13_args /* {
|
||||
struct compat_30_netbsd32___fstat13_args /* {
|
||||
syscallarg(int) fd;
|
||||
syscallarg(netbsd32_stat13p_t) sb;
|
||||
} */ *uap = v;
|
||||
|
|
@ -168,12 +168,12 @@ netbsd32___fstat13(l, v, retval)
|
|||
}
|
||||
|
||||
int
|
||||
netbsd32___lstat13(l, v, retval)
|
||||
compat_30_netbsd32___lstat13(l, v, retval)
|
||||
struct lwp *l;
|
||||
void *v;
|
||||
register_t *retval;
|
||||
{
|
||||
struct netbsd32___lstat13_args /* {
|
||||
struct compat_30_netbsd32___lstat13_args /* {
|
||||
syscallarg(const netbsd32_charp) path;
|
||||
syscallarg(netbsd32_stat13p_t) ub;
|
||||
} */ *uap = v;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
$NetBSD: syscalls.master,v 1.53 2006/09/01 20:58:18 matt Exp $
|
||||
$NetBSD: syscalls.master,v 1.54 2006/11/09 14:09:37 cube Exp $
|
||||
|
||||
; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
|
||||
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
|
||||
|
|
@ -181,13 +181,8 @@
|
|||
106 STD { int netbsd32_listen(int s, int backlog); }
|
||||
107 OBSOL vtimes
|
||||
108 COMPAT_43 { int netbsd32_osigvec(int signum, netbsd32_sigvecp_t nsv, netbsd32_sigvecp_t osv); }
|
||||
#if defined(COMPAT_43) || defined(COMPAT_SUNOS)
|
||||
109 COMPAT_43 { int netbsd32_sigblock(int mask); }
|
||||
110 COMPAT_43 { int netbsd32_sigsetmask(int mask); }
|
||||
#else
|
||||
109 OBSOL sigblock
|
||||
110 OBSOL sigsetmask
|
||||
#endif
|
||||
111 COMPAT_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, netbsd32_omsghdrp_t msg, int flags); }
|
||||
|
|
@ -220,18 +215,10 @@
|
|||
140 STD { int netbsd32_adjtime(const netbsd32_timevalp_t delta, netbsd32_timevalp_t olddelta); }
|
||||
141 COMPAT_43 { int netbsd32_ogetpeername(int fdes, netbsd32_caddr_t asa, netbsd32_intp alen); }
|
||||
142 COMPAT_43 { int32_t sys_gethostid(void); } ogethostid
|
||||
#if defined(COMPAT_43) || defined(COMPAT_SUNOS)
|
||||
143 COMPAT_43 { int netbsd32_sethostid(int32_t hostid); }
|
||||
#else
|
||||
143 OBSOL sethostid
|
||||
#endif
|
||||
144 COMPAT_43 { int netbsd32_ogetrlimit(int which, netbsd32_orlimitp_t rlp); }
|
||||
145 COMPAT_43 { int netbsd32_osetrlimit(int which, const netbsd32_orlimitp_t rlp); }
|
||||
#if defined(COMPAT_43) || defined(COMPAT_SUNOS)
|
||||
146 COMPAT_43 { int netbsd32_killpg(int pgid, int signum); }
|
||||
#else
|
||||
146 OBSOL killpg
|
||||
#endif
|
||||
147 NOARGS { int sys_setsid(void); }
|
||||
148 STD { int netbsd32_quotactl(const netbsd32_charp path, int cmd, int uid, netbsd32_caddr_t arg); }
|
||||
149 COMPAT_43 { int sys_quota(void); } oquota
|
||||
|
|
@ -448,15 +435,15 @@
|
|||
269 UNIMPL
|
||||
270 STD { int netbsd32___posix_rename(const netbsd32_charp from, const netbsd32_charp to); }
|
||||
271 STD { int netbsd32_swapctl(int cmd, netbsd32_voidp arg, int misc); }
|
||||
272 STD { int netbsd32_getdents(int fd, netbsd32_charp buf, netbsd32_size_t count); }
|
||||
272 COMPAT_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); }
|
||||
274 STD { int netbsd32_lchmod(const netbsd32_charp path, mode_t mode); }
|
||||
275 STD { int netbsd32_lchown(const netbsd32_charp path, uid_t uid, gid_t gid); }
|
||||
276 STD { int netbsd32_lutimes(const netbsd32_charp path, const netbsd32_timevalp_t tptr); }
|
||||
277 STD { int netbsd32___msync13(netbsd32_voidp addr, netbsd32_size_t len, int flags); }
|
||||
278 STD { int netbsd32___stat13(const netbsd32_charp path, netbsd32_stat13p_t ub); }
|
||||
279 STD { int netbsd32___fstat13(int fd, netbsd32_stat13p_t sb); }
|
||||
280 STD { int netbsd32___lstat13(const netbsd32_charp path, netbsd32_stat13p_t ub); }
|
||||
278 COMPAT_30 { int netbsd32___stat13(const netbsd32_charp path, netbsd32_stat13p_t ub); }
|
||||
279 COMPAT_30 { int netbsd32___fstat13(int fd, netbsd32_stat13p_t sb); }
|
||||
280 COMPAT_30 { int netbsd32___lstat13(const netbsd32_charp path, netbsd32_stat13p_t ub); }
|
||||
281 STD { int netbsd32___sigaltstack14(const netbsd32_sigaltstackp_t nss, netbsd32_sigaltstackp_t oss); }
|
||||
282 NOARGS { int sys___vfork14(void); }
|
||||
283 STD { int netbsd32___posix_chown(const netbsd32_charp path, uid_t uid, gid_t gid); }
|
||||
|
|
|
|||
Loading…
Reference in New Issue