regen

4 files changed, 96 insertions, 275 deletions

diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index abca4fdb01f..c19b0fe89e6 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: init_sysent.c,v 1.148 2013/08/16 08:33:56 guenther Exp $	*/
+/*	$OpenBSD: init_sysent.c,v 1.149 2013/09/14 01:36:02 guenther Exp $	*/
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.136 2013/08/16 08:33:20 guenther Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.137 2013/09/14 01:35:01 guenther Exp 
  */
 
 #include <sys/param.h>
@@ -15,12 +15,6 @@
 #include <sys/poll.h>
 #include <sys/event.h>
 
-#ifdef T32
-#define t32(func) __CONCAT(t32_,func)
-#else
-#define t32(func) sys_nosys
-#endif
-
 #define	s(type)	sizeof(type)
 
 struct sysent sysent[] = {
@@ -38,8 +32,8 @@ struct sysent sysent[] = {
 	    sys_open },				/* 5 = open */
 	{ 1, s(struct sys_close_args), 0,
 	    sys_close },			/* 6 = close */
-	{ 4, s(struct t32_sys_wait4_args), 0,
-	    t32(sys_wait4) },			/* 7 = t32 wait4 */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 7 = obsolete t32_wait4 */
 	{ 2, s(struct sys___tfork_args), 0,
 	    sys___tfork },			/* 8 = __tfork */
 	{ 2, s(struct sys_link_args), 0,
@@ -205,14 +199,14 @@ struct sysent sysent[] = {
 	    sys_getpgrp },			/* 81 = getpgrp */
 	{ 2, s(struct sys_setpgid_args), 0,
 	    sys_setpgid },			/* 82 = setpgid */
-	{ 3, s(struct t32_sys_setitimer_args), 0,
-	    t32(sys_setitimer) },		/* 83 = t32 setitimer */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 83 = obsolete t32_setitimer */
 	{ 4, s(struct sys_utimensat_args), 0,
 	    sys_utimensat },			/* 84 = utimensat */
 	{ 2, s(struct sys_futimens_args), 0,
 	    sys_futimens },			/* 85 = futimens */
-	{ 2, s(struct t32_sys_getitimer_args), 0,
-	    t32(sys_getitimer) },		/* 86 = t32 getitimer */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 86 = obsolete t32_getitimer */
 	{ 2, s(struct sys_clock_gettime_args), SY_NOLOCK | 0,
 	    sys_clock_gettime },		/* 87 = clock_gettime */
 	{ 2, s(struct sys_clock_settime_args), 0,
@@ -225,8 +219,8 @@ struct sysent sysent[] = {
 	    sys_nanosleep },			/* 91 = nanosleep */
 	{ 3, s(struct sys_fcntl_args), 0,
 	    sys_fcntl },			/* 92 = fcntl */
-	{ 5, s(struct t32_sys_select_args), 0,
-	    t32(sys_select) },			/* 93 = t32 select */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 93 = obsolete t32_select */
 	{ 5, s(struct sys___thrsleep_args), 0,
 	    sys___thrsleep },			/* 94 = __thrsleep */
 	{ 1, s(struct sys_fsync_args), 0,
@@ -271,10 +265,10 @@ struct sysent sysent[] = {
 	    sys_nosys },			/* 114 = obsolete osendmsg */
 	{ 0, 0, 0,
 	    sys_nosys },			/* 115 = obsolete vtrace */
-	{ 2, s(struct t32_sys_gettimeofday_args), SY_NOLOCK | 0,
-	    t32(sys_gettimeofday) },		/* 116 = t32 gettimeofday */
-	{ 2, s(struct t32_sys_getrusage_args), 0,
-	    t32(sys_getrusage) },		/* 117 = t32 getrusage */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 116 = obsolete t32_gettimeofday */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 117 = obsolete t32_getrusage */
 	{ 5, s(struct sys_getsockopt_args), 0,
 	    sys_getsockopt },			/* 118 = getsockopt */
 	{ 0, 0, 0,
@@ -283,8 +277,8 @@ struct sysent sysent[] = {
 	    sys_readv },			/* 120 = readv */
 	{ 3, s(struct sys_writev_args), 0,
 	    sys_writev },			/* 121 = writev */
-	{ 2, s(struct t32_sys_settimeofday_args), 0,
-	    t32(sys_settimeofday) },		/* 122 = t32 settimeofday */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 122 = obsolete t32_settimeofday */
 	{ 3, s(struct sys_fchown_args), 0,
 	    sys_fchown },			/* 123 = fchown */
 	{ 2, s(struct sys_fchmod_args), 0,
@@ -315,8 +309,8 @@ struct sysent sysent[] = {
 	    sys_mkdir },			/* 136 = mkdir */
 	{ 1, s(struct sys_rmdir_args), 0,
 	    sys_rmdir },			/* 137 = rmdir */
-	{ 2, s(struct t32_sys_utimes_args), 0,
-	    t32(sys_utimes) },			/* 138 = t32 utimes */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 138 = obsolete t32_utimes */
 	{ 0, 0, 0,
 	    sys_nosys },			/* 139 = obsolete 4.2 sigreturn */
 	{ 2, s(struct sys_adjtime_args), 0,
@@ -456,8 +450,8 @@ struct sysent sysent[] = {
 	    sys_munlock },			/* 204 = munlock */
 	{ 0, 0, 0,
 	    sys_nosys },			/* 205 = unimplemented sys_undelete */
-	{ 2, s(struct t32_sys_futimes_args), 0,
-	    t32(sys_futimes) },			/* 206 = t32 futimes */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 206 = obsolete t32_futimes */
 	{ 1, s(struct sys_getpgid_args), 0,
 	    sys_getpgid },			/* 207 = getpgid */
 	{ 0, 0, 0,
@@ -558,12 +552,12 @@ struct sysent sysent[] = {
 #endif
 	{ 0, 0, 0,
 	    sys_nosys },			/* 231 = obsolete shmget35 */
-	{ 2, s(struct t32_sys_clock_gettime_args), SY_NOLOCK | 0,
-	    t32(sys_clock_gettime) },		/* 232 = t32 clock_gettime */
-	{ 2, s(struct t32_sys_clock_settime_args), 0,
-	    t32(sys_clock_settime) },		/* 233 = t32 clock_settime */
-	{ 2, s(struct t32_sys_clock_getres_args), SY_NOLOCK | 0,
-	    t32(sys_clock_getres) },		/* 234 = t32 clock_getres */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 232 = obsolete t32_clock_gettime */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 233 = obsolete t32_clock_settime */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 234 = obsolete t32_clock_getres */
 	{ 0, 0, 0,
 	    sys_nosys },			/* 235 = unimplemented timer_create */
 	{ 0, 0, 0,
@@ -574,8 +568,8 @@ struct sysent sysent[] = {
 	    sys_nosys },			/* 238 = unimplemented timer_gettime */
 	{ 0, 0, 0,
 	    sys_nosys },			/* 239 = unimplemented timer_getoverrun */
-	{ 2, s(struct t32_sys_nanosleep_args), SY_NOLOCK | 0,
-	    t32(sys_nanosleep) },		/* 240 = t32 nanosleep */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 240 = obsolete t32_nanosleep */
 	{ 0, 0, 0,
 	    sys_nosys },			/* 241 = unimplemented */
 	{ 0, 0, 0,
@@ -634,8 +628,8 @@ struct sysent sysent[] = {
 	    sys_pwritev },			/* 268 = pwritev */
 	{ 0, 0, 0,
 	    sys_kqueue },			/* 269 = kqueue */
-	{ 6, s(struct t32_sys_kevent_args), 0,
-	    t32(sys_kevent) },			/* 270 = t32 kevent */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 270 = obsolete t32_kevent */
 	{ 1, s(struct sys_mlockall_args), 0,
 	    sys_mlockall },			/* 271 = mlockall */
 	{ 0, 0, 0,
@@ -686,12 +680,12 @@ struct sysent sysent[] = {
 	{ 0, 0, 0,
 	    sys_nosys },			/* 290 = unimplemented semop */
 #endif
-	{ 2, s(struct t32_sys_stat_args), 0,
-	    t32(sys_stat) },			/* 291 = t32 stat */
-	{ 2, s(struct t32_sys_fstat_args), 0,
-	    t32(sys_fstat) },			/* 292 = t32 fstat */
-	{ 2, s(struct t32_sys_lstat_args), 0,
-	    t32(sys_lstat) },			/* 293 = t32 lstat */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 291 = obsolete t32_stat */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 292 = obsolete t32_fstat */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 293 = obsolete t32_lstat */
 	{ 2, s(struct sys_fhstat_args), 0,
 	    sys_fhstat },			/* 294 = fhstat */
 #ifdef SYSVSEM
@@ -719,8 +713,8 @@ struct sysent sysent[] = {
 	    sys_sched_yield },			/* 298 = sched_yield */
 	{ 0, 0, SY_NOLOCK | 0,
 	    sys_getthrid },			/* 299 = getthrid */
-	{ 5, s(struct t32_sys___thrsleep_args), 0,
-	    t32(sys___thrsleep) },		/* 300 = t32 __thrsleep */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 300 = obsolete t32___thrsleep */
 	{ 2, s(struct sys___thrwakeup_args), 0,
 	    sys___thrwakeup },			/* 301 = __thrwakeup */
 	{ 1, s(struct sys___threxit_args), 0,
@@ -743,16 +737,16 @@ struct sysent sysent[] = {
 	    sys_setrtable },			/* 310 = setrtable */
 	{ 0, 0, 0,
 	    sys_getrtable },			/* 311 = getrtable */
-	{ 4, s(struct t32_sys_getdirentries_args), 0,
-	    t32(sys_getdirentries) },		/* 312 = t32 getdirentries */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 312 = obsolete t32_getdirentries */
 	{ 4, s(struct sys_faccessat_args), 0,
 	    sys_faccessat },			/* 313 = faccessat */
 	{ 4, s(struct sys_fchmodat_args), 0,
 	    sys_fchmodat },			/* 314 = fchmodat */
 	{ 5, s(struct sys_fchownat_args), 0,
 	    sys_fchownat },			/* 315 = fchownat */
-	{ 4, s(struct t32_sys_fstatat_args), 0,
-	    t32(sys_fstatat) },			/* 316 = t32 fstatat */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 316 = obsolete t32_fstatat */
 	{ 5, s(struct sys_linkat_args), 0,
 	    sys_linkat },			/* 317 = linkat */
 	{ 3, s(struct sys_mkdirat_args), 0,
@@ -771,10 +765,10 @@ struct sysent sysent[] = {
 	    sys_symlinkat },			/* 324 = symlinkat */
 	{ 3, s(struct sys_unlinkat_args), 0,
 	    sys_unlinkat },			/* 325 = unlinkat */
-	{ 4, s(struct t32_sys_utimensat_args), 0,
-	    t32(sys_utimensat) },		/* 326 = t32 utimensat */
-	{ 2, s(struct t32_sys_futimens_args), 0,
-	    t32(sys_futimens) },		/* 327 = t32 futimens */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 326 = obsolete t32_utimensat */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 327 = obsolete t32_futimens */
 	{ 0, 0, 0,
 	    sys_nosys },			/* 328 = obsolete __tfork51 */
 	{ 1, s(struct sys___set_tcb_args), SY_NOLOCK | 0,
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index 822a565477d..099fa5f917b 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscalls.c,v 1.149 2013/08/16 08:33:56 guenther Exp $	*/
+/*	$OpenBSD: syscalls.c,v 1.150 2013/09/14 01:36:02 guenther Exp $	*/
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.136 2013/08/16 08:33:20 guenther Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.137 2013/09/14 01:35:01 guenther Exp 
  */
 
 char *syscallnames[] = {
@@ -15,7 +15,7 @@ char *syscallnames[] = {
 	"write",			/* 4 = write */
 	"open",			/* 5 = open */
 	"close",			/* 6 = close */
-	"t32_wait4",	/* 7 = t32 wait4 */
+	"#7 (obsolete t32_wait4)",		/* 7 = obsolete t32_wait4 */
 	"__tfork",			/* 8 = __tfork */
 	"link",			/* 9 = link */
 	"unlink",			/* 10 = unlink */
@@ -103,17 +103,17 @@ char *syscallnames[] = {
 	"setgroups",			/* 80 = setgroups */
 	"getpgrp",			/* 81 = getpgrp */
 	"setpgid",			/* 82 = setpgid */
-	"t32_setitimer",	/* 83 = t32 setitimer */
+	"#83 (obsolete t32_setitimer)",		/* 83 = obsolete t32_setitimer */
 	"utimensat",			/* 84 = utimensat */
 	"futimens",			/* 85 = futimens */
-	"t32_getitimer",	/* 86 = t32 getitimer */
+	"#86 (obsolete t32_getitimer)",		/* 86 = obsolete t32_getitimer */
 	"clock_gettime",			/* 87 = clock_gettime */
 	"clock_settime",			/* 88 = clock_settime */
 	"clock_getres",			/* 89 = clock_getres */
 	"dup2",			/* 90 = dup2 */
 	"nanosleep",			/* 91 = nanosleep */
 	"fcntl",			/* 92 = fcntl */
-	"t32_select",	/* 93 = t32 select */
+	"#93 (obsolete t32_select)",		/* 93 = obsolete t32_select */
 	"__thrsleep",			/* 94 = __thrsleep */
 	"fsync",			/* 95 = fsync */
 	"setpriority",			/* 96 = setpriority */
@@ -136,13 +136,13 @@ char *syscallnames[] = {
 	"#113 (obsolete orecvmsg)",		/* 113 = obsolete orecvmsg */
 	"#114 (obsolete osendmsg)",		/* 114 = obsolete osendmsg */
 	"#115 (obsolete vtrace)",		/* 115 = obsolete vtrace */
-	"t32_gettimeofday",	/* 116 = t32 gettimeofday */
-	"t32_getrusage",	/* 117 = t32 getrusage */
+	"#116 (obsolete t32_gettimeofday)",		/* 116 = obsolete t32_gettimeofday */
+	"#117 (obsolete t32_getrusage)",		/* 117 = obsolete t32_getrusage */
 	"getsockopt",			/* 118 = getsockopt */
 	"#119 (obsolete resuba)",		/* 119 = obsolete resuba */
 	"readv",			/* 120 = readv */
 	"writev",			/* 121 = writev */
-	"t32_settimeofday",	/* 122 = t32 settimeofday */
+	"#122 (obsolete t32_settimeofday)",		/* 122 = obsolete t32_settimeofday */
 	"fchown",			/* 123 = fchown */
 	"fchmod",			/* 124 = fchmod */
 	"#125 (obsolete orecvfrom)",		/* 125 = obsolete orecvfrom */
@@ -158,7 +158,7 @@ char *syscallnames[] = {
 	"socketpair",			/* 135 = socketpair */
 	"mkdir",			/* 136 = mkdir */
 	"rmdir",			/* 137 = rmdir */
-	"t32_utimes",	/* 138 = t32 utimes */
+	"#138 (obsolete t32_utimes)",		/* 138 = obsolete t32_utimes */
 	"#139 (obsolete 4.2 sigreturn)",		/* 139 = obsolete 4.2 sigreturn */
 	"adjtime",			/* 140 = adjtime */
 	"#141 (obsolete ogetpeername)",		/* 141 = obsolete ogetpeername */
@@ -230,7 +230,7 @@ char *syscallnames[] = {
 	"mlock",			/* 203 = mlock */
 	"munlock",			/* 204 = munlock */
 	"#205 (unimplemented sys_undelete)",		/* 205 = unimplemented sys_undelete */
-	"t32_futimes",	/* 206 = t32 futimes */
+	"#206 (obsolete t32_futimes)",		/* 206 = obsolete t32_futimes */
 	"getpgid",			/* 207 = getpgid */
 	"#208 (obsolete nnpfspioctl)",		/* 208 = obsolete nnpfspioctl */
 	"utrace",			/* 209 = utrace */
@@ -287,15 +287,15 @@ char *syscallnames[] = {
 	"#230 (unimplemented shmdt)",		/* 230 = unimplemented shmdt */
 #endif
 	"#231 (obsolete shmget35)",		/* 231 = obsolete shmget35 */
-	"t32_clock_gettime",	/* 232 = t32 clock_gettime */
-	"t32_clock_settime",	/* 233 = t32 clock_settime */
-	"t32_clock_getres",	/* 234 = t32 clock_getres */
+	"#232 (obsolete t32_clock_gettime)",		/* 232 = obsolete t32_clock_gettime */
+	"#233 (obsolete t32_clock_settime)",		/* 233 = obsolete t32_clock_settime */
+	"#234 (obsolete t32_clock_getres)",		/* 234 = obsolete t32_clock_getres */
 	"#235 (unimplemented timer_create)",		/* 235 = unimplemented timer_create */
 	"#236 (unimplemented timer_delete)",		/* 236 = unimplemented timer_delete */
 	"#237 (unimplemented timer_settime)",		/* 237 = unimplemented timer_settime */
 	"#238 (unimplemented timer_gettime)",		/* 238 = unimplemented timer_gettime */
 	"#239 (unimplemented timer_getoverrun)",		/* 239 = unimplemented timer_getoverrun */
-	"t32_nanosleep",	/* 240 = t32 nanosleep */
+	"#240 (obsolete t32_nanosleep)",		/* 240 = obsolete t32_nanosleep */
 	"#241 (unimplemented)",		/* 241 = unimplemented */
 	"#242 (unimplemented)",		/* 242 = unimplemented */
 	"#243 (unimplemented)",		/* 243 = unimplemented */
@@ -325,7 +325,7 @@ char *syscallnames[] = {
 	"preadv",			/* 267 = preadv */
 	"pwritev",			/* 268 = pwritev */
 	"kqueue",			/* 269 = kqueue */
-	"t32_kevent",	/* 270 = t32 kevent */
+	"#270 (obsolete t32_kevent)",		/* 270 = obsolete t32_kevent */
 	"mlockall",			/* 271 = mlockall */
 	"munlockall",			/* 272 = munlockall */
 	"#273 (unimplemented sys_getpeereid)",		/* 273 = unimplemented sys_getpeereid */
@@ -354,9 +354,9 @@ char *syscallnames[] = {
 #else
 	"#290 (unimplemented semop)",		/* 290 = unimplemented semop */
 #endif
-	"t32_stat",	/* 291 = t32 stat */
-	"t32_fstat",	/* 292 = t32 fstat */
-	"t32_lstat",	/* 293 = t32 lstat */
+	"#291 (obsolete t32_stat)",		/* 291 = obsolete t32_stat */
+	"#292 (obsolete t32_fstat)",		/* 292 = obsolete t32_fstat */
+	"#293 (obsolete t32_lstat)",		/* 293 = obsolete t32_lstat */
 	"fhstat",			/* 294 = fhstat */
 #ifdef SYSVSEM
 	"__semctl",			/* 295 = __semctl */
@@ -375,7 +375,7 @@ char *syscallnames[] = {
 #endif
 	"sched_yield",			/* 298 = sched_yield */
 	"getthrid",			/* 299 = getthrid */
-	"t32___thrsleep",	/* 300 = t32 __thrsleep */
+	"#300 (obsolete t32___thrsleep)",		/* 300 = obsolete t32___thrsleep */
 	"__thrwakeup",			/* 301 = __thrwakeup */
 	"__threxit",			/* 302 = __threxit */
 	"__thrsigdivert",			/* 303 = __thrsigdivert */
@@ -387,11 +387,11 @@ char *syscallnames[] = {
 	"#309 (obsolete fhstatfs53)",		/* 309 = obsolete fhstatfs53 */
 	"setrtable",			/* 310 = setrtable */
 	"getrtable",			/* 311 = getrtable */
-	"t32_getdirentries",	/* 312 = t32 getdirentries */
+	"#312 (obsolete t32_getdirentries)",		/* 312 = obsolete t32_getdirentries */
 	"faccessat",			/* 313 = faccessat */
 	"fchmodat",			/* 314 = fchmodat */
 	"fchownat",			/* 315 = fchownat */
-	"t32_fstatat",	/* 316 = t32 fstatat */
+	"#316 (obsolete t32_fstatat)",		/* 316 = obsolete t32_fstatat */
 	"linkat",			/* 317 = linkat */
 	"mkdirat",			/* 318 = mkdirat */
 	"mkfifoat",			/* 319 = mkfifoat */
@@ -401,8 +401,8 @@ char *syscallnames[] = {
 	"renameat",			/* 323 = renameat */
 	"symlinkat",			/* 324 = symlinkat */
 	"unlinkat",			/* 325 = unlinkat */
-	"t32_utimensat",	/* 326 = t32 utimensat */
-	"t32_futimens",	/* 327 = t32 futimens */
+	"#326 (obsolete t32_utimensat)",		/* 326 = obsolete t32_utimensat */
+	"#327 (obsolete t32_futimens)",		/* 327 = obsolete t32_futimens */
 	"#328 (obsolete __tfork51)",		/* 328 = obsolete __tfork51 */
 	"__set_tcb",			/* 329 = __set_tcb */
 	"__get_tcb",			/* 330 = __get_tcb */
diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index d237db1dc1b..b6b6d365bcd 100644
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscall.h,v 1.148 2013/08/16 08:33:56 guenther Exp $	*/
+/*	$OpenBSD: syscall.h,v 1.149 2013/09/14 01:36:02 guenther Exp $	*/
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.136 2013/08/16 08:33:20 guenther Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.137 2013/09/14 01:35:01 guenther Exp 
  */
 
 /* syscall: "syscall" ret: "int" args: "int" "..." */
@@ -28,8 +28,7 @@
 /* syscall: "close" ret: "int" args: "int" */
 #define	SYS_close	6
 
-				/* 7 is t32 wait4 */
-
+				/* 7 is obsolete t32_wait4 */
 /* syscall: "__tfork" ret: "int" args: "const struct __tfork *" "size_t" */
 #define	SYS___tfork	8
 
@@ -255,16 +254,14 @@
 /* syscall: "setpgid" ret: "int" args: "pid_t" "int" */
 #define	SYS_setpgid	82
 
-				/* 83 is t32 setitimer */
-
+				/* 83 is obsolete t32_setitimer */
 /* syscall: "utimensat" ret: "int" args: "int" "const char *" "const struct timespec *" "int" */
 #define	SYS_utimensat	84
 
 /* syscall: "futimens" ret: "int" args: "int" "const struct timespec *" */
 #define	SYS_futimens	85
 
-				/* 86 is t32 getitimer */
-
+				/* 86 is obsolete t32_getitimer */
 /* syscall: "clock_gettime" ret: "int" args: "clockid_t" "struct timespec *" */
 #define	SYS_clock_gettime	87
 
@@ -283,8 +280,7 @@
 /* syscall: "fcntl" ret: "int" args: "int" "int" "..." */
 #define	SYS_fcntl	92
 
-				/* 93 is t32 select */
-
+				/* 93 is obsolete t32_select */
 /* syscall: "__thrsleep" ret: "int" args: "const volatile void *" "clockid_t" "const struct timespec *" "void *" "const int *" */
 #define	SYS___thrsleep	94
 
@@ -335,10 +331,8 @@
 				/* 113 is obsolete orecvmsg */
 				/* 114 is obsolete osendmsg */
 				/* 115 is obsolete vtrace */
-				/* 116 is t32 gettimeofday */
-
-				/* 117 is t32 getrusage */
-
+				/* 116 is obsolete t32_gettimeofday */
+				/* 117 is obsolete t32_getrusage */
 /* syscall: "getsockopt" ret: "int" args: "int" "int" "int" "void *" "socklen_t *" */
 #define	SYS_getsockopt	118
 
@@ -349,8 +343,7 @@
 /* syscall: "writev" ret: "ssize_t" args: "int" "const struct iovec *" "int" */
 #define	SYS_writev	121
 
-				/* 122 is t32 settimeofday */
-
+				/* 122 is obsolete t32_settimeofday */
 /* syscall: "fchown" ret: "int" args: "int" "uid_t" "gid_t" */
 #define	SYS_fchown	123
 
@@ -390,8 +383,7 @@
 /* syscall: "rmdir" ret: "int" args: "const char *" */
 #define	SYS_rmdir	137
 
-				/* 138 is t32 utimes */
-
+				/* 138 is obsolete t32_utimes */
 				/* 139 is obsolete 4.2 sigreturn */
 /* syscall: "adjtime" ret: "int" args: "const struct timeval *" "struct timeval *" */
 #define	SYS_adjtime	140
@@ -489,8 +481,7 @@
 /* syscall: "munlock" ret: "int" args: "const void *" "size_t" */
 #define	SYS_munlock	204
 
-				/* 206 is t32 futimes */
-
+				/* 206 is obsolete t32_futimes */
 /* syscall: "getpgid" ret: "pid_t" args: "pid_t" */
 #define	SYS_getpgid	207
 
@@ -519,14 +510,10 @@
 #define	SYS_shmdt	230
 
 				/* 231 is obsolete shmget35 */
-				/* 232 is t32 clock_gettime */
-
-				/* 233 is t32 clock_settime */
-
-				/* 234 is t32 clock_getres */
-
-				/* 240 is t32 nanosleep */
-
+				/* 232 is obsolete t32_clock_gettime */
+				/* 233 is obsolete t32_clock_settime */
+				/* 234 is obsolete t32_clock_getres */
+				/* 240 is obsolete t32_nanosleep */
 /* syscall: "minherit" ret: "int" args: "void *" "size_t" "int" */
 #define	SYS_minherit	250
 
@@ -564,8 +551,7 @@
 /* syscall: "kqueue" ret: "int" args: */
 #define	SYS_kqueue	269
 
-				/* 270 is t32 kevent */
-
+				/* 270 is obsolete t32_kevent */
 /* syscall: "mlockall" ret: "int" args: "int" */
 #define	SYS_mlockall	271
 
@@ -600,12 +586,9 @@
 /* syscall: "semop" ret: "int" args: "int" "struct sembuf *" "size_t" */
 #define	SYS_semop	290
 
-				/* 291 is t32 stat */
-
-				/* 292 is t32 fstat */
-
-				/* 293 is t32 lstat */
-
+				/* 291 is obsolete t32_stat */
+				/* 292 is obsolete t32_fstat */
+				/* 293 is obsolete t32_lstat */
 /* syscall: "fhstat" ret: "int" args: "const fhandle_t *" "struct stat *" */
 #define	SYS_fhstat	294
 
@@ -624,8 +607,7 @@
 /* syscall: "getthrid" ret: "pid_t" args: */
 #define	SYS_getthrid	299
 
-				/* 300 is t32 __thrsleep */
-
+				/* 300 is obsolete t32___thrsleep */
 /* syscall: "__thrwakeup" ret: "int" args: "const volatile void *" "int" */
 #define	SYS___thrwakeup	301
 
@@ -651,8 +633,7 @@
 /* syscall: "getrtable" ret: "int" args: */
 #define	SYS_getrtable	311
 
-				/* 312 is t32 getdirentries */
-
+				/* 312 is obsolete t32_getdirentries */
 /* syscall: "faccessat" ret: "int" args: "int" "const char *" "int" "int" */
 #define	SYS_faccessat	313
 
@@ -662,8 +643,7 @@
 /* syscall: "fchownat" ret: "int" args: "int" "const char *" "uid_t" "gid_t" "int" */
 #define	SYS_fchownat	315
 
-				/* 316 is t32 fstatat */
-
+				/* 316 is obsolete t32_fstatat */
 /* syscall: "linkat" ret: "int" args: "int" "const char *" "int" "const char *" "int" */
 #define	SYS_linkat	317
 
@@ -691,10 +671,8 @@
 /* syscall: "unlinkat" ret: "int" args: "int" "const char *" "int" */
 #define	SYS_unlinkat	325
 
-				/* 326 is t32 utimensat */
-
-				/* 327 is t32 futimens */
-
+				/* 326 is obsolete t32_utimensat */
+				/* 327 is obsolete t32_futimens */
 				/* 328 is obsolete __tfork51 */
 /* syscall: "__set_tcb" ret: "void" args: "void *" */
 #define	SYS___set_tcb	329
diff --git a/sys/sys/syscallargs.h b/sys/sys/syscallargs.h
index 76328505e0f..c8d3c2bac1d 100644
--- a/sys/sys/syscallargs.h
+++ b/sys/sys/syscallargs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscallargs.h,v 1.150 2013/08/16 08:33:56 guenther Exp $	*/
+/*	$OpenBSD: syscallargs.h,v 1.151 2013/09/14 01:36:02 guenther Exp $	*/
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.136 2013/08/16 08:33:20 guenther Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.137 2013/09/14 01:35:01 guenther Exp 
  */
 
 #ifdef	syscallarg
@@ -49,13 +49,6 @@ struct sys_close_args {
 	syscallarg(int) fd;
 };
 
-struct t32_sys_wait4_args {
-	syscallarg(pid_t) pid;
-	syscallarg(int *) status;
-	syscallarg(int) options;
-	syscallarg(struct rusage32 *) rusage;
-};
-
 struct sys___tfork_args {
 	syscallarg(const struct __tfork *) param;
 	syscallarg(size_t) psize;
@@ -403,12 +396,6 @@ struct sys_setpgid_args {
 	syscallarg(int) pgid;
 };
 
-struct t32_sys_setitimer_args {
-	syscallarg(int) which;
-	syscallarg(const struct itimerval32 *) itv;
-	syscallarg(struct itimerval32 *) oitv;
-};
-
 struct sys_utimensat_args {
 	syscallarg(int) fd;
 	syscallarg(const char *) path;
@@ -421,11 +408,6 @@ struct sys_futimens_args {
 	syscallarg(const struct timespec *) times;
 };
 
-struct t32_sys_getitimer_args {
-	syscallarg(int) which;
-	syscallarg(struct itimerval32 *) itv;
-};
-
 struct sys_clock_gettime_args {
 	syscallarg(clockid_t) clock_id;
 	syscallarg(struct timespec *) tp;
@@ -457,14 +439,6 @@ struct sys_fcntl_args {
 	syscallarg(void *) arg;
 };
 
-struct t32_sys_select_args {
-	syscallarg(int) nd;
-	syscallarg(fd_set *) in;
-	syscallarg(fd_set *) ou;
-	syscallarg(fd_set *) ex;
-	syscallarg(struct timeval32 *) tv;
-};
-
 struct sys___thrsleep_args {
 	syscallarg(const volatile void *) ident;
 	syscallarg(clockid_t) clock_id;
@@ -549,16 +523,6 @@ struct sys_sigsuspend_args {
 	syscallarg(int) mask;
 };
 
-struct t32_sys_gettimeofday_args {
-	syscallarg(struct timeval32 *) tp;
-	syscallarg(struct timezone *) tzp;
-};
-
-struct t32_sys_getrusage_args {
-	syscallarg(int) who;
-	syscallarg(struct rusage32 *) rusage;
-};
-
 struct sys_getsockopt_args {
 	syscallarg(int) s;
 	syscallarg(int) level;
@@ -579,11 +543,6 @@ struct sys_writev_args {
 	syscallarg(int) iovcnt;
 };
 
-struct t32_sys_settimeofday_args {
-	syscallarg(const struct timeval32 *) tv;
-	syscallarg(const struct timezone *) tzp;
-};
-
 struct sys_fchown_args {
 	syscallarg(int) fd;
 	syscallarg(uid_t) uid;
@@ -650,11 +609,6 @@ struct sys_rmdir_args {
 	syscallarg(const char *) path;
 };
 
-struct t32_sys_utimes_args {
-	syscallarg(const char *) path;
-	syscallarg(const struct timeval32 *) tptr;
-};
-
 struct sys_adjtime_args {
 	syscallarg(const struct timeval *) delta;
 	syscallarg(struct timeval *) olddelta;
@@ -784,11 +738,6 @@ struct sys_munlock_args {
 	syscallarg(size_t) len;
 };
 
-struct t32_sys_futimes_args {
-	syscallarg(int) fd;
-	syscallarg(const struct timeval32 *) tptr;
-};
-
 struct sys_getpgid_args {
 	syscallarg(pid_t) pid;
 };
@@ -835,26 +784,6 @@ struct sys_shmdt_args {
 	syscallarg(const void *) shmaddr;
 };
 
-struct t32_sys_clock_gettime_args {
-	syscallarg(clockid_t) clock_id;
-	syscallarg(struct timespec32 *) tp;
-};
-
-struct t32_sys_clock_settime_args {
-	syscallarg(clockid_t) clock_id;
-	syscallarg(const struct timespec32 *) tp;
-};
-
-struct t32_sys_clock_getres_args {
-	syscallarg(clockid_t) clock_id;
-	syscallarg(struct timespec32 *) tp;
-};
-
-struct t32_sys_nanosleep_args {
-	syscallarg(const struct timespec32 *) rqtp;
-	syscallarg(struct timespec32 *) rmtp;
-};
-
 struct sys_minherit_args {
 	syscallarg(void *) addr;
 	syscallarg(size_t) len;
@@ -908,15 +837,6 @@ struct sys_pwritev_args {
 	syscallarg(off_t) offset;
 };
 
-struct t32_sys_kevent_args {
-	syscallarg(int) fd;
-	syscallarg(const struct kevent32 *) changelist;
-	syscallarg(int) nchanges;
-	syscallarg(struct kevent32 *) eventlist;
-	syscallarg(int) nevents;
-	syscallarg(const struct timespec32 *) timeout;
-};
-
 struct sys_mlockall_args {
 	syscallarg(int) flags;
 };
@@ -976,21 +896,6 @@ struct sys_semop_args {
 	syscallarg(size_t) nsops;
 };
 
-struct t32_sys_stat_args {
-	syscallarg(const char *) path;
-	syscallarg(struct stat32 *) ub;
-};
-
-struct t32_sys_fstat_args {
-	syscallarg(int) fd;
-	syscallarg(struct stat32 *) sb;
-};
-
-struct t32_sys_lstat_args {
-	syscallarg(const char *) path;
-	syscallarg(struct stat32 *) ub;
-};
-
 struct sys_fhstat_args {
 	syscallarg(const fhandle_t *) fhp;
 	syscallarg(struct stat *) sb;
@@ -1015,14 +920,6 @@ struct sys_msgctl_args {
 	syscallarg(struct msqid_ds *) buf;
 };
 
-struct t32_sys___thrsleep_args {
-	syscallarg(const volatile void *) ident;
-	syscallarg(clockid_t) clock_id;
-	syscallarg(const struct timespec32 *) tp;
-	syscallarg(void *) lock;
-	syscallarg(const int *) abort;
-};
-
 struct sys___thrwakeup_args {
 	syscallarg(const volatile void *) ident;
 	syscallarg(int) n;
@@ -1052,13 +949,6 @@ struct sys_setrtable_args {
 	syscallarg(int) rtableid;
 };
 
-struct t32_sys_getdirentries_args {
-	syscallarg(int) fd;
-	syscallarg(char *) buf;
-	syscallarg(int) count;
-	syscallarg(off_t *) basep;
-};
-
 struct sys_faccessat_args {
 	syscallarg(int) fd;
 	syscallarg(const char *) path;
@@ -1081,13 +971,6 @@ struct sys_fchownat_args {
 	syscallarg(int) flag;
 };
 
-struct t32_sys_fstatat_args {
-	syscallarg(int) fd;
-	syscallarg(const char *) path;
-	syscallarg(struct stat32 *) buf;
-	syscallarg(int) flag;
-};
-
 struct sys_linkat_args {
 	syscallarg(int) fd1;
 	syscallarg(const char *) path1;
@@ -1148,18 +1031,6 @@ struct sys_unlinkat_args {
 	syscallarg(int) flag;
 };
 
-struct t32_sys_utimensat_args {
-	syscallarg(int) fd;
-	syscallarg(const char *) path;
-	syscallarg(const struct timespec32 *) times;
-	syscallarg(int) flag;
-};
-
-struct t32_sys_futimens_args {
-	syscallarg(int) fd;
-	syscallarg(const struct timespec32 *) times;
-};
-
 struct sys___set_tcb_args {
 	syscallarg(void *) tcb;
 };
@@ -1174,7 +1045,6 @@ int	sys_read(struct proc *, void *, register_t *);
 int	sys_write(struct proc *, void *, register_t *);
 int	sys_open(struct proc *, void *, register_t *);
 int	sys_close(struct proc *, void *, register_t *);
-int	t32_sys_wait4(struct proc *, void *, register_t *);
 int	sys___tfork(struct proc *, void *, register_t *);
 int	sys_link(struct proc *, void *, register_t *);
 int	sys_unlink(struct proc *, void *, register_t *);
@@ -1259,17 +1129,14 @@ int	sys_getgroups(struct proc *, void *, register_t *);
 int	sys_setgroups(struct proc *, void *, register_t *);
 int	sys_getpgrp(struct proc *, void *, register_t *);
 int	sys_setpgid(struct proc *, void *, register_t *);
-int	t32_sys_setitimer(struct proc *, void *, register_t *);
 int	sys_utimensat(struct proc *, void *, register_t *);
 int	sys_futimens(struct proc *, void *, register_t *);
-int	t32_sys_getitimer(struct proc *, void *, register_t *);
 int	sys_clock_gettime(struct proc *, void *, register_t *);
 int	sys_clock_settime(struct proc *, void *, register_t *);
 int	sys_clock_getres(struct proc *, void *, register_t *);
 int	sys_dup2(struct proc *, void *, register_t *);
 int	sys_nanosleep(struct proc *, void *, register_t *);
 int	sys_fcntl(struct proc *, void *, register_t *);
-int	t32_sys_select(struct proc *, void *, register_t *);
 int	sys___thrsleep(struct proc *, void *, register_t *);
 int	sys_fsync(struct proc *, void *, register_t *);
 int	sys_setpriority(struct proc *, void *, register_t *);
@@ -1284,12 +1151,9 @@ int	sys_listen(struct proc *, void *, register_t *);
 int	sys_ppoll(struct proc *, void *, register_t *);
 int	sys_pselect(struct proc *, void *, register_t *);
 int	sys_sigsuspend(struct proc *, void *, register_t *);
-int	t32_sys_gettimeofday(struct proc *, void *, register_t *);
-int	t32_sys_getrusage(struct proc *, void *, register_t *);
 int	sys_getsockopt(struct proc *, void *, register_t *);
 int	sys_readv(struct proc *, void *, register_t *);
 int	sys_writev(struct proc *, void *, register_t *);
-int	t32_sys_settimeofday(struct proc *, void *, register_t *);
 int	sys_fchown(struct proc *, void *, register_t *);
 int	sys_fchmod(struct proc *, void *, register_t *);
 int	sys_setreuid(struct proc *, void *, register_t *);
@@ -1302,7 +1166,6 @@ int	sys_shutdown(struct proc *, void *, register_t *);
 int	sys_socketpair(struct proc *, void *, register_t *);
 int	sys_mkdir(struct proc *, void *, register_t *);
 int	sys_rmdir(struct proc *, void *, register_t *);
-int	t32_sys_utimes(struct proc *, void *, register_t *);
 int	sys_adjtime(struct proc *, void *, register_t *);
 int	sys_setsid(struct proc *, void *, register_t *);
 int	sys_quotactl(struct proc *, void *, register_t *);
@@ -1329,7 +1192,6 @@ int	sys_ftruncate(struct proc *, void *, register_t *);
 int	sys___sysctl(struct proc *, void *, register_t *);
 int	sys_mlock(struct proc *, void *, register_t *);
 int	sys_munlock(struct proc *, void *, register_t *);
-int	t32_sys_futimes(struct proc *, void *, register_t *);
 int	sys_getpgid(struct proc *, void *, register_t *);
 int	sys_utrace(struct proc *, void *, register_t *);
 #ifdef LKM
@@ -1360,10 +1222,6 @@ int	sys_shmat(struct proc *, void *, register_t *);
 int	sys_shmdt(struct proc *, void *, register_t *);
 #else
 #endif
-int	t32_sys_clock_gettime(struct proc *, void *, register_t *);
-int	t32_sys_clock_settime(struct proc *, void *, register_t *);
-int	t32_sys_clock_getres(struct proc *, void *, register_t *);
-int	t32_sys_nanosleep(struct proc *, void *, register_t *);
 int	sys_minherit(struct proc *, void *, register_t *);
 int	sys_poll(struct proc *, void *, register_t *);
 int	sys_issetugid(struct proc *, void *, register_t *);
@@ -1375,7 +1233,6 @@ int	sys_fhopen(struct proc *, void *, register_t *);
 int	sys_preadv(struct proc *, void *, register_t *);
 int	sys_pwritev(struct proc *, void *, register_t *);
 int	sys_kqueue(struct proc *, void *, register_t *);
-int	t32_sys_kevent(struct proc *, void *, register_t *);
 int	sys_mlockall(struct proc *, void *, register_t *);
 int	sys_munlockall(struct proc *, void *, register_t *);
 int	sys_getresuid(struct proc *, void *, register_t *);
@@ -1393,9 +1250,6 @@ int	sys_shmget(struct proc *, void *, register_t *);
 int	sys_semop(struct proc *, void *, register_t *);
 #else
 #endif
-int	t32_sys_stat(struct proc *, void *, register_t *);
-int	t32_sys_fstat(struct proc *, void *, register_t *);
-int	t32_sys_lstat(struct proc *, void *, register_t *);
 int	sys_fhstat(struct proc *, void *, register_t *);
 #ifdef SYSVSEM
 int	sys___semctl(struct proc *, void *, register_t *);
@@ -1411,7 +1265,6 @@ int	sys_msgctl(struct proc *, void *, register_t *);
 #endif
 int	sys_sched_yield(struct proc *, void *, register_t *);
 int	sys_getthrid(struct proc *, void *, register_t *);
-int	t32_sys___thrsleep(struct proc *, void *, register_t *);
 int	sys___thrwakeup(struct proc *, void *, register_t *);
 int	sys___threxit(struct proc *, void *, register_t *);
 int	sys___thrsigdivert(struct proc *, void *, register_t *);
@@ -1419,11 +1272,9 @@ int	sys___getcwd(struct proc *, void *, register_t *);
 int	sys_adjfreq(struct proc *, void *, register_t *);
 int	sys_setrtable(struct proc *, void *, register_t *);
 int	sys_getrtable(struct proc *, void *, register_t *);
-int	t32_sys_getdirentries(struct proc *, void *, register_t *);
 int	sys_faccessat(struct proc *, void *, register_t *);
 int	sys_fchmodat(struct proc *, void *, register_t *);
 int	sys_fchownat(struct proc *, void *, register_t *);
-int	t32_sys_fstatat(struct proc *, void *, register_t *);
 int	sys_linkat(struct proc *, void *, register_t *);
 int	sys_mkdirat(struct proc *, void *, register_t *);
 int	sys_mkfifoat(struct proc *, void *, register_t *);
@@ -1433,7 +1284,5 @@ int	sys_readlinkat(struct proc *, void *, register_t *);
 int	sys_renameat(struct proc *, void *, register_t *);
 int	sys_symlinkat(struct proc *, void *, register_t *);
 int	sys_unlinkat(struct proc *, void *, register_t *);
-int	t32_sys_utimensat(struct proc *, void *, register_t *);
-int	t32_sys_futimens(struct proc *, void *, register_t *);
 int	sys___set_tcb(struct proc *, void *, register_t *);
 int	sys___get_tcb(struct proc *, void *, register_t *);