regen

8 files changed, 468 insertions, 288 deletions

diff --git a/sys/compat/linux/linux_syscall.h b/sys/compat/linux/linux_syscall.h
index 2669e965fa4..9107ecf3cea 100644
--- a/sys/compat/linux/linux_syscall.h
+++ b/sys/compat/linux/linux_syscall.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: linux_syscall.h,v 1.74 2012/06/19 11:35:56 pirofti Exp $	*/
+/*	$OpenBSD: linux_syscall.h,v 1.75 2013/08/13 05:54:10 guenther Exp $	*/
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.70 2012/06/19 11:31:39 pirofti Exp 
+ * created from	OpenBSD: syscalls.master,v 1.72 2013/08/13 05:52:22 guenther Exp 
  */
 
 /* syscall: "syscall" ret: "int" args: */
@@ -502,7 +502,7 @@
 /* syscall: "sched_rr_get_interval" ret: "int" args: */
 #define	LINUX_SYS_sched_rr_get_interval	161
 
-/* syscall: "nanosleep" ret: "int" args: "const struct timespec *" "struct timespec *" */
+/* syscall: "nanosleep" ret: "int" args: "const struct timespec32 *" "struct timespec32 *" */
 #define	LINUX_SYS_nanosleep	162
 
 /* syscall: "mremap" ret: "int" args: "void *" "size_t" "size_t" "long" */
diff --git a/sys/compat/linux/linux_syscallargs.h b/sys/compat/linux/linux_syscallargs.h
index 346f91db0f0..cd40b749fda 100644
--- a/sys/compat/linux/linux_syscallargs.h
+++ b/sys/compat/linux/linux_syscallargs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: linux_syscallargs.h,v 1.76 2012/06/19 11:35:56 pirofti Exp $	*/
+/*	$OpenBSD: linux_syscallargs.h,v 1.77 2013/08/13 05:54:10 guenther Exp $	*/
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.70 2012/06/19 11:31:39 pirofti Exp 
+ * created from	OpenBSD: syscalls.master,v 1.72 2013/08/13 05:52:22 guenther Exp 
  */
 
 #ifdef	syscallarg
@@ -733,7 +733,7 @@ int	linux_sys_sethostname(struct proc *, void *, register_t *);
 int	linux_sys_setrlimit(struct proc *, void *, register_t *);
 int	linux_sys_getrlimit(struct proc *, void *, register_t *);
 int	sys_getrusage(struct proc *, void *, register_t *);
-int	sys_gettimeofday(struct proc *, void *, register_t *);
+int	t32_sys_gettimeofday(struct proc *, void *, register_t *);
 int	sys_settimeofday(struct proc *, void *, register_t *);
 int	sys_getgroups(struct proc *, void *, register_t *);
 int	sys_setgroups(struct proc *, void *, register_t *);
@@ -829,7 +829,7 @@ int	linux_sys_sched_yield(struct proc *, void *, register_t *);
 int	linux_sys_sched_get_priority_max(struct proc *, void *, register_t *);
 int	linux_sys_sched_get_priority_min(struct proc *, void *, register_t *);
 int	linux_sys_sched_rr_get_interval(struct proc *, void *, register_t *);
-int	sys_nanosleep(struct proc *, void *, register_t *);
+int	t32_sys_nanosleep(struct proc *, void *, register_t *);
 int	linux_sys_mremap(struct proc *, void *, register_t *);
 int	linux_sys_setresuid16(struct proc *, void *, register_t *);
 int	linux_sys_getresuid16(struct proc *, void *, register_t *);
diff --git a/sys/compat/linux/linux_syscalls.c b/sys/compat/linux/linux_syscalls.c
index df98ec3106b..1539a65b53b 100644
--- a/sys/compat/linux/linux_syscalls.c
+++ b/sys/compat/linux/linux_syscalls.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: linux_syscalls.c,v 1.74 2012/06/19 11:35:56 pirofti Exp $	*/
+/*	$OpenBSD: linux_syscalls.c,v 1.75 2013/08/13 05:54:11 guenther Exp $	*/
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.70 2012/06/19 11:31:39 pirofti Exp 
+ * created from	OpenBSD: syscalls.master,v 1.72 2013/08/13 05:52:22 guenther Exp 
  */
 
 char *linux_syscallnames[] = {
diff --git a/sys/compat/linux/linux_sysent.c b/sys/compat/linux/linux_sysent.c
index 6dc6eec7431..df75c3513d5 100644
--- a/sys/compat/linux/linux_sysent.c
+++ b/sys/compat/linux/linux_sysent.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: linux_sysent.c,v 1.75 2012/06/19 11:35:56 pirofti Exp $	*/
+/*	$OpenBSD: linux_sysent.c,v 1.76 2013/08/13 05:54:11 guenther Exp $	*/
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.70 2012/06/19 11:31:39 pirofti Exp 
+ * created from	OpenBSD: syscalls.master,v 1.72 2013/08/13 05:52:22 guenther Exp 
  */
 
 #include <sys/param.h>
@@ -187,8 +187,8 @@ struct sysent linux_sysent[] = {
 	    linux_sys_getrlimit },		/* 76 = getrlimit */
 	{ 2, s(struct sys_getrusage_args), 0,
 	    sys_getrusage },			/* 77 = getrusage */
-	{ 2, s(struct sys_gettimeofday_args), 0,
-	    sys_gettimeofday },			/* 78 = gettimeofday */
+	{ 2, s(struct t32_sys_gettimeofday_args), 0,
+	    t32_sys_gettimeofday },		/* 78 = gettimeofday */
 	{ 2, s(struct sys_settimeofday_args), 0,
 	    sys_settimeofday },			/* 79 = settimeofday */
 	{ 2, s(struct sys_getgroups_args), 0,
@@ -370,8 +370,8 @@ struct sysent linux_sysent[] = {
 	    linux_sys_sched_get_priority_min },	/* 160 = sched_get_priority_min */
 	{ 0, 0, 0,
 	    linux_sys_sched_rr_get_interval },	/* 161 = sched_rr_get_interval */
-	{ 2, s(struct sys_nanosleep_args), 0,
-	    sys_nanosleep },			/* 162 = nanosleep */
+	{ 2, s(struct t32_sys_nanosleep_args), 0,
+	    t32_sys_nanosleep },		/* 162 = nanosleep */
 	{ 4, s(struct linux_sys_mremap_args), 0,
 	    linux_sys_mremap },			/* 163 = mremap */
 	{ 3, s(struct linux_sys_setresuid16_args), 0,
diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index 41e64fdfbd9..90e96444f70 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: init_sysent.c,v 1.145 2013/06/09 13:10:27 miod Exp $	*/
+/*	$OpenBSD: init_sysent.c,v 1.146 2013/08/13 05:54:10 guenther Exp $	*/
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.133 2013/06/09 13:10:19 miod Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.134 2013/08/13 05:52:24 guenther Exp 
  */
 
 #include <sys/param.h>
@@ -27,6 +27,12 @@
 #define compat_o53(func) sys_nosys
 #endif
 
+#ifdef T32
+#define t32(func) __CONCAT(t32_,func)
+#else
+#define t32(func) sys_nosys
+#endif
+
 #define	s(type)	sizeof(type)
 
 struct sysent sysent[] = {
@@ -44,16 +50,16 @@ struct sysent sysent[] = {
 	    sys_open },				/* 5 = open */
 	{ 1, s(struct sys_close_args), 0,
 	    sys_close },			/* 6 = close */
-	{ 4, s(struct sys_wait4_args), 0,
-	    sys_wait4 },			/* 7 = wait4 */
+	{ 4, s(struct t32_sys_wait4_args), 0,
+	    t32(sys_wait4) },			/* 7 = t32 wait4 */
 	{ 2, s(struct sys___tfork_args), 0,
 	    sys___tfork },			/* 8 = __tfork */
 	{ 2, s(struct sys_link_args), 0,
 	    sys_link },				/* 9 = link */
 	{ 1, s(struct sys_unlink_args), 0,
 	    sys_unlink },			/* 10 = unlink */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 11 = obsolete execv */
+	{ 4, s(struct sys_wait4_args), 0,
+	    sys_wait4 },			/* 11 = wait4 */
 	{ 1, s(struct sys_chdir_args), 0,
 	    sys_chdir },			/* 12 = chdir */
 	{ 1, s(struct sys_fchdir_args), 0,
@@ -68,8 +74,8 @@ struct sysent sysent[] = {
 	    sys_obreak },			/* 17 = break */
 	{ 0, 0, 0,
 	    sys_getdtablecount },		/* 18 = getdtablecount */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 19 = obsolete olseek */
+	{ 2, s(struct sys_getrusage_args), 0,
+	    sys_getrusage },			/* 19 = getrusage */
 	{ 0, 0, SY_NOLOCK | 0,
 	    sys_getpid },			/* 20 = getpid */
 	{ 4, s(struct sys_mount_args), 0,
@@ -111,16 +117,16 @@ struct sysent sysent[] = {
 	    sys_sync },				/* 36 = sync */
 	{ 2, s(struct sys_kill_args), 0,
 	    sys_kill },				/* 37 = kill */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 38 = obsolete stat43 */
+	{ 2, s(struct sys_stat_args), 0,
+	    sys_stat },				/* 38 = stat */
 	{ 0, 0, 0,
 	    sys_getppid },			/* 39 = getppid */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 40 = obsolete lstat43 */
+	{ 2, s(struct sys_lstat_args), 0,
+	    sys_lstat },			/* 40 = lstat */
 	{ 1, s(struct sys_dup_args), 0,
 	    sys_dup },				/* 41 = dup */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 42 = obsolete opipe */
+	{ 4, s(struct sys_fstatat_args), 0,
+	    sys_fstatat },			/* 42 = fstatat */
 	{ 0, 0, 0,
 	    sys_getegid },			/* 43 = getegid */
 	{ 4, s(struct sys_profil_args), 0,
@@ -151,8 +157,8 @@ struct sysent sysent[] = {
 #endif
 	{ 0, 0, 0,
 	    sys_sigpending },			/* 52 = sigpending */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 53 = obsolete osigaltstack */
+	{ 2, s(struct sys_fstat_args), 0,
+	    sys_fstat },			/* 53 = fstat */
 	{ 3, s(struct sys_ioctl_args), 0,
 	    sys_ioctl },			/* 54 = ioctl */
 	{ 1, s(struct sys_reboot_args), 0,
@@ -179,28 +185,28 @@ struct sysent sysent[] = {
 	    sys_fhstatfs },			/* 65 = fhstatfs */
 	{ 0, 0, 0,
 	    sys_vfork },			/* 66 = vfork */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 67 = obsolete vread */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 68 = obsolete vwrite */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 69 = obsolete sbrk */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 70 = obsolete sstk */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 71 = obsolete ommap */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 72 = obsolete vadvise */
+	{ 2, s(struct sys_gettimeofday_args), SY_NOLOCK | 0,
+	    sys_gettimeofday },			/* 67 = gettimeofday */
+	{ 2, s(struct sys_settimeofday_args), 0,
+	    sys_settimeofday },			/* 68 = settimeofday */
+	{ 3, s(struct sys_setitimer_args), 0,
+	    sys_setitimer },			/* 69 = setitimer */
+	{ 2, s(struct sys_getitimer_args), 0,
+	    sys_getitimer },			/* 70 = getitimer */
+	{ 5, s(struct sys_select_args), 0,
+	    sys_select },			/* 71 = select */
+	{ 6, s(struct sys_kevent_args), 0,
+	    sys_kevent },			/* 72 = kevent */
 	{ 2, s(struct sys_munmap_args), 0,
 	    sys_munmap },			/* 73 = munmap */
 	{ 3, s(struct sys_mprotect_args), 0,
 	    sys_mprotect },			/* 74 = mprotect */
 	{ 3, s(struct sys_madvise_args), 0,
 	    sys_madvise },			/* 75 = madvise */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 76 = obsolete vhangup */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 77 = obsolete vlimit */
+	{ 2, s(struct sys_utimes_args), 0,
+	    sys_utimes },			/* 76 = utimes */
+	{ 2, s(struct sys_futimes_args), 0,
+	    sys_futimes },			/* 77 = futimes */
 	{ 3, s(struct sys_mincore_args), 0,
 	    sys_mincore },			/* 78 = mincore */
 	{ 2, s(struct sys_getgroups_args), 0,
@@ -211,30 +217,30 @@ struct sysent sysent[] = {
 	    sys_getpgrp },			/* 81 = getpgrp */
 	{ 2, s(struct sys_setpgid_args), 0,
 	    sys_setpgid },			/* 82 = setpgid */
-	{ 3, s(struct sys_setitimer_args), 0,
-	    sys_setitimer },			/* 83 = setitimer */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 84 = obsolete owait */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 85 = obsolete swapon25 */
-	{ 2, s(struct sys_getitimer_args), 0,
-	    sys_getitimer },			/* 86 = getitimer */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 87 = obsolete ogethostname */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 88 = obsolete osethostname */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 89 = obsolete ogetdtablesize */
+	{ 3, s(struct t32_sys_setitimer_args), 0,
+	    t32(sys_setitimer) },		/* 83 = 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 */
+	{ 2, s(struct sys_clock_gettime_args), SY_NOLOCK | 0,
+	    sys_clock_gettime },		/* 87 = clock_gettime */
+	{ 2, s(struct sys_clock_settime_args), 0,
+	    sys_clock_settime },		/* 88 = clock_settime */
+	{ 2, s(struct sys_clock_getres_args), SY_NOLOCK | 0,
+	    sys_clock_getres },			/* 89 = clock_getres */
 	{ 2, s(struct sys_dup2_args), 0,
 	    sys_dup2 },				/* 90 = dup2 */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 91 = unimplemented getdopt */
+	{ 2, s(struct sys_nanosleep_args), SY_NOLOCK | 0,
+	    sys_nanosleep },			/* 91 = nanosleep */
 	{ 3, s(struct sys_fcntl_args), 0,
 	    sys_fcntl },			/* 92 = fcntl */
-	{ 5, s(struct sys_select_args), 0,
-	    sys_select },			/* 93 = select */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 94 = unimplemented setdopt */
+	{ 5, s(struct t32_sys_select_args), 0,
+	    t32(sys_select) },			/* 93 = t32 select */
+	{ 5, s(struct sys___thrsleep_args), 0,
+	    sys___thrsleep },			/* 94 = __thrsleep */
 	{ 1, s(struct sys_fsync_args), 0,
 	    sys_fsync },			/* 95 = fsync */
 	{ 3, s(struct sys_setpriority_args), 0,
@@ -243,8 +249,8 @@ struct sysent sysent[] = {
 	    sys_socket },			/* 97 = socket */
 	{ 3, s(struct sys_connect_args), 0,
 	    sys_connect },			/* 98 = connect */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 99 = obsolete oaccept */
+	{ 3, s(struct sys_getdents_args), 0,
+	    sys_getdents },			/* 99 = getdents */
 	{ 2, s(struct sys_getpriority_args), 0,
 	    sys_getpriority },			/* 100 = getpriority */
 	{ 0, 0, 0,
@@ -277,10 +283,10 @@ struct sysent sysent[] = {
 	    sys_nosys },			/* 114 = obsolete osendmsg */
 	{ 0, 0, 0,
 	    sys_nosys },			/* 115 = obsolete vtrace */
-	{ 2, s(struct sys_gettimeofday_args), SY_NOLOCK | 0,
-	    sys_gettimeofday },			/* 116 = gettimeofday */
-	{ 2, s(struct sys_getrusage_args), 0,
-	    sys_getrusage },			/* 117 = getrusage */
+	{ 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 */
 	{ 5, s(struct sys_getsockopt_args), 0,
 	    sys_getsockopt },			/* 118 = getsockopt */
 	{ 0, 0, 0,
@@ -289,8 +295,8 @@ struct sysent sysent[] = {
 	    sys_readv },			/* 120 = readv */
 	{ 3, s(struct sys_writev_args), 0,
 	    sys_writev },			/* 121 = writev */
-	{ 2, s(struct sys_settimeofday_args), 0,
-	    sys_settimeofday },			/* 122 = settimeofday */
+	{ 2, s(struct t32_sys_settimeofday_args), 0,
+	    t32(sys_settimeofday) },		/* 122 = t32 settimeofday */
 	{ 3, s(struct sys_fchown_args), 0,
 	    sys_fchown },			/* 123 = fchown */
 	{ 2, s(struct sys_fchmod_args), 0,
@@ -321,8 +327,8 @@ struct sysent sysent[] = {
 	    sys_mkdir },			/* 136 = mkdir */
 	{ 1, s(struct sys_rmdir_args), 0,
 	    sys_rmdir },			/* 137 = rmdir */
-	{ 2, s(struct sys_utimes_args), 0,
-	    sys_utimes },			/* 138 = utimes */
+	{ 2, s(struct t32_sys_utimes_args), 0,
+	    t32(sys_utimes) },			/* 138 = t32 utimes */
 	{ 0, 0, 0,
 	    sys_nosys },			/* 139 = obsolete 4.2 sigreturn */
 	{ 2, s(struct sys_adjtime_args), 0,
@@ -462,8 +468,8 @@ struct sysent sysent[] = {
 	    sys_munlock },			/* 204 = munlock */
 	{ 0, 0, 0,
 	    sys_nosys },			/* 205 = unimplemented sys_undelete */
-	{ 2, s(struct sys_futimes_args), 0,
-	    sys_futimes },			/* 206 = futimes */
+	{ 2, s(struct t32_sys_futimes_args), 0,
+	    t32(sys_futimes) },			/* 206 = t32 futimes */
 	{ 1, s(struct sys_getpgid_args), 0,
 	    sys_getpgid },			/* 207 = getpgid */
 	{ 0, 0, 0,
@@ -564,12 +570,12 @@ struct sysent sysent[] = {
 #endif
 	{ 0, 0, 0,
 	    sys_nosys },			/* 231 = obsolete shmget35 */
-	{ 2, s(struct sys_clock_gettime_args), SY_NOLOCK | 0,
-	    sys_clock_gettime },		/* 232 = clock_gettime */
-	{ 2, s(struct sys_clock_settime_args), 0,
-	    sys_clock_settime },		/* 233 = clock_settime */
-	{ 2, s(struct sys_clock_getres_args), SY_NOLOCK | 0,
-	    sys_clock_getres },			/* 234 = clock_getres */
+	{ 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 },			/* 235 = unimplemented timer_create */
 	{ 0, 0, 0,
@@ -580,8 +586,8 @@ struct sysent sysent[] = {
 	    sys_nosys },			/* 238 = unimplemented timer_gettime */
 	{ 0, 0, 0,
 	    sys_nosys },			/* 239 = unimplemented timer_getoverrun */
-	{ 2, s(struct sys_nanosleep_args), SY_NOLOCK | 0,
-	    sys_nanosleep },			/* 240 = nanosleep */
+	{ 2, s(struct t32_sys_nanosleep_args), SY_NOLOCK | 0,
+	    t32(sys_nanosleep) },		/* 240 = t32 nanosleep */
 	{ 0, 0, 0,
 	    sys_nosys },			/* 241 = unimplemented */
 	{ 0, 0, 0,
@@ -640,8 +646,8 @@ struct sysent sysent[] = {
 	    sys_pwritev },			/* 268 = pwritev */
 	{ 0, 0, 0,
 	    sys_kqueue },			/* 269 = kqueue */
-	{ 6, s(struct sys_kevent_args), 0,
-	    sys_kevent },			/* 270 = kevent */
+	{ 6, s(struct t32_sys_kevent_args), 0,
+	    t32(sys_kevent) },			/* 270 = t32 kevent */
 	{ 1, s(struct sys_mlockall_args), 0,
 	    sys_mlockall },			/* 271 = mlockall */
 	{ 0, 0, 0,
@@ -692,12 +698,12 @@ struct sysent sysent[] = {
 	{ 0, 0, 0,
 	    sys_nosys },			/* 290 = unimplemented semop */
 #endif
-	{ 2, s(struct sys_stat_args), 0,
-	    sys_stat },				/* 291 = stat */
-	{ 2, s(struct sys_fstat_args), 0,
-	    sys_fstat },			/* 292 = fstat */
-	{ 2, s(struct sys_lstat_args), 0,
-	    sys_lstat },			/* 293 = lstat */
+	{ 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 */
 	{ 2, s(struct sys_fhstat_args), 0,
 	    sys_fhstat },			/* 294 = fhstat */
 #ifdef SYSVSEM
@@ -725,8 +731,8 @@ struct sysent sysent[] = {
 	    sys_sched_yield },			/* 298 = sched_yield */
 	{ 0, 0, SY_NOLOCK | 0,
 	    sys_getthrid },			/* 299 = getthrid */
-	{ 5, s(struct sys___thrsleep_args), 0,
-	    sys___thrsleep },			/* 300 = __thrsleep */
+	{ 5, s(struct t32_sys___thrsleep_args), 0,
+	    t32(sys___thrsleep) },		/* 300 = t32 __thrsleep */
 	{ 2, s(struct sys___thrwakeup_args), 0,
 	    sys___thrwakeup },			/* 301 = __thrwakeup */
 	{ 1, s(struct sys___threxit_args), 0,
@@ -749,16 +755,16 @@ struct sysent sysent[] = {
 	    sys_setrtable },			/* 310 = setrtable */
 	{ 0, 0, 0,
 	    sys_getrtable },			/* 311 = getrtable */
-	{ 4, s(struct sys_getdirentries_args), 0,
-	    sys_getdirentries },		/* 312 = getdirentries */
+	{ 4, s(struct t32_sys_getdirentries_args), 0,
+	    t32(sys_getdirentries) },		/* 312 = 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 sys_fstatat_args), 0,
-	    sys_fstatat },			/* 316 = fstatat */
+	{ 4, s(struct t32_sys_fstatat_args), 0,
+	    t32(sys_fstatat) },			/* 316 = t32 fstatat */
 	{ 5, s(struct sys_linkat_args), 0,
 	    sys_linkat },			/* 317 = linkat */
 	{ 3, s(struct sys_mkdirat_args), 0,
@@ -777,10 +783,10 @@ struct sysent sysent[] = {
 	    sys_symlinkat },			/* 324 = symlinkat */
 	{ 3, s(struct sys_unlinkat_args), 0,
 	    sys_unlinkat },			/* 325 = unlinkat */
-	{ 4, s(struct sys_utimensat_args), 0,
-	    sys_utimensat },			/* 326 = utimensat */
-	{ 2, s(struct sys_futimens_args), 0,
-	    sys_futimens },			/* 327 = futimens */
+	{ 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 */
 	{ 1, s(struct compat_o51_sys___tfork_args), 0,
 	    compat_o51(sys___tfork) },		/* 328 = compat_o51 __tfork */
 	{ 1, s(struct sys___set_tcb_args), SY_NOLOCK | 0,
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index eef2d80d2e4..0a4d143c469 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscalls.c,v 1.146 2013/06/09 13:10:27 miod Exp $	*/
+/*	$OpenBSD: syscalls.c,v 1.147 2013/08/13 05:54:10 guenther Exp $	*/
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.133 2013/06/09 13:10:19 miod Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.134 2013/08/13 05:52:24 guenther Exp 
  */
 
 char *syscallnames[] = {
@@ -15,11 +15,11 @@ char *syscallnames[] = {
 	"write",			/* 4 = write */
 	"open",			/* 5 = open */
 	"close",			/* 6 = close */
-	"wait4",			/* 7 = wait4 */
+	"t32_wait4",	/* 7 = t32 wait4 */
 	"__tfork",			/* 8 = __tfork */
 	"link",			/* 9 = link */
 	"unlink",			/* 10 = unlink */
-	"#11 (obsolete execv)",		/* 11 = obsolete execv */
+	"wait4",			/* 11 = wait4 */
 	"chdir",			/* 12 = chdir */
 	"fchdir",			/* 13 = fchdir */
 	"mknod",			/* 14 = mknod */
@@ -27,7 +27,7 @@ char *syscallnames[] = {
 	"chown",			/* 16 = chown */
 	"break",			/* 17 = break */
 	"getdtablecount",			/* 18 = getdtablecount */
-	"#19 (obsolete olseek)",		/* 19 = obsolete olseek */
+	"getrusage",			/* 19 = getrusage */
 	"getpid",			/* 20 = getpid */
 	"mount",			/* 21 = mount */
 	"unmount",			/* 22 = unmount */
@@ -50,11 +50,11 @@ char *syscallnames[] = {
 	"fchflags",			/* 35 = fchflags */
 	"sync",			/* 36 = sync */
 	"kill",			/* 37 = kill */
-	"#38 (obsolete stat43)",		/* 38 = obsolete stat43 */
+	"stat",			/* 38 = stat */
 	"getppid",			/* 39 = getppid */
-	"#40 (obsolete lstat43)",		/* 40 = obsolete lstat43 */
+	"lstat",			/* 40 = lstat */
 	"dup",			/* 41 = dup */
-	"#42 (obsolete opipe)",		/* 42 = obsolete opipe */
+	"fstatat",			/* 42 = fstatat */
 	"getegid",			/* 43 = getegid */
 	"profil",			/* 44 = profil */
 #ifdef KTRACE
@@ -73,7 +73,7 @@ char *syscallnames[] = {
 	"#51 (unimplemented acct)",		/* 51 = unimplemented acct */
 #endif
 	"sigpending",			/* 52 = sigpending */
-	"#53 (obsolete osigaltstack)",		/* 53 = obsolete osigaltstack */
+	"fstat",			/* 53 = fstat */
 	"ioctl",			/* 54 = ioctl */
 	"reboot",			/* 55 = reboot */
 	"revoke",			/* 56 = revoke */
@@ -87,39 +87,39 @@ char *syscallnames[] = {
 	"fstatfs",			/* 64 = fstatfs */
 	"fhstatfs",			/* 65 = fhstatfs */
 	"vfork",			/* 66 = vfork */
-	"#67 (obsolete vread)",		/* 67 = obsolete vread */
-	"#68 (obsolete vwrite)",		/* 68 = obsolete vwrite */
-	"#69 (obsolete sbrk)",		/* 69 = obsolete sbrk */
-	"#70 (obsolete sstk)",		/* 70 = obsolete sstk */
-	"#71 (obsolete ommap)",		/* 71 = obsolete ommap */
-	"#72 (obsolete vadvise)",		/* 72 = obsolete vadvise */
+	"gettimeofday",			/* 67 = gettimeofday */
+	"settimeofday",			/* 68 = settimeofday */
+	"setitimer",			/* 69 = setitimer */
+	"getitimer",			/* 70 = getitimer */
+	"select",			/* 71 = select */
+	"kevent",			/* 72 = kevent */
 	"munmap",			/* 73 = munmap */
 	"mprotect",			/* 74 = mprotect */
 	"madvise",			/* 75 = madvise */
-	"#76 (obsolete vhangup)",		/* 76 = obsolete vhangup */
-	"#77 (obsolete vlimit)",		/* 77 = obsolete vlimit */
+	"utimes",			/* 76 = utimes */
+	"futimes",			/* 77 = futimes */
 	"mincore",			/* 78 = mincore */
 	"getgroups",			/* 79 = getgroups */
 	"setgroups",			/* 80 = setgroups */
 	"getpgrp",			/* 81 = getpgrp */
 	"setpgid",			/* 82 = setpgid */
-	"setitimer",			/* 83 = setitimer */
-	"#84 (obsolete owait)",		/* 84 = obsolete owait */
-	"#85 (obsolete swapon25)",		/* 85 = obsolete swapon25 */
-	"getitimer",			/* 86 = getitimer */
-	"#87 (obsolete ogethostname)",		/* 87 = obsolete ogethostname */
-	"#88 (obsolete osethostname)",		/* 88 = obsolete osethostname */
-	"#89 (obsolete ogetdtablesize)",		/* 89 = obsolete ogetdtablesize */
+	"t32_setitimer",	/* 83 = t32 setitimer */
+	"utimensat",			/* 84 = utimensat */
+	"futimens",			/* 85 = futimens */
+	"t32_getitimer",	/* 86 = t32 getitimer */
+	"clock_gettime",			/* 87 = clock_gettime */
+	"clock_settime",			/* 88 = clock_settime */
+	"clock_getres",			/* 89 = clock_getres */
 	"dup2",			/* 90 = dup2 */
-	"#91 (unimplemented getdopt)",		/* 91 = unimplemented getdopt */
+	"nanosleep",			/* 91 = nanosleep */
 	"fcntl",			/* 92 = fcntl */
-	"select",			/* 93 = select */
-	"#94 (unimplemented setdopt)",		/* 94 = unimplemented setdopt */
+	"t32_select",	/* 93 = t32 select */
+	"__thrsleep",			/* 94 = __thrsleep */
 	"fsync",			/* 95 = fsync */
 	"setpriority",			/* 96 = setpriority */
 	"socket",			/* 97 = socket */
 	"connect",			/* 98 = connect */
-	"#99 (obsolete oaccept)",		/* 99 = obsolete oaccept */
+	"getdents",			/* 99 = getdents */
 	"getpriority",			/* 100 = getpriority */
 	"#101 (obsolete osend)",		/* 101 = obsolete osend */
 	"#102 (obsolete orecv)",		/* 102 = obsolete orecv */
@@ -136,13 +136,13 @@ char *syscallnames[] = {
 	"#113 (obsolete orecvmsg)",		/* 113 = obsolete orecvmsg */
 	"#114 (obsolete osendmsg)",		/* 114 = obsolete osendmsg */
 	"#115 (obsolete vtrace)",		/* 115 = obsolete vtrace */
-	"gettimeofday",			/* 116 = gettimeofday */
-	"getrusage",			/* 117 = getrusage */
+	"t32_gettimeofday",	/* 116 = t32 gettimeofday */
+	"t32_getrusage",	/* 117 = t32 getrusage */
 	"getsockopt",			/* 118 = getsockopt */
 	"#119 (obsolete resuba)",		/* 119 = obsolete resuba */
 	"readv",			/* 120 = readv */
 	"writev",			/* 121 = writev */
-	"settimeofday",			/* 122 = settimeofday */
+	"t32_settimeofday",	/* 122 = 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 */
-	"utimes",			/* 138 = utimes */
+	"t32_utimes",	/* 138 = 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 */
-	"futimes",			/* 206 = futimes */
+	"t32_futimes",	/* 206 = 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 */
-	"clock_gettime",			/* 232 = clock_gettime */
-	"clock_settime",			/* 233 = clock_settime */
-	"clock_getres",			/* 234 = clock_getres */
+	"t32_clock_gettime",	/* 232 = t32 clock_gettime */
+	"t32_clock_settime",	/* 233 = t32 clock_settime */
+	"t32_clock_getres",	/* 234 = 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 */
-	"nanosleep",			/* 240 = nanosleep */
+	"t32_nanosleep",	/* 240 = 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 */
-	"kevent",			/* 270 = kevent */
+	"t32_kevent",	/* 270 = 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
-	"stat",			/* 291 = stat */
-	"fstat",			/* 292 = fstat */
-	"lstat",			/* 293 = lstat */
+	"t32_stat",	/* 291 = t32 stat */
+	"t32_fstat",	/* 292 = t32 fstat */
+	"t32_lstat",	/* 293 = 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 */
-	"__thrsleep",			/* 300 = __thrsleep */
+	"t32___thrsleep",	/* 300 = t32 __thrsleep */
 	"__thrwakeup",			/* 301 = __thrwakeup */
 	"__threxit",			/* 302 = __threxit */
 	"__thrsigdivert",			/* 303 = __thrsigdivert */
@@ -387,11 +387,11 @@ char *syscallnames[] = {
 	"compat_o53_fhstatfs",	/* 309 = compat_o53 fhstatfs */
 	"setrtable",			/* 310 = setrtable */
 	"getrtable",			/* 311 = getrtable */
-	"getdirentries",			/* 312 = getdirentries */
+	"t32_getdirentries",	/* 312 = t32 getdirentries */
 	"faccessat",			/* 313 = faccessat */
 	"fchmodat",			/* 314 = fchmodat */
 	"fchownat",			/* 315 = fchownat */
-	"fstatat",			/* 316 = fstatat */
+	"t32_fstatat",	/* 316 = 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 */
-	"utimensat",			/* 326 = utimensat */
-	"futimens",			/* 327 = futimens */
+	"t32_utimensat",	/* 326 = t32 utimensat */
+	"t32_futimens",	/* 327 = t32 futimens */
 	"compat_o51___tfork",	/* 328 = compat_o51 __tfork */
 	"__set_tcb",			/* 329 = __set_tcb */
 	"__get_tcb",			/* 330 = __get_tcb */
diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index 0d55d50b5b6..68ada271bab 100644
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscall.h,v 1.145 2013/06/09 13:10:27 miod Exp $	*/
+/*	$OpenBSD: syscall.h,v 1.146 2013/08/13 05:54:10 guenther Exp $	*/
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.133 2013/06/09 13:10:19 miod Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.134 2013/08/13 05:52:24 guenther Exp 
  */
 
 /* syscall: "syscall" ret: "int" args: "int" "..." */
@@ -28,8 +28,7 @@
 /* syscall: "close" ret: "int" args: "int" */
 #define	SYS_close	6
 
-/* syscall: "wait4" ret: "pid_t" args: "pid_t" "int *" "int" "struct rusage *" */
-#define	SYS_wait4	7
+				/* 7 is t32 wait4 */
 
 /* syscall: "__tfork" ret: "int" args: "const struct __tfork *" "size_t" */
 #define	SYS___tfork	8
@@ -40,7 +39,9 @@
 /* syscall: "unlink" ret: "int" args: "const char *" */
 #define	SYS_unlink	10
 
-				/* 11 is obsolete execv */
+/* syscall: "wait4" ret: "pid_t" args: "pid_t" "int *" "int" "struct rusage *" */
+#define	SYS_wait4	11
+
 /* syscall: "chdir" ret: "int" args: "const char *" */
 #define	SYS_chdir	12
 
@@ -62,7 +63,9 @@
 /* syscall: "getdtablecount" ret: "int" args: */
 #define	SYS_getdtablecount	18
 
-				/* 19 is obsolete olseek */
+/* syscall: "getrusage" ret: "int" args: "int" "struct rusage *" */
+#define	SYS_getrusage	19
+
 /* syscall: "getpid" ret: "pid_t" args: */
 #define	SYS_getpid	20
 
@@ -117,15 +120,21 @@
 /* syscall: "kill" ret: "int" args: "int" "int" */
 #define	SYS_kill	37
 
-				/* 38 is obsolete stat43 */
+/* syscall: "stat" ret: "int" args: "const char *" "struct stat *" */
+#define	SYS_stat	38
+
 /* syscall: "getppid" ret: "pid_t" args: */
 #define	SYS_getppid	39
 
-				/* 40 is obsolete lstat43 */
+/* syscall: "lstat" ret: "int" args: "const char *" "struct stat *" */
+#define	SYS_lstat	40
+
 /* syscall: "dup" ret: "int" args: "int" */
 #define	SYS_dup	41
 
-				/* 42 is obsolete opipe */
+/* syscall: "fstatat" ret: "int" args: "int" "const char *" "struct stat *" "int" */
+#define	SYS_fstatat	42
+
 /* syscall: "getegid" ret: "gid_t" args: */
 #define	SYS_getegid	43
 
@@ -156,7 +165,9 @@
 /* syscall: "sigpending" ret: "int" args: */
 #define	SYS_sigpending	52
 
-				/* 53 is obsolete osigaltstack */
+/* syscall: "fstat" ret: "int" args: "int" "struct stat *" */
+#define	SYS_fstat	53
+
 /* syscall: "ioctl" ret: "int" args: "int" "u_long" "..." */
 #define	SYS_ioctl	54
 
@@ -196,12 +207,24 @@
 /* syscall: "vfork" ret: "int" args: */
 #define	SYS_vfork	66
 
-				/* 67 is obsolete vread */
-				/* 68 is obsolete vwrite */
-				/* 69 is obsolete sbrk */
-				/* 70 is obsolete sstk */
-				/* 71 is obsolete ommap */
-				/* 72 is obsolete vadvise */
+/* syscall: "gettimeofday" ret: "int" args: "struct timeval *" "struct timezone *" */
+#define	SYS_gettimeofday	67
+
+/* syscall: "settimeofday" ret: "int" args: "const struct timeval *" "const struct timezone *" */
+#define	SYS_settimeofday	68
+
+/* syscall: "setitimer" ret: "int" args: "int" "const struct itimerval *" "struct itimerval *" */
+#define	SYS_setitimer	69
+
+/* syscall: "getitimer" ret: "int" args: "int" "struct itimerval *" */
+#define	SYS_getitimer	70
+
+/* syscall: "select" ret: "int" args: "int" "fd_set *" "fd_set *" "fd_set *" "struct timeval *" */
+#define	SYS_select	71
+
+/* syscall: "kevent" ret: "int" args: "int" "const struct kevent *" "int" "struct kevent *" "int" "const struct timespec *" */
+#define	SYS_kevent	72
+
 /* syscall: "munmap" ret: "int" args: "void *" "size_t" */
 #define	SYS_munmap	73
 
@@ -211,8 +234,12 @@
 /* syscall: "madvise" ret: "int" args: "void *" "size_t" "int" */
 #define	SYS_madvise	75
 
-				/* 76 is obsolete vhangup */
-				/* 77 is obsolete vlimit */
+/* syscall: "utimes" ret: "int" args: "const char *" "const struct timeval *" */
+#define	SYS_utimes	76
+
+/* syscall: "futimes" ret: "int" args: "int" "const struct timeval *" */
+#define	SYS_futimes	77
+
 /* syscall: "mincore" ret: "int" args: "void *" "size_t" "char *" */
 #define	SYS_mincore	78
 
@@ -228,25 +255,38 @@
 /* syscall: "setpgid" ret: "int" args: "pid_t" "int" */
 #define	SYS_setpgid	82
 
-/* syscall: "setitimer" ret: "int" args: "int" "const struct itimerval *" "struct itimerval *" */
-#define	SYS_setitimer	83
+				/* 83 is t32 setitimer */
 
-				/* 84 is obsolete owait */
-				/* 85 is obsolete swapon25 */
-/* syscall: "getitimer" ret: "int" args: "int" "struct itimerval *" */
-#define	SYS_getitimer	86
+/* 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 */
+
+/* syscall: "clock_gettime" ret: "int" args: "clockid_t" "struct timespec *" */
+#define	SYS_clock_gettime	87
+
+/* syscall: "clock_settime" ret: "int" args: "clockid_t" "const struct timespec *" */
+#define	SYS_clock_settime	88
+
+/* syscall: "clock_getres" ret: "int" args: "clockid_t" "struct timespec *" */
+#define	SYS_clock_getres	89
 
-				/* 87 is obsolete ogethostname */
-				/* 88 is obsolete osethostname */
-				/* 89 is obsolete ogetdtablesize */
 /* syscall: "dup2" ret: "int" args: "int" "int" */
 #define	SYS_dup2	90
 
+/* syscall: "nanosleep" ret: "int" args: "const struct timespec *" "struct timespec *" */
+#define	SYS_nanosleep	91
+
 /* syscall: "fcntl" ret: "int" args: "int" "int" "..." */
 #define	SYS_fcntl	92
 
-/* syscall: "select" ret: "int" args: "int" "fd_set *" "fd_set *" "fd_set *" "struct timeval *" */
-#define	SYS_select	93
+				/* 93 is t32 select */
+
+/* syscall: "__thrsleep" ret: "int" args: "const volatile void *" "clockid_t" "const struct timespec *" "void *" "const int *" */
+#define	SYS___thrsleep	94
 
 /* syscall: "fsync" ret: "int" args: "int" */
 #define	SYS_fsync	95
@@ -260,7 +300,9 @@
 /* syscall: "connect" ret: "int" args: "int" "const struct sockaddr *" "socklen_t" */
 #define	SYS_connect	98
 
-				/* 99 is obsolete oaccept */
+/* syscall: "getdents" ret: "int" args: "int" "struct dirent *" "size_t" */
+#define	SYS_getdents	99
+
 /* syscall: "getpriority" ret: "int" args: "int" "id_t" */
 #define	SYS_getpriority	100
 
@@ -293,11 +335,9 @@
 				/* 113 is obsolete orecvmsg */
 				/* 114 is obsolete osendmsg */
 				/* 115 is obsolete vtrace */
-/* syscall: "gettimeofday" ret: "int" args: "struct timeval *" "struct timezone *" */
-#define	SYS_gettimeofday	116
+				/* 116 is t32 gettimeofday */
 
-/* syscall: "getrusage" ret: "int" args: "int" "struct rusage *" */
-#define	SYS_getrusage	117
+				/* 117 is t32 getrusage */
 
 /* syscall: "getsockopt" ret: "int" args: "int" "int" "int" "void *" "socklen_t *" */
 #define	SYS_getsockopt	118
@@ -309,8 +349,7 @@
 /* syscall: "writev" ret: "ssize_t" args: "int" "const struct iovec *" "int" */
 #define	SYS_writev	121
 
-/* syscall: "settimeofday" ret: "int" args: "const struct timeval *" "const struct timezone *" */
-#define	SYS_settimeofday	122
+				/* 122 is t32 settimeofday */
 
 /* syscall: "fchown" ret: "int" args: "int" "uid_t" "gid_t" */
 #define	SYS_fchown	123
@@ -351,8 +390,7 @@
 /* syscall: "rmdir" ret: "int" args: "const char *" */
 #define	SYS_rmdir	137
 
-/* syscall: "utimes" ret: "int" args: "const char *" "const struct timeval *" */
-#define	SYS_utimes	138
+				/* 138 is t32 utimes */
 
 				/* 139 is obsolete 4.2 sigreturn */
 /* syscall: "adjtime" ret: "int" args: "const struct timeval *" "struct timeval *" */
@@ -451,8 +489,7 @@
 /* syscall: "munlock" ret: "int" args: "const void *" "size_t" */
 #define	SYS_munlock	204
 
-/* syscall: "futimes" ret: "int" args: "int" "const struct timeval *" */
-#define	SYS_futimes	206
+				/* 206 is t32 futimes */
 
 /* syscall: "getpgid" ret: "pid_t" args: "pid_t" */
 #define	SYS_getpgid	207
@@ -482,17 +519,13 @@
 #define	SYS_shmdt	230
 
 				/* 231 is obsolete shmget35 */
-/* syscall: "clock_gettime" ret: "int" args: "clockid_t" "struct timespec *" */
-#define	SYS_clock_gettime	232
+				/* 232 is t32 clock_gettime */
 
-/* syscall: "clock_settime" ret: "int" args: "clockid_t" "const struct timespec *" */
-#define	SYS_clock_settime	233
+				/* 233 is t32 clock_settime */
 
-/* syscall: "clock_getres" ret: "int" args: "clockid_t" "struct timespec *" */
-#define	SYS_clock_getres	234
+				/* 234 is t32 clock_getres */
 
-/* syscall: "nanosleep" ret: "int" args: "const struct timespec *" "struct timespec *" */
-#define	SYS_nanosleep	240
+				/* 240 is t32 nanosleep */
 
 /* syscall: "minherit" ret: "int" args: "void *" "size_t" "int" */
 #define	SYS_minherit	250
@@ -531,8 +564,7 @@
 /* syscall: "kqueue" ret: "int" args: */
 #define	SYS_kqueue	269
 
-/* syscall: "kevent" ret: "int" args: "int" "const struct kevent *" "int" "struct kevent *" "int" "const struct timespec *" */
-#define	SYS_kevent	270
+				/* 270 is t32 kevent */
 
 /* syscall: "mlockall" ret: "int" args: "int" */
 #define	SYS_mlockall	271
@@ -568,14 +600,11 @@
 /* syscall: "semop" ret: "int" args: "int" "struct sembuf *" "size_t" */
 #define	SYS_semop	290
 
-/* syscall: "stat" ret: "int" args: "const char *" "struct stat *" */
-#define	SYS_stat	291
+				/* 291 is t32 stat */
 
-/* syscall: "fstat" ret: "int" args: "int" "struct stat *" */
-#define	SYS_fstat	292
+				/* 292 is t32 fstat */
 
-/* syscall: "lstat" ret: "int" args: "const char *" "struct stat *" */
-#define	SYS_lstat	293
+				/* 293 is t32 lstat */
 
 /* syscall: "fhstat" ret: "int" args: "const fhandle_t *" "struct stat *" */
 #define	SYS_fhstat	294
@@ -595,8 +624,7 @@
 /* syscall: "getthrid" ret: "pid_t" args: */
 #define	SYS_getthrid	299
 
-/* syscall: "__thrsleep" ret: "int" args: "const volatile void *" "clockid_t" "const struct timespec *" "void *" "const int *" */
-#define	SYS___thrsleep	300
+				/* 300 is t32 __thrsleep */
 
 /* syscall: "__thrwakeup" ret: "int" args: "const volatile void *" "int" */
 #define	SYS___thrwakeup	301
@@ -627,8 +655,7 @@
 /* syscall: "getrtable" ret: "int" args: */
 #define	SYS_getrtable	311
 
-/* syscall: "getdirentries" ret: "int" args: "int" "char *" "int" "off_t *" */
-#define	SYS_getdirentries	312
+				/* 312 is t32 getdirentries */
 
 /* syscall: "faccessat" ret: "int" args: "int" "const char *" "int" "int" */
 #define	SYS_faccessat	313
@@ -639,8 +666,7 @@
 /* syscall: "fchownat" ret: "int" args: "int" "const char *" "uid_t" "gid_t" "int" */
 #define	SYS_fchownat	315
 
-/* syscall: "fstatat" ret: "int" args: "int" "const char *" "struct stat *" "int" */
-#define	SYS_fstatat	316
+				/* 316 is t32 fstatat */
 
 /* syscall: "linkat" ret: "int" args: "int" "const char *" "int" "const char *" "int" */
 #define	SYS_linkat	317
@@ -669,11 +695,9 @@
 /* syscall: "unlinkat" ret: "int" args: "int" "const char *" "int" */
 #define	SYS_unlinkat	325
 
-/* syscall: "utimensat" ret: "int" args: "int" "const char *" "const struct timespec *" "int" */
-#define	SYS_utimensat	326
+				/* 326 is t32 utimensat */
 
-/* syscall: "futimens" ret: "int" args: "int" "const struct timespec *" */
-#define	SYS_futimens	327
+				/* 327 is t32 futimens */
 
 				/* 328 is compat_o51 __tfork */
 
diff --git a/sys/sys/syscallargs.h b/sys/sys/syscallargs.h
index 8df257445f2..6dd49846bea 100644
--- a/sys/sys/syscallargs.h
+++ b/sys/sys/syscallargs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscallargs.h,v 1.147 2013/06/09 13:10:27 miod Exp $	*/
+/*	$OpenBSD: syscallargs.h,v 1.148 2013/08/13 05:54:10 guenther Exp $	*/
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.133 2013/06/09 13:10:19 miod Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.134 2013/08/13 05:52:24 guenther Exp 
  */
 
 #ifdef	syscallarg
@@ -49,11 +49,11 @@ struct sys_close_args {
 	syscallarg(int) fd;
 };
 
-struct sys_wait4_args {
+struct t32_sys_wait4_args {
 	syscallarg(pid_t) pid;
 	syscallarg(int *) status;
 	syscallarg(int) options;
-	syscallarg(struct rusage *) rusage;
+	syscallarg(struct rusage32 *) rusage;
 };
 
 struct sys___tfork_args {
@@ -70,6 +70,13 @@ struct sys_unlink_args {
 	syscallarg(const char *) path;
 };
 
+struct sys_wait4_args {
+	syscallarg(pid_t) pid;
+	syscallarg(int *) status;
+	syscallarg(int) options;
+	syscallarg(struct rusage *) rusage;
+};
+
 struct sys_chdir_args {
 	syscallarg(const char *) path;
 };
@@ -99,6 +106,11 @@ struct sys_obreak_args {
 	syscallarg(char *) nsize;
 };
 
+struct sys_getrusage_args {
+	syscallarg(int) who;
+	syscallarg(struct rusage *) rusage;
+};
+
 struct sys_mount_args {
 	syscallarg(const char *) type;
 	syscallarg(const char *) path;
@@ -181,10 +193,27 @@ struct sys_kill_args {
 	syscallarg(int) signum;
 };
 
+struct sys_stat_args {
+	syscallarg(const char *) path;
+	syscallarg(struct stat *) ub;
+};
+
+struct sys_lstat_args {
+	syscallarg(const char *) path;
+	syscallarg(struct stat *) ub;
+};
+
 struct sys_dup_args {
 	syscallarg(int) fd;
 };
 
+struct sys_fstatat_args {
+	syscallarg(int) fd;
+	syscallarg(const char *) path;
+	syscallarg(struct stat *) buf;
+	syscallarg(int) flag;
+};
+
 struct sys_profil_args {
 	syscallarg(caddr_t) samples;
 	syscallarg(size_t) size;
@@ -223,6 +252,11 @@ struct sys_acct_args {
 	syscallarg(const char *) path;
 };
 
+struct sys_fstat_args {
+	syscallarg(int) fd;
+	syscallarg(struct stat *) sb;
+};
+
 struct sys_ioctl_args {
 	syscallarg(int) fd;
 	syscallarg(u_long) com;
@@ -283,6 +317,44 @@ struct sys_fhstatfs_args {
 	syscallarg(struct statfs *) buf;
 };
 
+struct sys_gettimeofday_args {
+	syscallarg(struct timeval *) tp;
+	syscallarg(struct timezone *) tzp;
+};
+
+struct sys_settimeofday_args {
+	syscallarg(const struct timeval *) tv;
+	syscallarg(const struct timezone *) tzp;
+};
+
+struct sys_setitimer_args {
+	syscallarg(int) which;
+	syscallarg(const struct itimerval *) itv;
+	syscallarg(struct itimerval *) oitv;
+};
+
+struct sys_getitimer_args {
+	syscallarg(int) which;
+	syscallarg(struct itimerval *) itv;
+};
+
+struct sys_select_args {
+	syscallarg(int) nd;
+	syscallarg(fd_set *) in;
+	syscallarg(fd_set *) ou;
+	syscallarg(fd_set *) ex;
+	syscallarg(struct timeval *) tv;
+};
+
+struct sys_kevent_args {
+	syscallarg(int) fd;
+	syscallarg(const struct kevent *) changelist;
+	syscallarg(int) nchanges;
+	syscallarg(struct kevent *) eventlist;
+	syscallarg(int) nevents;
+	syscallarg(const struct timespec *) timeout;
+};
+
 struct sys_munmap_args {
 	syscallarg(void *) addr;
 	syscallarg(size_t) len;
@@ -300,6 +372,16 @@ struct sys_madvise_args {
 	syscallarg(int) behav;
 };
 
+struct sys_utimes_args {
+	syscallarg(const char *) path;
+	syscallarg(const struct timeval *) tptr;
+};
+
+struct sys_futimes_args {
+	syscallarg(int) fd;
+	syscallarg(const struct timeval *) tptr;
+};
+
 struct sys_mincore_args {
 	syscallarg(void *) addr;
 	syscallarg(size_t) len;
@@ -321,15 +403,42 @@ struct sys_setpgid_args {
 	syscallarg(int) pgid;
 };
 
-struct sys_setitimer_args {
+struct t32_sys_setitimer_args {
 	syscallarg(int) which;
-	syscallarg(const struct itimerval *) itv;
-	syscallarg(struct itimerval *) oitv;
+	syscallarg(const struct itimerval32 *) itv;
+	syscallarg(struct itimerval32 *) oitv;
 };
 
-struct sys_getitimer_args {
+struct sys_utimensat_args {
+	syscallarg(int) fd;
+	syscallarg(const char *) path;
+	syscallarg(const struct timespec *) times;
+	syscallarg(int) flag;
+};
+
+struct sys_futimens_args {
+	syscallarg(int) fd;
+	syscallarg(const struct timespec *) times;
+};
+
+struct t32_sys_getitimer_args {
 	syscallarg(int) which;
-	syscallarg(struct itimerval *) itv;
+	syscallarg(struct itimerval32 *) itv;
+};
+
+struct sys_clock_gettime_args {
+	syscallarg(clockid_t) clock_id;
+	syscallarg(struct timespec *) tp;
+};
+
+struct sys_clock_settime_args {
+	syscallarg(clockid_t) clock_id;
+	syscallarg(const struct timespec *) tp;
+};
+
+struct sys_clock_getres_args {
+	syscallarg(clockid_t) clock_id;
+	syscallarg(struct timespec *) tp;
 };
 
 struct sys_dup2_args {
@@ -337,18 +446,31 @@ struct sys_dup2_args {
 	syscallarg(int) to;
 };
 
+struct sys_nanosleep_args {
+	syscallarg(const struct timespec *) rqtp;
+	syscallarg(struct timespec *) rmtp;
+};
+
 struct sys_fcntl_args {
 	syscallarg(int) fd;
 	syscallarg(int) cmd;
 	syscallarg(void *) arg;
 };
 
-struct sys_select_args {
+struct t32_sys_select_args {
 	syscallarg(int) nd;
 	syscallarg(fd_set *) in;
 	syscallarg(fd_set *) ou;
 	syscallarg(fd_set *) ex;
-	syscallarg(struct timeval *) tv;
+	syscallarg(struct timeval32 *) tv;
+};
+
+struct sys___thrsleep_args {
+	syscallarg(const volatile void *) ident;
+	syscallarg(clockid_t) clock_id;
+	syscallarg(const struct timespec *) tp;
+	syscallarg(void *) lock;
+	syscallarg(const int *) abort;
 };
 
 struct sys_fsync_args {
@@ -373,6 +495,12 @@ struct sys_connect_args {
 	syscallarg(socklen_t) namelen;
 };
 
+struct sys_getdents_args {
+	syscallarg(int) fd;
+	syscallarg(struct dirent *) buf;
+	syscallarg(size_t) buflen;
+};
+
 struct sys_getpriority_args {
 	syscallarg(int) which;
 	syscallarg(id_t) who;
@@ -421,14 +549,14 @@ struct sys_sigsuspend_args {
 	syscallarg(int) mask;
 };
 
-struct sys_gettimeofday_args {
-	syscallarg(struct timeval *) tp;
+struct t32_sys_gettimeofday_args {
+	syscallarg(struct timeval32 *) tp;
 	syscallarg(struct timezone *) tzp;
 };
 
-struct sys_getrusage_args {
+struct t32_sys_getrusage_args {
 	syscallarg(int) who;
-	syscallarg(struct rusage *) rusage;
+	syscallarg(struct rusage32 *) rusage;
 };
 
 struct sys_getsockopt_args {
@@ -451,8 +579,8 @@ struct sys_writev_args {
 	syscallarg(int) iovcnt;
 };
 
-struct sys_settimeofday_args {
-	syscallarg(const struct timeval *) tv;
+struct t32_sys_settimeofday_args {
+	syscallarg(const struct timeval32 *) tv;
 	syscallarg(const struct timezone *) tzp;
 };
 
@@ -522,9 +650,9 @@ struct sys_rmdir_args {
 	syscallarg(const char *) path;
 };
 
-struct sys_utimes_args {
+struct t32_sys_utimes_args {
 	syscallarg(const char *) path;
-	syscallarg(const struct timeval *) tptr;
+	syscallarg(const struct timeval32 *) tptr;
 };
 
 struct sys_adjtime_args {
@@ -656,9 +784,9 @@ struct sys_munlock_args {
 	syscallarg(size_t) len;
 };
 
-struct sys_futimes_args {
+struct t32_sys_futimes_args {
 	syscallarg(int) fd;
-	syscallarg(const struct timeval *) tptr;
+	syscallarg(const struct timeval32 *) tptr;
 };
 
 struct sys_getpgid_args {
@@ -707,24 +835,24 @@ struct sys_shmdt_args {
 	syscallarg(const void *) shmaddr;
 };
 
-struct sys_clock_gettime_args {
+struct t32_sys_clock_gettime_args {
 	syscallarg(clockid_t) clock_id;
-	syscallarg(struct timespec *) tp;
+	syscallarg(struct timespec32 *) tp;
 };
 
-struct sys_clock_settime_args {
+struct t32_sys_clock_settime_args {
 	syscallarg(clockid_t) clock_id;
-	syscallarg(const struct timespec *) tp;
+	syscallarg(const struct timespec32 *) tp;
 };
 
-struct sys_clock_getres_args {
+struct t32_sys_clock_getres_args {
 	syscallarg(clockid_t) clock_id;
-	syscallarg(struct timespec *) tp;
+	syscallarg(struct timespec32 *) tp;
 };
 
-struct sys_nanosleep_args {
-	syscallarg(const struct timespec *) rqtp;
-	syscallarg(struct timespec *) rmtp;
+struct t32_sys_nanosleep_args {
+	syscallarg(const struct timespec32 *) rqtp;
+	syscallarg(struct timespec32 *) rmtp;
 };
 
 struct sys_minherit_args {
@@ -780,13 +908,13 @@ struct sys_pwritev_args {
 	syscallarg(off_t) offset;
 };
 
-struct sys_kevent_args {
+struct t32_sys_kevent_args {
 	syscallarg(int) fd;
-	syscallarg(const struct kevent *) changelist;
+	syscallarg(const struct kevent32 *) changelist;
 	syscallarg(int) nchanges;
-	syscallarg(struct kevent *) eventlist;
+	syscallarg(struct kevent32 *) eventlist;
 	syscallarg(int) nevents;
-	syscallarg(const struct timespec *) timeout;
+	syscallarg(const struct timespec32 *) timeout;
 };
 
 struct sys_mlockall_args {
@@ -848,19 +976,19 @@ struct sys_semop_args {
 	syscallarg(size_t) nsops;
 };
 
-struct sys_stat_args {
+struct t32_sys_stat_args {
 	syscallarg(const char *) path;
-	syscallarg(struct stat *) ub;
+	syscallarg(struct stat32 *) ub;
 };
 
-struct sys_fstat_args {
+struct t32_sys_fstat_args {
 	syscallarg(int) fd;
-	syscallarg(struct stat *) sb;
+	syscallarg(struct stat32 *) sb;
 };
 
-struct sys_lstat_args {
+struct t32_sys_lstat_args {
 	syscallarg(const char *) path;
-	syscallarg(struct stat *) ub;
+	syscallarg(struct stat32 *) ub;
 };
 
 struct sys_fhstat_args {
@@ -887,10 +1015,10 @@ struct sys_msgctl_args {
 	syscallarg(struct msqid_ds *) buf;
 };
 
-struct sys___thrsleep_args {
+struct t32_sys___thrsleep_args {
 	syscallarg(const volatile void *) ident;
 	syscallarg(clockid_t) clock_id;
-	syscallarg(const struct timespec *) tp;
+	syscallarg(const struct timespec32 *) tp;
 	syscallarg(void *) lock;
 	syscallarg(const int *) abort;
 };
@@ -945,7 +1073,7 @@ struct sys_setrtable_args {
 	syscallarg(int) rtableid;
 };
 
-struct sys_getdirentries_args {
+struct t32_sys_getdirentries_args {
 	syscallarg(int) fd;
 	syscallarg(char *) buf;
 	syscallarg(int) count;
@@ -974,10 +1102,10 @@ struct sys_fchownat_args {
 	syscallarg(int) flag;
 };
 
-struct sys_fstatat_args {
+struct t32_sys_fstatat_args {
 	syscallarg(int) fd;
 	syscallarg(const char *) path;
-	syscallarg(struct stat *) buf;
+	syscallarg(struct stat32 *) buf;
 	syscallarg(int) flag;
 };
 
@@ -1041,16 +1169,16 @@ struct sys_unlinkat_args {
 	syscallarg(int) flag;
 };
 
-struct sys_utimensat_args {
+struct t32_sys_utimensat_args {
 	syscallarg(int) fd;
 	syscallarg(const char *) path;
-	syscallarg(const struct timespec *) times;
+	syscallarg(const struct timespec32 *) times;
 	syscallarg(int) flag;
 };
 
-struct sys_futimens_args {
+struct t32_sys_futimens_args {
 	syscallarg(int) fd;
-	syscallarg(const struct timespec *) times;
+	syscallarg(const struct timespec32 *) times;
 };
 
 struct compat_o51_sys___tfork_args {
@@ -1071,10 +1199,11 @@ 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	sys_wait4(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 *);
+int	sys_wait4(struct proc *, void *, register_t *);
 int	sys_chdir(struct proc *, void *, register_t *);
 int	sys_fchdir(struct proc *, void *, register_t *);
 int	sys_mknod(struct proc *, void *, register_t *);
@@ -1082,6 +1211,7 @@ int	sys_chmod(struct proc *, void *, register_t *);
 int	sys_chown(struct proc *, void *, register_t *);
 int	sys_obreak(struct proc *, void *, register_t *);
 int	sys_getdtablecount(struct proc *, void *, register_t *);
+int	sys_getrusage(struct proc *, void *, register_t *);
 int	sys_getpid(struct proc *, void *, register_t *);
 int	sys_mount(struct proc *, void *, register_t *);
 int	sys_unmount(struct proc *, void *, register_t *);
@@ -1103,8 +1233,11 @@ int	sys_chflags(struct proc *, void *, register_t *);
 int	sys_fchflags(struct proc *, void *, register_t *);
 int	sys_sync(struct proc *, void *, register_t *);
 int	sys_kill(struct proc *, void *, register_t *);
+int	sys_stat(struct proc *, void *, register_t *);
 int	sys_getppid(struct proc *, void *, register_t *);
+int	sys_lstat(struct proc *, void *, register_t *);
 int	sys_dup(struct proc *, void *, register_t *);
+int	sys_fstatat(struct proc *, void *, register_t *);
 int	sys_getegid(struct proc *, void *, register_t *);
 int	sys_profil(struct proc *, void *, register_t *);
 #ifdef KTRACE
@@ -1121,6 +1254,7 @@ int	sys_acct(struct proc *, void *, register_t *);
 #else
 #endif
 int	sys_sigpending(struct proc *, void *, register_t *);
+int	sys_fstat(struct proc *, void *, register_t *);
 int	sys_ioctl(struct proc *, void *, register_t *);
 int	sys_reboot(struct proc *, void *, register_t *);
 int	sys_revoke(struct proc *, void *, register_t *);
@@ -1134,23 +1268,39 @@ int	sys_statfs(struct proc *, void *, register_t *);
 int	sys_fstatfs(struct proc *, void *, register_t *);
 int	sys_fhstatfs(struct proc *, void *, register_t *);
 int	sys_vfork(struct proc *, void *, register_t *);
+int	sys_gettimeofday(struct proc *, void *, register_t *);
+int	sys_settimeofday(struct proc *, void *, register_t *);
+int	sys_setitimer(struct proc *, void *, register_t *);
+int	sys_getitimer(struct proc *, void *, register_t *);
+int	sys_select(struct proc *, void *, register_t *);
+int	sys_kevent(struct proc *, void *, register_t *);
 int	sys_munmap(struct proc *, void *, register_t *);
 int	sys_mprotect(struct proc *, void *, register_t *);
 int	sys_madvise(struct proc *, void *, register_t *);
+int	sys_utimes(struct proc *, void *, register_t *);
+int	sys_futimes(struct proc *, void *, register_t *);
 int	sys_mincore(struct proc *, void *, register_t *);
 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	sys_setitimer(struct proc *, void *, register_t *);
-int	sys_getitimer(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	sys_select(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 *);
 int	sys_socket(struct proc *, void *, register_t *);
 int	sys_connect(struct proc *, void *, register_t *);
+int	sys_getdents(struct proc *, void *, register_t *);
 int	sys_getpriority(struct proc *, void *, register_t *);
 int	sys_sigreturn(struct proc *, void *, register_t *);
 int	sys_bind(struct proc *, void *, register_t *);
@@ -1159,12 +1309,12 @@ 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	sys_gettimeofday(struct proc *, void *, register_t *);
-int	sys_getrusage(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	sys_settimeofday(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 *);
@@ -1177,7 +1327,7 @@ 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	sys_utimes(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 *);
@@ -1204,7 +1354,7 @@ 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	sys_futimes(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
@@ -1235,10 +1385,10 @@ int	sys_shmat(struct proc *, void *, register_t *);
 int	sys_shmdt(struct proc *, void *, register_t *);
 #else
 #endif
-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_nanosleep(struct proc *, void *, register_t *);
+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 *);
@@ -1250,7 +1400,7 @@ 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	sys_kevent(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 *);
@@ -1268,9 +1418,9 @@ int	sys_shmget(struct proc *, void *, register_t *);
 int	sys_semop(struct proc *, void *, register_t *);
 #else
 #endif
-int	sys_stat(struct proc *, void *, register_t *);
-int	sys_fstat(struct proc *, void *, register_t *);
-int	sys_lstat(struct proc *, void *, register_t *);
+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 *);
@@ -1286,7 +1436,7 @@ 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	sys___thrsleep(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 *);
@@ -1298,11 +1448,11 @@ int	compat_o53_sys_fstatfs(struct proc *, void *, register_t *);
 int	compat_o53_sys_fhstatfs(struct proc *, void *, register_t *);
 int	sys_setrtable(struct proc *, void *, register_t *);
 int	sys_getrtable(struct proc *, void *, register_t *);
-int	sys_getdirentries(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	sys_fstatat(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 *);
@@ -1312,8 +1462,8 @@ 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	sys_utimensat(struct proc *, void *, register_t *);
-int	sys_futimens(struct proc *, void *, register_t *);
+int	t32_sys_utimensat(struct proc *, void *, register_t *);
+int	t32_sys_futimens(struct proc *, void *, register_t *);
 int	compat_o51_sys___tfork(struct proc *, void *, register_t *);
 int	sys___set_tcb(struct proc *, void *, register_t *);
 int	sys___get_tcb(struct proc *, void *, register_t *);