d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

There is no 'freebsd3_' prefix for COMPAT_43 syscalls. Those are all

Browse Source 
bundled under MCOMPAT and have an 'o' prefix.  Adjust as appropriate.
This re-enables compiling without COMPAT_43 again.
This commit is contained in:
Peter Wemm 2005-10-26 22:19:51 +00:00
parent 8f155a8f2e
commit 767dfc44be
2 changed files with 28 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
sys/compat/freebsd32/freebsd32_misc.c
View File

@ -1397,7 +1397,7 @@ freebsd4_freebsd32_sigaction(struct thread *td,
#endif
#ifdef COMPAT_43
struct freebsd3_sigaction32 {
struct osigaction32 {
u_int32_t sa_u;
osigset_t sa_mask;
int sa_flags;
@ -1406,10 +1406,10 @@ struct freebsd3_sigaction32 {
#define ONSIG 32
int
freebsd3_freebsd32_sigaction(struct thread *td,
struct freebsd3_freebsd32_sigaction_args *uap)
ofreebsd32_sigaction(struct thread *td,
struct ofreebsd32_sigaction_args *uap)
{
struct freebsd3_sigaction32 s32;
struct osigaction32 s32;
struct sigaction sa, osa, *sap;
int error;
@ -1437,8 +1437,8 @@ freebsd3_freebsd32_sigaction(struct thread *td,
}
int
freebsd3_freebsd32_sigprocmask(struct thread *td,
struct freebsd3_freebsd32_sigprocmask_args *uap)
ofreebsd32_sigprocmask(struct thread *td,
struct ofreebsd32_sigprocmask_args *uap)
{
sigset_t set, oset;
int error;
@ -1450,8 +1450,8 @@ freebsd3_freebsd32_sigprocmask(struct thread *td,
}
int
freebsd3_freebsd32_sigpending(struct thread *td,
struct freebsd3_freebsd32_sigpending_args *uap)
ofreebsd32_sigpending(struct thread *td,
struct ofreebsd32_sigpending_args *uap)
{
struct proc *p = td->td_proc;
sigset_t siglist;
@ -1471,8 +1471,8 @@ struct sigvec32 {
};
int
freebsd3_freebsd32_sigvec(struct thread *td,
struct freebsd3_freebsd32_sigvec_args *uap)
ofreebsd32_sigvec(struct thread *td,
struct ofreebsd32_sigvec_args *uap)
{
struct sigvec32 vec;
struct sigaction sa, osa, *sap;
@ -1505,8 +1505,8 @@ freebsd3_freebsd32_sigvec(struct thread *td,
}
int
freebsd3_freebsd32_sigblock(struct thread *td,
struct freebsd3_freebsd32_sigblock_args *uap)
ofreebsd32_sigblock(struct thread *td,
struct ofreebsd32_sigblock_args *uap)
{
struct proc *p = td->td_proc;
sigset_t set;
@ -1521,8 +1521,8 @@ freebsd3_freebsd32_sigblock(struct thread *td,
}
int
freebsd3_freebsd32_sigsetmask(struct thread *td,
struct freebsd3_freebsd32_sigsetmask_args *uap)
ofreebsd32_sigsetmask(struct thread *td,
struct ofreebsd32_sigsetmask_args *uap)
{
struct proc *p = td->td_proc;
sigset_t set;
@ -1538,8 +1538,8 @@ freebsd3_freebsd32_sigsetmask(struct thread *td,
}
int
freebsd3_freebsd32_sigsuspend(struct thread *td,
struct freebsd3_freebsd32_sigsuspend_args *uap)
ofreebsd32_sigsuspend(struct thread *td,
struct ofreebsd32_sigsuspend_args *uap)
{
struct proc *p = td->td_proc;
sigset_t mask;
@ -1564,8 +1564,8 @@ struct sigstack32 {
};
int
freebsd3_freebsd32_sigstack(struct thread *td,
struct freebsd3_freebsd32_sigstack_args *uap)
ofreebsd32_sigstack(struct thread *td,
struct ofreebsd32_sigstack_args *uap)
{
struct sigstack32 s32;
struct sigstack nss, oss;

23
sys/compat/freebsd32/syscalls.master
View File

@ -116,18 +116,17 @@
size_t offset, u_int scale); }
45 AUE_NULL MNOPROTO { int ktrace(const char *fname, int ops, \
int facs, int pid); }
46 AUE_NULL MSTD { int freebsd3_freebsd32_sigaction( \
int signum, \
struct freebsd3_sigaction32 *nsa, \
struct freebsd3_sigaction32 *osa); }
46 AUE_NULL MCOMPAT { int freebsd32_sigaction( int signum, \
struct osigaction32 *nsa, \
struct osigaction32 *osa); }
47 AUE_NULL MNOPROTO { gid_t getgid(void); }
48 AUE_NULL MSTD { int freebsd3_freebsd32_sigprocmask(int how, \
48 AUE_NULL MCOMPAT { int freebsd32_sigprocmask(int how, \
osigset_t mask); }
49 AUE_NULL MNOPROTO { int getlogin(char *namebuf, \
u_int namelen); }
50 AUE_NULL MNOPROTO { int setlogin(char *namebuf); }
51 AUE_NULL MNOPROTO { int acct(char *path); }
52 AUE_NULL MSTD { int freebsd3_freebsd32_sigpending(void); }
52 AUE_NULL MCOMPAT { int freebsd32_sigpending(void); }
53 AUE_NULL MSTD { int freebsd32_sigaltstack( \
struct sigaltstack32 *ss, \
struct sigaltstack32 *oss); }
@ -209,15 +208,13 @@
int name, caddr_t val, int valsize); }
106 AUE_NULL MNOPROTO { int listen(int s, int backlog); }
107 AUE_NULL OBSOL vtimes
108 AUE_NULL MSTD { int freebsd3_freebsd32_sigvec(int signum, \
108 AUE_NULL MCOMPAT { int freebsd32_sigvec(int signum, \
struct sigvec32 *nsv, \
struct sigvec32 *osv); }
109 AUE_NULL MSTD { int freebsd3_freebsd32_sigblock(int mask); }
110 AUE_NULL MSTD { int freebsd3_freebsd32_sigsetmask( \
int mask); }
111 AUE_NULL MSTD { int freebsd3_freebsd32_sigsuspend( \
int mask); }
112 AUE_NULL MSTD { int freebsd3_freebsd32_sigstack( \
109 AUE_NULL MCOMPAT { int freebsd32_sigblock(int mask); }
110 AUE_NULL MCOMPAT { int freebsd32_sigsetmask( int mask); }
111 AUE_NULL MCOMPAT { int freebsd32_sigsuspend( int mask); }
112 AUE_NULL MCOMPAT { int freebsd32_sigstack( \
struct sigstack32 *nss, \
struct sigstack32 *oss); }
113 AUE_NULL OBSOL orecvmsg