Module Name:    src
Committed By:   pgoyette
Date:           Tue Apr 17 23:58:48 UTC 2018

Modified Files:
        src/sys/kern [pgoyette-compat]: syscalls.master

Log Message:
Update compat module names to reference the version-specific modules.

This way, when we autoload compat code we load only what is needed,
and nothing "older".


To generate a diff of this commit:
cvs rdiff -u -r1.291.2.6 -r1.291.2.7 src/sys/kern/syscalls.master

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/kern/syscalls.master
diff -u src/sys/kern/syscalls.master:1.291.2.6 src/sys/kern/syscalls.master:1.291.2.7
--- src/sys/kern/syscalls.master:1.291.2.6	Tue Mar 27 23:08:44 2018
+++ src/sys/kern/syscalls.master	Tue Apr 17 23:58:48 2018
@@ -1,4 +1,4 @@
-	$NetBSD: syscalls.master,v 1.291.2.6 2018/03/27 23:08:44 pgoyette Exp $
+	$NetBSD: syscalls.master,v 1.291.2.7 2018/04/17 23:58:48 pgoyette Exp $
 
 ;	@(#)syscalls.master	8.2 (Berkeley) 1/13/94
 
@@ -76,28 +76,28 @@
 5	STD 	 RUMP	{ int|sys||open(const char *path, \
 			    int flags, ... mode_t mode); }
 6	STD	 RUMP	{ int|sys||close(int fd); }
-7	COMPAT_50 MODULAR compat { int|sys||wait4(pid_t pid, int *status, \
+7	COMPAT_50 MODULAR compat_50 { int|sys||wait4(pid_t pid, int *status, \
 			    int options, struct rusage50 *rusage); }
-8	COMPAT_43 MODULAR compat	\
+8	COMPAT_43 MODULAR compat_43	\
 		{ int|sys||creat(const char *path, mode_t mode); } ocreat
 9	STD 	 RUMP	{ int|sys||link(const char *path, const char *link); }
 10	STD 	 RUMP	{ int|sys||unlink(const char *path); }
 11	OBSOL		execv
 12	STD 	 RUMP	{ int|sys||chdir(const char *path); }
 13	STD 	 RUMP	{ int|sys||fchdir(int fd); }
-14	COMPAT_50 MODULAR compat RUMP	\
+14	COMPAT_50 MODULAR compat_50 RUMP	\
 		{ int|sys||mknod(const char *path, mode_t mode, uint32_t dev); }
 15	STD 	 RUMP	{ int|sys||chmod(const char *path, mode_t mode); }
 16	STD 	 RUMP	{ int|sys||chown(const char *path, uid_t uid, \
 			    gid_t gid); }
 17	STD 		{ int|sys||obreak(char *nsize); } break
-18	COMPAT_20 MODULAR compat { int|sys||getfsstat(struct statfs12 *buf, \
+18	COMPAT_20 MODULAR compat_20 { int|sys||getfsstat(struct statfs12 *buf, \
 			    long bufsize, int flags); }
-19	COMPAT_43 MODULAR compat	\
+19	COMPAT_43 MODULAR compat_43	\
 		{ long|sys||lseek(int fd, long offset, int whence); }\
 			    olseek
 20	NOERR 	RUMP	{ pid_t|sys||getpid_with_ppid(void); } getpid
-21	COMPAT_40 MODULAR compat	\
+21	COMPAT_40 MODULAR compat_40	\
 		{ int|sys||mount(const char *type, const char *path, \
 			    int flags, void *data); }
 22	STD 	RUMP	{ int|sys||unmount(const char *path, int flags); }
@@ -125,10 +125,10 @@
 35	STD 	RUMP	{ int|sys||fchflags(int fd, u_long flags); }
 36	NOERR 	 RUMP	{ void|sys||sync(void); }
 37	STD 		{ int|sys||kill(pid_t pid, int signum); }
-38	COMPAT_43 MODULAR compat	\
+38	COMPAT_43 MODULAR compat_43	\
 		{ int|sys||stat(const char *path, struct stat43 *ub); } stat43
 39	NOERR 	RUMP	{ pid_t|sys||getppid(void); }
-40	COMPAT_43 MODULAR compat	\
+40	COMPAT_43 MODULAR compat_43	\
 		{ int|sys||lstat(const char *path, \
 			    struct stat43 *ub); } lstat43
 41	STD 	RUMP	{ int|sys||dup(int fd); }
@@ -138,22 +138,22 @@
 			    u_long offset, u_int scale); }
 45	STD 	RUMP	{ int|sys||ktrace(const char *fname, int ops, \
 			    int facs, pid_t pid); }
-46	COMPAT_13 MODULAR compat { int|sys||sigaction(int signum, \
+46	COMPAT_13 MODULAR compat_13 { int|sys||sigaction(int signum, \
 			    const struct sigaction13 *nsa, \
 			    struct sigaction13 *osa); } sigaction13
 47	NOERR 	RUMP	{ gid_t|sys||getgid_with_egid(void); } getgid
-48	COMPAT_13 MODULAR compat { int|sys||sigprocmask(int how, \
+48	COMPAT_13 MODULAR compat_13 { int|sys||sigprocmask(int how, \
 			    int mask); } sigprocmask13
 49	STD 	RUMP	{ int|sys||__getlogin(char *namebuf, size_t namelen); }
 50	STD 	RUMP 	{ int|sys||__setlogin(const char *namebuf); }
 51	STD 		{ int|sys||acct(const char *path); }
-52	COMPAT_13 MODULAR compat { int|sys||sigpending(void); } sigpending13
-53	COMPAT_13 MODULAR compat { int|sys||sigaltstack( \
+52	COMPAT_13 MODULAR compat_13 { int|sys||sigpending(void); } sigpending13
+53	COMPAT_13 MODULAR compat_13 { int|sys||sigaltstack( \
 			    const struct sigaltstack13 *nss, \
 			    struct sigaltstack13 *oss); } sigaltstack13
 54	STD	RUMP	{ int|sys||ioctl(int fd, \
 			    u_long com, ... void *data); }
-55	COMPAT_12 MODULAR compat { int|sys||reboot(int opt); } oreboot
+55	COMPAT_12 MODULAR compat_12 { int|sys||reboot(int opt); } oreboot
 56	STD 	 RUMP	{ int|sys||revoke(const char *path); }
 57	STD 	 RUMP	{ int|sys||symlink(const char *path, \
 			    const char *link); }
@@ -163,21 +163,21 @@
 			    char * const *argp, char * const *envp); }
 60	STD 	 RUMP	{ mode_t|sys||umask(mode_t newmask); }
 61	STD 	 RUMP	{ int|sys||chroot(const char *path); }
-62	COMPAT_43 MODULAR compat	\
+62	COMPAT_43 MODULAR compat_43	\
 		{ int|sys||fstat(int fd, struct stat43 *sb); } fstat43
-63	COMPAT_43 MODULAR compat	\
+63	COMPAT_43 MODULAR compat_43	\
 		{ int|sys||getkerninfo(int op, char *where, int *size, \
 			    int arg); } ogetkerninfo
-64	COMPAT_43 MODULAR compat	\
+64	COMPAT_43 MODULAR compat_43	\
 		{ int|sys||getpagesize(void); } ogetpagesize
-65	COMPAT_12 MODULAR compat { int|sys||msync(void *addr, size_t len); }
+65	COMPAT_12 MODULAR compat_12 { int|sys||msync(void *addr, size_t len); }
 ; XXX COMPAT_??? for 4.4BSD-compatible vfork(2)?
 66	STD 		{ int|sys||vfork(void); }
 67	OBSOL		vread
 68	OBSOL		vwrite
 69	OBSOL 		sbrk
 70	OBSOL 		sstk
-71	COMPAT_43 MODULAR compat	\
+71	COMPAT_43 MODULAR compat_43	\
 		{ int|sys||mmap(void *addr, size_t len, int prot, \
 			    int flags, int fd, long pos); } ommap
 72	STD 		{ int|sys||ovadvise(int anom); } vadvise
@@ -196,43 +196,44 @@
 			    const gid_t *gidset); }
 81	STD 	RUMP	{ int|sys||getpgrp(void); }
 82	STD 	RUMP	{ int|sys||setpgid(pid_t pid, pid_t pgid); }
-83	COMPAT_50 MODULAR compat { int|sys||setitimer(int which, \
+83	COMPAT_50 MODULAR compat_50 { int|sys||setitimer(int which, \
 			    const struct itimerval50 *itv, \
 			    struct itimerval50 *oitv); }
-84	COMPAT_43 MODULAR compat { int|sys||wait(void); } owait
-85	COMPAT_12 MODULAR compat { int|sys||swapon(const char *name); } oswapon
-86	COMPAT_50 MODULAR compat { int|sys||getitimer(int which, \
+84	COMPAT_43 MODULAR compat_43 { int|sys||wait(void); } owait
+85	COMPAT_12 MODULAR compat_12 { int|sys||swapon(const char *name); } \
+			    oswapon
+86	COMPAT_50 MODULAR compat_50 { int|sys||getitimer(int which, \
 			    struct itimerval50 *itv); }
-87	COMPAT_43 MODULAR compat	\
+87	COMPAT_43 MODULAR compat_43	\
 		{ int|sys||gethostname(char *hostname, u_int len); } \
 			    ogethostname
-88	COMPAT_43 MODULAR compat	\
+88	COMPAT_43 MODULAR compat_43	\
 		{ int|sys||sethostname(char *hostname, u_int len); } \
 			    osethostname
-89	COMPAT_43 MODULAR compat	\
+89	COMPAT_43 MODULAR compat_43	\
 		{ int|sys||getdtablesize(void); } ogetdtablesize
 90	STD 	 RUMP	{ int|sys||dup2(int from, int to); }
 91	UNIMPL		getdopt
 92	STD	RUMP	{ int|sys||fcntl(int fd, int cmd, ... void *arg); }
-93	COMPAT_50 MODULAR compat RUMP	\
+93	COMPAT_50 MODULAR compat_50 RUMP	\
 		{ int|sys||select(int nd, fd_set *in, fd_set *ou, \
 			    fd_set *ex, struct timeval50 *tv); }
 94	UNIMPL		setdopt
 95	STD	RUMP 	{ int|sys||fsync(int fd); }
 96	STD 		{ int|sys||setpriority(int which, id_t who, int prio); }
-97	COMPAT_30 MODULAR compat	\
+97	COMPAT_30 MODULAR compat_30	\
 		{ int|sys||socket(int domain, int type, int protocol); }
 98	STD	RUMP	{ int|sys||connect(int s, const struct sockaddr *name, \
 			    socklen_t namelen); }
-99	COMPAT_43 MODULAR compat	\
+99	COMPAT_43 MODULAR compat_43	\
 		{ int|sys||accept(int s, void *name, \
 			    socklen_t *anamelen); } oaccept
 100	STD 		{ int|sys||getpriority(int which, id_t who); }
-101	COMPAT_43 MODULAR compat { int|sys||send(int s, void *buf, int len, \
+101	COMPAT_43 MODULAR compat_43 { int|sys||send(int s, void *buf, int len, \
 			    int flags); } osend
-102	COMPAT_43 MODULAR compat { int|sys||recv(int s, void *buf, int len, \
+102	COMPAT_43 MODULAR compat_43 { int|sys||recv(int s, void *buf, int len, \
 			    int flags); } orecv
-103	COMPAT_13 MODULAR compat	\
+103	COMPAT_13 MODULAR compat_13	\
 		{ int|sys||sigreturn(struct sigcontext13 *sigcntxp); } \
 			    sigreturn13
 104	STD	RUMP	{ int|sys||bind(int s, const struct sockaddr *name, \
@@ -241,23 +242,23 @@
 			    const void *val, socklen_t valsize); }
 106	STD	RUMP	{ int|sys||listen(int s, int backlog); }
 107	OBSOL		vtimes
-108	COMPAT_43 MODULAR compat	\
+108	COMPAT_43 MODULAR compat_43	\
 		{ int|sys||sigvec(int signum, struct sigvec *nsv, \
 			    struct sigvec *osv); } osigvec
 109	COMPAT_43 MODULAR compat { int|sys||sigblock(int mask); } osigblock
 110	COMPAT_43 MODULAR compat { int|sys||sigsetmask(int mask); } osigsetmask
 111	COMPAT_13 MODULAR compat { int|sys||sigsuspend(int mask); } sigsuspend13
-112	COMPAT_43 MODULAR compat { int|sys||sigstack(struct sigstack *nss, \
+112	COMPAT_43 MODULAR compat_43 { int|sys||sigstack(struct sigstack *nss, \
 			    struct sigstack *oss); } osigstack
-113	COMPAT_43 MODULAR compat	\
+113	COMPAT_43 MODULAR compat_43	\
 		{ int|sys||recvmsg(int s, struct omsghdr *msg, \
 			    int flags); } orecvmsg
-114	COMPAT_43 MODULAR compat	\
+114	COMPAT_43 MODULAR compat_43	\
 		{ int|sys||sendmsg(int s, void *msg, int flags); } osendmsg
 115	OBSOL		vtrace
-116	COMPAT_50 MODULAR compat { int|sys||gettimeofday(struct timeval50 *tp, \
-			    void *tzp); }
-117	COMPAT_50 MODULAR compat	\
+116	COMPAT_50 MODULAR compat_50	\
+		{ int|sys||gettimeofday(struct timeval50 *tp, void *tzp); }
+117	COMPAT_50 MODULAR compat_50	\
 		{ int|sys||getrusage(int who, struct rusage50 *rusage); }
 118	STD	RUMP	{ int|sys||getsockopt(int s, int level, int name, \
 			    void *val, socklen_t *avalsize); }
@@ -266,21 +267,21 @@
 			    const struct iovec *iovp, int iovcnt); }
 121	STD 	RUMP	{ ssize_t|sys||writev(int fd, \
 			    const struct iovec *iovp, int iovcnt); }
-122	COMPAT_50 MODULAR compat	\
+122	COMPAT_50 MODULAR compat_50	\
 		{ int|sys||settimeofday(const struct timeval50 *tv, \
 			    const void *tzp); }
 123	STD 	 RUMP	{ int|sys||fchown(int fd, uid_t uid, gid_t gid); }
 124	STD 	 RUMP	{ int|sys||fchmod(int fd, mode_t mode); }
-125	COMPAT_43 MODULAR compat	\
+125	COMPAT_43 MODULAR compat_43	\
 		{ int|sys||recvfrom(int s, void *buf, size_t len, \
 			    int flags, void *from, socklen_t *fromlenaddr); } \
 			    orecvfrom
 126	STD 	RUMP	{ int|sys||setreuid(uid_t ruid, uid_t euid); }
 127	STD 	RUMP	{ int|sys||setregid(gid_t rgid, gid_t egid); }
 128	STD 	 RUMP	{ int|sys||rename(const char *from, const char *to); }
-129	COMPAT_43 MODULAR compat	\
+129	COMPAT_43 MODULAR compat_43	\
 		{ int|sys||truncate(const char *path, long length); } otruncate
-130	COMPAT_43 MODULAR compat	\
+130	COMPAT_43 MODULAR compat_43	\
 		{ int|sys||ftruncate(int fd, long length); } oftruncate
 131	STD 	 RUMP	{ int|sys||flock(int fd, int how); }
 132	STD 	 RUMP	{ int|sys||mkfifo(const char *path, mode_t mode); }
@@ -292,32 +293,32 @@
 			    int protocol, int *rsv); }
 136	STD 	 RUMP	{ int|sys||mkdir(const char *path, mode_t mode); }
 137	STD 	 RUMP	{ int|sys||rmdir(const char *path); }
-138	COMPAT_50 MODULAR compat RUMP { int|sys||utimes(const char *path, \
+138	COMPAT_50 MODULAR compat_50 RUMP { int|sys||utimes(const char *path, \
 			    const struct timeval50 *tptr); }
 139	OBSOL		4.2 sigreturn
-140	COMPAT_50 MODULAR compat	\
+140	COMPAT_50 MODULAR compat_50	\
 		{ int|sys||adjtime(const struct timeval50 *delta, \
 			    struct timeval50 *olddelta); }
-141	COMPAT_43 MODULAR compat	\
+141	COMPAT_43 MODULAR compat_43	\
 		{ int|sys||getpeername(int fdes, void *asa, \
 			    socklen_t *alen); } ogetpeername
-142	COMPAT_43 MODULAR compat	\
+142	COMPAT_43 MODULAR compat_43	\
 		{ int32_t|sys||gethostid(void); } ogethostid
-143	COMPAT_43 MODULAR compat	\
+143	COMPAT_43 MODULAR compat_43	\
 		{ int|sys||sethostid(int32_t hostid); } osethostid
-144	COMPAT_43 MODULAR compat	\
+144	COMPAT_43 MODULAR compat_43	\
 		{ int|sys||getrlimit(int which, \
 			    struct orlimit *rlp); } ogetrlimit
-145	COMPAT_43 MODULAR compat { int|sys||setrlimit(int which, \
+145	COMPAT_43 MODULAR compat_43 { int|sys||setrlimit(int which, \
 			    const struct orlimit *rlp); } osetrlimit
-146	COMPAT_43 MODULAR compat	\
+146	COMPAT_43 MODULAR compat_43	\
 		{ int|sys||killpg(int pgid, int signum); } okillpg
 147	STD 	RUMP 	{ int|sys||setsid(void); }
 148	COMPAT_50 MODULAR XXX { int|sys||quotactl(const char *path, int cmd, \
 			    int uid, void *arg); }
-149	COMPAT_43 MODULAR compat { int|sys||quota(void); } oquota
-150	COMPAT_43 MODULAR compat { int|sys||getsockname(int fdec, void *asa, \
-			    socklen_t *alen); } ogetsockname
+149	COMPAT_43 MODULAR compat_43 { int|sys||quota(void); } oquota
+150	COMPAT_43 MODULAR compat_43 { int|sys||getsockname(int fdec,	\
+			    void *asa, socklen_t *alen); } ogetsockname
 
 ; Syscalls 151-180 inclusive are reserved for vendor-specific
 ; system calls.  (This includes various calls added for compatibity
@@ -328,21 +329,21 @@
 153	UNIMPL
 154	UNIMPL
 155	STD MODULAR nfsserver RUMP  { int|sys||nfssvc(int flag, void *argp); }
-156	COMPAT_43 MODULAR compat	\
+156	COMPAT_43 MODULAR compat_43	\
 		{ int|sys||getdirentries(int fd, char *buf, \
 			    u_int count, long *basep); } ogetdirentries
-157	COMPAT_20 MODULAR compat { int|sys||statfs(const char *path, \
+157	COMPAT_20 MODULAR compat_20 { int|sys||statfs(const char *path, \
 			    struct statfs12 *buf); }
-158	COMPAT_20 MODULAR compat	\
+158	COMPAT_20 MODULAR compat_20	\
 		{ int|sys||fstatfs(int fd, struct statfs12 *buf); }
 159	UNIMPL
 160	UNIMPL
-161	COMPAT_30 MODULAR compat { int|sys||getfh(const char *fname, \
+161	COMPAT_30 MODULAR compat_30 { int|sys||getfh(const char *fname, \
 			    struct compat_30_fhandle *fhp); }
-162	COMPAT_09 MODULAR compat	\
+162	COMPAT_09 MODULAR compat_09	\
 		{ int|sys||getdomainname(char *domainname, int len); } \
 			    ogetdomainname
-163	COMPAT_09 MODULAR compat	\
+163	COMPAT_09 MODULAR compat_09	\
 		{ int|sys||setdomainname(char *domainname, int len); } \
 			    osetdomainname
 164	COMPAT_09 MODULAR compat	\
@@ -353,7 +354,7 @@
 168	UNIMPL
 ; XXX more generally, never on machines where sizeof(void *) != sizeof(int)
 #if !defined(_LP64)
-169	COMPAT_10 MODULAR compat_sysv	\
+169	COMPAT_10 MODULAR compat_sysv_10	\
 		{ int|sys||semsys(int which, int a2, int a3, int a4, \
 			    int a5); } osemsys
 #else
@@ -361,7 +362,7 @@
 #endif
 ; XXX more generally, never on machines where sizeof(void *) != sizeof(int)
 #if !defined(_LP64)
-170	COMPAT_10 MODULAR compat_sysv	\
+170	COMPAT_10 MODULAR compat_sysv_10	\
 		{ int|sys||msgsys(int which, int a2, int a3, int a4, \
 			    int a5, int a6); } omsgsys
 #else
@@ -369,7 +370,7 @@
 #endif
 ; XXX more generally, never on machines where sizeof(void *) != sizeof(int)
 #if !defined(_LP64)
-171	COMPAT_10 MODULAR compat_sysv	\
+171	COMPAT_10 MODULAR compat_sysv_10	\
 		{ int|sys||shmsys(int which, int a2, int a3, int a4); } \
 			    oshmsys
 #else
@@ -402,13 +403,13 @@
 185	STD MODULAR lfs	{ int|sys||lfs_markv(fsid_t *fsidp, \
 			    struct block_info *blkiov, int blkcnt); }
 186	STD MODULAR lfs	{ int|sys||lfs_segclean(fsid_t *fsidp, u_long segment); }
-187	COMPAT_50 MODULAR compat { int|sys||lfs_segwait(fsid_t *fsidp, \
+187	COMPAT_50 MODULAR compat_50 { int|sys||lfs_segwait(fsid_t *fsidp, \
 			    struct timeval50 *tv); }
-188	COMPAT_12 MODULAR compat	\
+188	COMPAT_12 MODULAR compat_12	\
 		{ int|sys||stat(const char *path, struct stat12 *ub); } stat12
-189	COMPAT_12 MODULAR compat	\
+189	COMPAT_12 MODULAR compat_12	\
 		{ int|sys||fstat(int fd, struct stat12 *sb); } fstat12
-190	COMPAT_12 MODULAR compat { int|sys||lstat(const char *path, \
+190	COMPAT_12 MODULAR compat_12 { int|sys||lstat(const char *path, \
 			    struct stat12 *ub); } lstat12
 191	STD 	RUMP	{ long|sys||pathconf(const char *path, int name); }
 192	STD 	RUMP	{ long|sys||fpathconf(int fd, int name); }
@@ -417,7 +418,7 @@
 			    struct rlimit *rlp); }
 195	STD 	RUMP	{ int|sys||setrlimit(int which, \
 			    const struct rlimit *rlp); }
-196	COMPAT_12 MODULAR compat	\
+196	COMPAT_12 MODULAR compat_12	\
 		{ int|sys||getdirentries(int fd, char *buf, \
 			    u_int count, long *basep); }
 197	STD 		{ void *|sys||mmap(void *addr, size_t len, int prot, \
@@ -435,7 +436,7 @@
 203	STD 		{ int|sys||mlock(const void *addr, size_t len); }
 204	STD 		{ int|sys||munlock(const void *addr, size_t len); }
 205	STD 		{ int|sys||undelete(const char *path); }
-206	COMPAT_50 MODULAR compat RUMP { int|sys||futimes(int fd, \
+206	COMPAT_50 MODULAR compat_50 RUMP { int|sys||futimes(int fd, \
 			    const struct timeval50 *tptr); }
 207	STD 	 RUMP	{ pid_t|sys||getpgid(pid_t pid); }
 208	STD	 RUMP	{ int|sys||reboot(int opt, char *bootstr); }
@@ -456,7 +457,7 @@
 218	UNIMPL
 219	UNIMPL
 ; System calls 220-300 are reserved for use by NetBSD
-220	COMPAT_14 MODULAR compat_sysv	\
+220	COMPAT_14 MODULAR compat_sysv_14	\
 		{ int|sys||__semctl(int semid, int semnum, int cmd, \
 			    union __semun *arg); }
 221	STD MODULAR sysv_ipc { int|sys||semget(key_t key, int nsems, \
@@ -464,7 +465,7 @@
 222	STD MODULAR sysv_ipc { int|sys||semop(int semid, struct sembuf *sops, \
 			    size_t nsops); }
 223	STD MODULAR sysv_ipc { int|sys||semconfig(int flag); }
-224	COMPAT_14 MODULAR compat_sysv { int|sys||msgctl(int msqid, int cmd, \
+224	COMPAT_14 MODULAR compat_sysv_14 { int|sys||msgctl(int msqid, int cmd, \
 			    struct msqid_ds14 *buf); }
 225	STD MODULAR sysv_ipc { int|sys||msgget(key_t key, int msgflg); }
 226	STD MODULAR sysv_ipc { int|sys||msgsnd(int msqid, const void *msgp, \
@@ -473,36 +474,39 @@
 			    size_t msgsz, long msgtyp, int msgflg); }
 228	STD MODULAR sysv_ipc { void *|sys||shmat(int shmid,	\
 			    const void *shmaddr, int shmflg); }
-229	COMPAT_14 MODULAR compat_sysv { int|sys||shmctl(int shmid, int cmd, \
+229	COMPAT_14 MODULAR compat_sysv_14 { int|sys||shmctl(int shmid, int cmd, \
 			    struct shmid_ds14 *buf); }
 230	STD MODULAR sysv_ipc { int|sys||shmdt(const void *shmaddr); }
 231	STD MODULAR sysv_ipc { int|sys||shmget(key_t key, size_t size,	\
 			    int shmflg); }
-232	COMPAT_50 MODULAR compat { int|sys||clock_gettime(clockid_t clock_id, \
-			    struct timespec50 *tp); }
-233	COMPAT_50 MODULAR compat { int|sys||clock_settime(clockid_t clock_id, \
-			    const struct timespec50 *tp); }
-234	COMPAT_50 MODULAR compat { int|sys||clock_getres(clockid_t clock_id, \
-			    struct timespec50 *tp); }
+232	COMPAT_50 MODULAR compat_50	\
+		{ int|sys||clock_gettime(clockid_t clock_id, \
+		    struct timespec50 *tp); }
+233	COMPAT_50 MODULAR compat_50	\
+		{ int|sys||clock_settime(clockid_t clock_id, \
+		    const struct timespec50 *tp); }
+234	COMPAT_50 MODULAR compat_50	\
+		{ int|sys||clock_getres(clockid_t clock_id, \
+		    struct timespec50 *tp); }
 235	STD  RUMP	{ int|sys||timer_create(clockid_t clock_id, \
 			    struct sigevent *evp, timer_t *timerid); }
 236	STD  RUMP	{ int|sys||timer_delete(timer_t timerid); }
-237	COMPAT_50 MODULAR compat { int|sys||timer_settime(timer_t timerid, \
+237	COMPAT_50 MODULAR compat_50 { int|sys||timer_settime(timer_t timerid, \
 			    int flags, const struct itimerspec50 *value, \
 			    struct itimerspec50 *ovalue); }
-238	COMPAT_50 MODULAR compat { int|sys||timer_gettime(timer_t timerid, \
+238	COMPAT_50 MODULAR compat_50 { int|sys||timer_gettime(timer_t timerid, \
 			    struct itimerspec50 *value); }
 239	STD  RUMP	{ int|sys||timer_getoverrun(timer_t timerid); }
 ;
 ; Syscalls 240-269 are reserved for other IEEE Std1003.1b syscalls
 ;
-240	COMPAT_50 MODULAR compat	\
+240	COMPAT_50 MODULAR compat_50	\
 		{ int|sys||nanosleep(const struct timespec50 *rqtp, \
 			    struct timespec50 *rmtp); }
 241	STD 	 RUMP	{ int|sys||fdatasync(int fd); }
 242	STD 		{ int|sys||mlockall(int flags); }
 243	STD 		{ int|sys||munlockall(void); }
-244	COMPAT_50 MODULAR compat	\
+244	COMPAT_50 MODULAR compat_50	\
 		{ int|sys||__sigtimedwait(const sigset_t *set, \
 			    siginfo_t *info, struct timespec50 *timeout); }
 245	STD		{ int|sys||sigqueueinfo(pid_t pid, \
@@ -542,35 +546,36 @@
 264	STD MODULAR mqueue	\
 			{ ssize_t|sys||mq_receive(mqd_t mqdes, char *msg_ptr, \
 			    size_t msg_len, unsigned *msg_prio); }
-265	COMPAT_50 MODULAR compat	\
-			{ int|sys||mq_timedsend(mqd_t mqdes, \
-			    const char *msg_ptr, size_t msg_len, \
-			    unsigned msg_prio, \
-			    const struct timespec50 *abs_timeout); }
-266	COMPAT_50 MODULAR compat	\
-			{ ssize_t|sys||mq_timedreceive(mqd_t mqdes, \
-			    char *msg_ptr, size_t msg_len, unsigned *msg_prio, \
-			    const struct timespec50 *abs_timeout); }
+265	COMPAT_50 MODULAR compat_50	\
+		{ int|sys||mq_timedsend(mqd_t mqdes, \
+		    const char *msg_ptr, size_t msg_len, \
+		    unsigned msg_prio, \
+		    const struct timespec50 *abs_timeout); }
+266	COMPAT_50 MODULAR compat_50	\
+		{ ssize_t|sys||mq_timedreceive(mqd_t mqdes, \
+		    char *msg_ptr, size_t msg_len, unsigned *msg_prio, \
+		    const struct timespec50 *abs_timeout); }
 267	UNIMPL
 268	UNIMPL
 269	UNIMPL
 270	STD 	 RUMP	{ int|sys||__posix_rename(const char *from, \
 			    const char *to); }
 271	STD 		{ int|sys||swapctl(int cmd, void *arg, int misc); }
-272	COMPAT_30 MODULAR compat { int|sys||getdents(int fd, char *buf, size_t count); }
+272	COMPAT_30 MODULAR compat_30	\
+		{ int|sys||getdents(int fd, char *buf, size_t count); }
 273	STD 		{ int|sys||minherit(void *addr, size_t len, \
 			    int inherit); }
 274	STD 	 RUMP	{ int|sys||lchmod(const char *path, mode_t mode); }
 275	STD 	 RUMP	{ int|sys||lchown(const char *path, uid_t uid, \
 			    gid_t gid); }
-276	COMPAT_50 MODULAR compat RUMP { int|sys||lutimes(const char *path, \
+276	COMPAT_50 MODULAR compat_50 RUMP { int|sys||lutimes(const char *path, \
 			    const struct timeval50 *tptr); }
 277	STD 		{ int|sys|13|msync(void *addr, size_t len, int flags); }
-278	COMPAT_30 MODULAR compat	\
+278	COMPAT_30 MODULAR compat_30	\
 		{ int|sys|13|stat(const char *path, struct stat13 *ub); }
-279	COMPAT_30 MODULAR compat	\
+279	COMPAT_30 MODULAR compat_30	\
 		{ int|sys|13|fstat(int fd, struct stat13 *sb); }
-280	COMPAT_30 MODULAR compat	\
+280	COMPAT_30 MODULAR compat_30	\
 		{ int|sys|13|lstat(const char *path, struct stat13 *ub); }
 281	STD 		{ int|sys|14|sigaltstack( \
 			    const struct sigaltstack *nss, \
@@ -592,7 +597,7 @@
 290	STD 	RUMP	{ ssize_t|sys||pwritev(int fd, \
 			    const struct iovec *iovp, int iovcnt, \
 			    int PAD, off_t offset); }
-291	COMPAT_16 MODULAR compat { int|sys|14|sigaction(int signum, \
+291	COMPAT_16 MODULAR compat_16 { int|sys|14|sigaction(int signum, \
 			    const struct sigaction *nsa, \
 			    struct sigaction *osa); }
 292	STD 		{ int|sys|14|sigpending(sigset_t *set); }
@@ -600,26 +605,27 @@
 			    const sigset_t *set, \
 			    sigset_t *oset); }
 294	STD 		{ int|sys|14|sigsuspend(const sigset_t *set); }
-295	COMPAT_16 MODULAR compat	\
+295	COMPAT_16 MODULAR compat_16	\
 		{ int|sys|14|sigreturn(struct sigcontext *sigcntxp); }
 296	STD 	 RUMP	{ int|sys||__getcwd(char *bufp, size_t length); }
 297	STD 	 RUMP	{ int|sys||fchroot(int fd); }
-298	COMPAT_30 MODULAR compat	\
+298	COMPAT_30 MODULAR compat_30	\
 		{ int|sys||fhopen(const struct compat_30_fhandle *fhp, int flags); }
-299	COMPAT_30 MODULAR compat	\
+299	COMPAT_30 MODULAR compat_30	\
 		{ int|sys||fhstat(const struct compat_30_fhandle *fhp, \
 			    struct stat13 *sb); }
-300	COMPAT_20 MODULAR compat	\
+300	COMPAT_20 MODULAR compat_20	\
 		{ int|sys||fhstatfs(const struct compat_30_fhandle *fhp, \
 			    struct statfs12 *buf); }
-301	COMPAT_50 MODULAR compat_sysv	\
+301	COMPAT_50 MODULAR compat_sysv_50	\
 		{ int|sys|13|__semctl(int semid, int semnum, int cmd, \
 			    ... union __semun *arg); }
-302	COMPAT_50 MODULAR compat_sysv { int|sys|13|msgctl(int msqid, int cmd, \
-			    struct msqid_ds *buf); }
-303	COMPAT_50 MODULAR compat_sysv { int|sys|13|shmctl(int shmid, int cmd, \
+302	COMPAT_50 MODULAR compat_sysv_50	\
+		{ int|sys|13|msgctl(int msqid, int cmd, struct msqid_ds *buf); }
+303	COMPAT_50 MODULAR compat_sysv_50	\
+		{ int|sys|13|shmctl(int shmid, int cmd, \
 			    struct shmid_ds13 *buf); }
-304	STD 	 RUMP	{ int|sys||lchflags(const char *path, u_long flags); }
+304	STD 	RUMP	{ int|sys||lchflags(const char *path, u_long flags); }
 305	NOERR 	RUMP	{ int|sys||issetugid(void); }
 306	STD	RUMP	{ int|sys||utrace(const char *label, void *addr, \
 				size_t len); }
@@ -638,7 +644,7 @@
 317	STD 		{ void|sys||_lwp_setprivate(void *ptr); }
 318	STD 		{ int|sys||_lwp_kill(lwpid_t target, int signo); }
 319	STD 		{ int|sys||_lwp_detach(lwpid_t target); }
-320	COMPAT_50 MODULAR compat	\
+320	COMPAT_50 MODULAR compat_50	\
 		{ int|sys||_lwp_park(const struct timespec50 *ts, \
 				lwpid_t unpark, const void *hint, \
 				const void *unparkhint); }
@@ -657,18 +663,18 @@
 328	UNIMPL
 329	UNIMPL
 ; SA system calls.
-330	COMPAT_60 MODULAR compat	\
+330	COMPAT_60 MODULAR compat_60	\
 		 	{ int|sys||sa_register(void *newv, void **oldv, \
 				int flags, ssize_t stackinfo_offset); }
-331	COMPAT_60 MODULAR compat	\
+331	COMPAT_60 MODULAR compat_60	\
 			{ int|sys||sa_stacks(int num, stack_t *stacks); }
-332	COMPAT_60 MODULAR compat	\
+332	COMPAT_60 MODULAR compat_60	\
 			{ int|sys||sa_enable(void); }
-333	COMPAT_60 MODULAR compat	\
+333	COMPAT_60 MODULAR compat_60	\
 			{ int|sys||sa_setconcurrency(int concurrency); }
-334	COMPAT_60 MODULAR compat	\
+334	COMPAT_60 MODULAR compat_60	\
 			{ int|sys||sa_yield(void); }
-335	COMPAT_60 MODULAR compat	\
+335	COMPAT_60 MODULAR compat_60	\
 			{ int|sys||sa_preempt(int sa_id); }
 336	OBSOL 		sys_sa_unblockyield
 ;
@@ -685,7 +691,7 @@
 342	STD		{ int|sys||pmc_control(int ctr, int op, void *args); }
 343	STD 		{ int|sys||rasctl(void *addr, size_t len, int op); }
 344	STD	RUMP	{ int|sys||kqueue(void); }
-345	COMPAT_50 MODULAR compat RUMP { int|sys||kevent(int fd, \
+345	COMPAT_50 MODULAR compat_50 RUMP { int|sys||kevent(int fd, \
 			    const struct kevent *changelist, size_t nchanges, \
 			    struct kevent *eventlist, size_t nevents, \
 			    const struct timespec50 *timeout); }
@@ -713,7 +719,7 @@
 			    struct statvfs *buf, int flags); }
 358	STD 	RUMP	{ int|sys||fstatvfs1(int fd, struct statvfs *buf, \
 			    int flags); }
-359	COMPAT_30 MODULAR compat	\
+359	COMPAT_30 MODULAR compat_30	\
 		{ int|sys||fhstatvfs1(const struct compat_30_fhandle *fhp, \
 			    struct statvfs *buf, int flags); }
 360	STD 	RUMP	{ int|sys||extattrctl(const char *path, int cmd, \
@@ -749,11 +755,11 @@
 			    int attrnamespace, void *data, size_t nbytes); }
 372	STD 	RUMP	{ ssize_t|sys||extattr_list_link(const char *path, \
 			    int attrnamespace, void *data, size_t nbytes); }
-373	COMPAT_50 MODULAR compat RUMP	\
+373	COMPAT_50 MODULAR compat_50 RUMP	\
 		{ int|sys||pselect(int nd, fd_set *in, fd_set *ou, \
 			    fd_set *ex, const struct timespec50 *ts, \
 			    const sigset_t *mask); }
-374	COMPAT_50 MODULAR compat RUMP	\
+374	COMPAT_50 MODULAR compat_50 RUMP	\
 		{ int|sys||pollts(struct pollfd *fds, u_int nfds, \
 			    const struct timespec50 *ts, const sigset_t *mask); }
 375	STD 	RUMP	{ int|sys||setxattr(const char *path, \
@@ -783,17 +789,18 @@
 			    const char *name); }
 386	STD 	RUMP	{ int|sys||fremovexattr(int fd, \
 			    const char *name); }
-387	COMPAT_50 MODULAR compat RUMP	\
+387	COMPAT_50 MODULAR compat_50 RUMP	\
 		{ int|sys|30|stat(const char *path, struct stat30 *ub); }
-388	COMPAT_50 MODULAR compat RUMP	\
+388	COMPAT_50 MODULAR compat_50 RUMP	\
 		{ int|sys|30|fstat(int fd, struct stat30 *sb); }
-389	COMPAT_50 MODULAR compat RUMP	\
+389	COMPAT_50 MODULAR compat_50 RUMP	\
 		{ int|sys|30|lstat(const char *path, struct stat30 *ub); }
 390	STD 	RUMP	{ int|sys|30|getdents(int fd, char *buf, size_t count); }
 391	IGNORED		old posix_fadvise
-392	COMPAT_30 MODULAR compat { int|sys|30|fhstat(const struct compat_30_fhandle \
+392	COMPAT_30 MODULAR compat_30	\
+		{ int|sys|30|fhstat(const struct compat_30_fhandle \
 			    *fhp, struct stat30 *sb); }
-393	COMPAT_50 MODULAR compat	\
+393	COMPAT_50 MODULAR compat_30	\
 		{ int|sys|30|ntp_gettime(struct ntptimeval50 *ntvp); }
 394	STD	 RUMP	{ int|sys|30|socket(int domain, int type, int protocol); }
 395	STD 	 RUMP	{ int|sys|30|getfh(const char *fname, void *fhp, \
@@ -802,7 +809,7 @@
 			    int flags); }
 397	STD 	 RUMP	{ int|sys|40|fhstatvfs1(const void *fhp, \
 			    size_t fh_size, struct statvfs *buf, int flags); }
-398	COMPAT_50 MODULAR compat RUMP { int|sys|40|fhstat(const void *fhp, \
+398	COMPAT_50 MODULAR compat_50 RUMP { int|sys|40|fhstat(const void *fhp, \
 			    size_t fh_size, struct stat30 *sb); }
 
 ; Asynchronous I/O system calls
@@ -885,7 +892,7 @@
 		{ ssize_t|sys|50|mq_timedreceive(mqd_t mqdes, \
 			    char *msg_ptr, size_t msg_len, unsigned *msg_prio, \
 			    const struct timespec *abs_timeout); }
-434	COMPAT_60 MODULAR compat \
+434	COMPAT_60 MODULAR compat_60 \
 		{ int|sys||_lwp_park(const struct timespec *ts, \
 				lwpid_t unpark, const void *hint, \
 				const void *unparkhint); }

Reply via email to