Import the new automatically generated system call table for CloudABI.

Now that we've switched over to using the vDSO on CloudABI, it becomes a
lot easier for us to phase out old features. System call numbering is no
longer something that's part of the ABI. It's fully based on names. As
long as the numbering used by the kernel and the vDSO is consistent
(which it always is), it's all right.

Let's put this to the test by removing a system call (thread_tcb_set())
that's already unused for quite some time now, but was only left intact
to serve as a placeholder. Sync in the new system call table that uses
alphabetic sorting of system calls.

Obtained from:	https://github.com/NuxiNL/cloudabi

6 files changed, 157 insertions, 181 deletions

diff --git a/sys/compat/cloudabi64/Makefile b/sys/compat/cloudabi64/Makefile
index 83d27a30d300..60ae571f9644 100644
--- a/sys/compat/cloudabi64/Makefile
+++ b/sys/compat/cloudabi64/Makefile
@@ -8,7 +8,7 @@ sysent: cloudabi64_sysent.c cloudabi64_syscall.h cloudabi64_proto.h \
 
 cloudabi64_sysent.c cloudabi64_syscall.h cloudabi64_proto.h \
     cloudabi64_syscalls.c cloudabi64_systrace_args.c: \
-    ../../kern/makesyscalls.sh ../../contrib/cloudabi/syscalls.master \
+    ../../kern/makesyscalls.sh ../../contrib/cloudabi/syscalls64.master \
     syscalls.conf
-	sh ../../kern/makesyscalls.sh ../../contrib/cloudabi/syscalls.master \
+	sh ../../kern/makesyscalls.sh ../../contrib/cloudabi/syscalls64.master \
 	    syscalls.conf
diff --git a/sys/compat/cloudabi64/cloudabi64_proto.h b/sys/compat/cloudabi64/cloudabi64_proto.h
index 79a0f6028c4f..91adfd6f149f 100644
--- a/sys/compat/cloudabi64/cloudabi64_proto.h
+++ b/sys/compat/cloudabi64/cloudabi64_proto.h
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: head/sys/contrib/cloudabi/syscalls.master 297468 2016-03-31 18:50:06Z ed 
+ * created from FreeBSD
  */
 
 #ifndef _CLOUDABI64_SYSPROTO_H_
@@ -236,6 +236,14 @@ struct cloudabi64_sys_poll_args {
 	char out_l_[PADL_(cloudabi64_event_t *)]; cloudabi64_event_t * out; char out_r_[PADR_(cloudabi64_event_t *)];
 	char nsubscriptions_l_[PADL_(size_t)]; size_t nsubscriptions; char nsubscriptions_r_[PADR_(size_t)];
 };
+struct cloudabi64_sys_poll_fd_args {
+	char fd_l_[PADL_(cloudabi_fd_t)]; cloudabi_fd_t fd; char fd_r_[PADR_(cloudabi_fd_t)];
+	char in_l_[PADL_(const cloudabi64_subscription_t *)]; const cloudabi64_subscription_t * in; char in_r_[PADR_(const cloudabi64_subscription_t *)];
+	char nin_l_[PADL_(size_t)]; size_t nin; char nin_r_[PADR_(size_t)];
+	char out_l_[PADL_(cloudabi64_event_t *)]; cloudabi64_event_t * out; char out_r_[PADR_(cloudabi64_event_t *)];
+	char nout_l_[PADL_(size_t)]; size_t nout; char nout_r_[PADR_(size_t)];
+	char timeout_l_[PADL_(const cloudabi64_subscription_t *)]; const cloudabi64_subscription_t * timeout; char timeout_r_[PADR_(const cloudabi64_subscription_t *)];
+};
 struct cloudabi_sys_proc_exec_args {
 	char fd_l_[PADL_(cloudabi_fd_t)]; cloudabi_fd_t fd; char fd_r_[PADR_(cloudabi_fd_t)];
 	char data_l_[PADL_(const void *)]; const void * data; char data_r_[PADR_(const void *)];
@@ -302,20 +310,9 @@ struct cloudabi_sys_thread_exit_args {
 	char lock_l_[PADL_(cloudabi_lock_t *)]; cloudabi_lock_t * lock; char lock_r_[PADR_(cloudabi_lock_t *)];
 	char scope_l_[PADL_(cloudabi_scope_t)]; cloudabi_scope_t scope; char scope_r_[PADR_(cloudabi_scope_t)];
 };
-struct cloudabi_sys_thread_tcb_set_args {
-	char tcb_l_[PADL_(void *)]; void * tcb; char tcb_r_[PADR_(void *)];
-};
 struct cloudabi_sys_thread_yield_args {
 	register_t dummy;
 };
-struct cloudabi64_sys_poll_fd_args {
-	char fd_l_[PADL_(cloudabi_fd_t)]; cloudabi_fd_t fd; char fd_r_[PADR_(cloudabi_fd_t)];
-	char in_l_[PADL_(const cloudabi64_subscription_t *)]; const cloudabi64_subscription_t * in; char in_r_[PADR_(const cloudabi64_subscription_t *)];
-	char nin_l_[PADL_(size_t)]; size_t nin; char nin_r_[PADR_(size_t)];
-	char out_l_[PADL_(cloudabi64_event_t *)]; cloudabi64_event_t * out; char out_r_[PADR_(cloudabi64_event_t *)];
-	char nout_l_[PADL_(size_t)]; size_t nout; char nout_r_[PADR_(size_t)];
-	char timeout_l_[PADL_(const cloudabi64_subscription_t *)]; const cloudabi64_subscription_t * timeout; char timeout_r_[PADR_(const cloudabi64_subscription_t *)];
-};
 int	cloudabi_sys_clock_res_get(struct thread *, struct cloudabi_sys_clock_res_get_args *);
 int	cloudabi_sys_clock_time_get(struct thread *, struct cloudabi_sys_clock_time_get_args *);
 int	cloudabi_sys_condvar_signal(struct thread *, struct cloudabi_sys_condvar_signal_args *);
@@ -356,6 +353,7 @@ int	cloudabi_sys_mem_sync(struct thread *, struct cloudabi_sys_mem_sync_args *);
 int	cloudabi_sys_mem_unlock(struct thread *, struct cloudabi_sys_mem_unlock_args *);
 int	cloudabi_sys_mem_unmap(struct thread *, struct cloudabi_sys_mem_unmap_args *);
 int	cloudabi64_sys_poll(struct thread *, struct cloudabi64_sys_poll_args *);
+int	cloudabi64_sys_poll_fd(struct thread *, struct cloudabi64_sys_poll_fd_args *);
 int	cloudabi_sys_proc_exec(struct thread *, struct cloudabi_sys_proc_exec_args *);
 int	cloudabi_sys_proc_exit(struct thread *, struct cloudabi_sys_proc_exit_args *);
 int	cloudabi_sys_proc_fork(struct thread *, struct cloudabi_sys_proc_fork_args *);
@@ -371,9 +369,7 @@ int	cloudabi_sys_sock_shutdown(struct thread *, struct cloudabi_sys_sock_shutdow
 int	cloudabi_sys_sock_stat_get(struct thread *, struct cloudabi_sys_sock_stat_get_args *);
 int	cloudabi64_sys_thread_create(struct thread *, struct cloudabi64_sys_thread_create_args *);
 int	cloudabi_sys_thread_exit(struct thread *, struct cloudabi_sys_thread_exit_args *);
-int	cloudabi_sys_thread_tcb_set(struct thread *, struct cloudabi_sys_thread_tcb_set_args *);
 int	cloudabi_sys_thread_yield(struct thread *, struct cloudabi_sys_thread_yield_args *);
-int	cloudabi64_sys_poll_fd(struct thread *, struct cloudabi64_sys_poll_fd_args *);
 
 #ifdef COMPAT_43
 
@@ -398,6 +394,12 @@ int	cloudabi64_sys_poll_fd(struct thread *, struct cloudabi64_sys_poll_fd_args *
 
 #endif /* COMPAT_FREEBSD7 */
 
+
+#ifdef COMPAT_FREEBSD10
+
+
+#endif /* COMPAT_FREEBSD10 */
+
 #define	CLOUDABI64_SYS_AUE_cloudabi_sys_clock_res_get	AUE_NULL
 #define	CLOUDABI64_SYS_AUE_cloudabi_sys_clock_time_get	AUE_NULL
 #define	CLOUDABI64_SYS_AUE_cloudabi_sys_condvar_signal	AUE_NULL
@@ -438,6 +440,7 @@ int	cloudabi64_sys_poll_fd(struct thread *, struct cloudabi64_sys_poll_fd_args *
 #define	CLOUDABI64_SYS_AUE_cloudabi_sys_mem_unlock	AUE_NULL
 #define	CLOUDABI64_SYS_AUE_cloudabi_sys_mem_unmap	AUE_NULL
 #define	CLOUDABI64_SYS_AUE_cloudabi64_sys_poll	AUE_NULL
+#define	CLOUDABI64_SYS_AUE_cloudabi64_sys_poll_fd	AUE_NULL
 #define	CLOUDABI64_SYS_AUE_cloudabi_sys_proc_exec	AUE_NULL
 #define	CLOUDABI64_SYS_AUE_cloudabi_sys_proc_exit	AUE_NULL
 #define	CLOUDABI64_SYS_AUE_cloudabi_sys_proc_fork	AUE_NULL
@@ -453,9 +456,7 @@ int	cloudabi64_sys_poll_fd(struct thread *, struct cloudabi64_sys_poll_fd_args *
 #define	CLOUDABI64_SYS_AUE_cloudabi_sys_sock_stat_get	AUE_NULL
 #define	CLOUDABI64_SYS_AUE_cloudabi64_sys_thread_create	AUE_NULL
 #define	CLOUDABI64_SYS_AUE_cloudabi_sys_thread_exit	AUE_NULL
-#define	CLOUDABI64_SYS_AUE_cloudabi_sys_thread_tcb_set	AUE_NULL
 #define	CLOUDABI64_SYS_AUE_cloudabi_sys_thread_yield	AUE_NULL
-#define	CLOUDABI64_SYS_AUE_cloudabi64_sys_poll_fd	AUE_NULL
 
 #undef PAD_
 #undef PADL_
diff --git a/sys/compat/cloudabi64/cloudabi64_syscall.h b/sys/compat/cloudabi64/cloudabi64_syscall.h
index b5694bfd50fd..4a2bdfb3d6f7 100644
--- a/sys/compat/cloudabi64/cloudabi64_syscall.h
+++ b/sys/compat/cloudabi64/cloudabi64_syscall.h
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: head/sys/contrib/cloudabi/syscalls.master 297468 2016-03-31 18:50:06Z ed 
+ * created from FreeBSD
  */
 
 #define	CLOUDABI64_SYS_cloudabi_sys_clock_res_get	0
@@ -46,22 +46,21 @@
 #define	CLOUDABI64_SYS_cloudabi_sys_mem_unlock	37
 #define	CLOUDABI64_SYS_cloudabi_sys_mem_unmap	38
 #define	CLOUDABI64_SYS_cloudabi64_sys_poll	39
-#define	CLOUDABI64_SYS_cloudabi_sys_proc_exec	40
-#define	CLOUDABI64_SYS_cloudabi_sys_proc_exit	41
-#define	CLOUDABI64_SYS_cloudabi_sys_proc_fork	42
-#define	CLOUDABI64_SYS_cloudabi_sys_proc_raise	43
-#define	CLOUDABI64_SYS_cloudabi_sys_random_get	44
-#define	CLOUDABI64_SYS_cloudabi_sys_sock_accept	45
-#define	CLOUDABI64_SYS_cloudabi_sys_sock_bind	46
-#define	CLOUDABI64_SYS_cloudabi_sys_sock_connect	47
-#define	CLOUDABI64_SYS_cloudabi_sys_sock_listen	48
-#define	CLOUDABI64_SYS_cloudabi64_sys_sock_recv	49
-#define	CLOUDABI64_SYS_cloudabi64_sys_sock_send	50
-#define	CLOUDABI64_SYS_cloudabi_sys_sock_shutdown	51
-#define	CLOUDABI64_SYS_cloudabi_sys_sock_stat_get	52
-#define	CLOUDABI64_SYS_cloudabi64_sys_thread_create	53
-#define	CLOUDABI64_SYS_cloudabi_sys_thread_exit	54
-#define	CLOUDABI64_SYS_cloudabi_sys_thread_tcb_set	55
+#define	CLOUDABI64_SYS_cloudabi64_sys_poll_fd	40
+#define	CLOUDABI64_SYS_cloudabi_sys_proc_exec	41
+#define	CLOUDABI64_SYS_cloudabi_sys_proc_exit	42
+#define	CLOUDABI64_SYS_cloudabi_sys_proc_fork	43
+#define	CLOUDABI64_SYS_cloudabi_sys_proc_raise	44
+#define	CLOUDABI64_SYS_cloudabi_sys_random_get	45
+#define	CLOUDABI64_SYS_cloudabi_sys_sock_accept	46
+#define	CLOUDABI64_SYS_cloudabi_sys_sock_bind	47
+#define	CLOUDABI64_SYS_cloudabi_sys_sock_connect	48
+#define	CLOUDABI64_SYS_cloudabi_sys_sock_listen	49
+#define	CLOUDABI64_SYS_cloudabi64_sys_sock_recv	50
+#define	CLOUDABI64_SYS_cloudabi64_sys_sock_send	51
+#define	CLOUDABI64_SYS_cloudabi_sys_sock_shutdown	52
+#define	CLOUDABI64_SYS_cloudabi_sys_sock_stat_get	53
+#define	CLOUDABI64_SYS_cloudabi64_sys_thread_create	54
+#define	CLOUDABI64_SYS_cloudabi_sys_thread_exit	55
 #define	CLOUDABI64_SYS_cloudabi_sys_thread_yield	56
-#define	CLOUDABI64_SYS_cloudabi64_sys_poll_fd	57
-#define	CLOUDABI64_SYS_MAXSYSCALL	58
+#define	CLOUDABI64_SYS_MAXSYSCALL	57
diff --git a/sys/compat/cloudabi64/cloudabi64_syscalls.c b/sys/compat/cloudabi64/cloudabi64_syscalls.c
index 03407ff24608..ef1c869abe64 100644
--- a/sys/compat/cloudabi64/cloudabi64_syscalls.c
+++ b/sys/compat/cloudabi64/cloudabi64_syscalls.c
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: head/sys/contrib/cloudabi/syscalls.master 297468 2016-03-31 18:50:06Z ed 
+ * created from FreeBSD
  */
 
 const char *cloudabi64_syscallnames[] = {
@@ -47,22 +47,21 @@ const char *cloudabi64_syscallnames[] = {
 	"cloudabi_sys_mem_unlock",			/* 37 = cloudabi_sys_mem_unlock */
 	"cloudabi_sys_mem_unmap",			/* 38 = cloudabi_sys_mem_unmap */
 	"cloudabi64_sys_poll",			/* 39 = cloudabi64_sys_poll */
-	"cloudabi_sys_proc_exec",			/* 40 = cloudabi_sys_proc_exec */
-	"cloudabi_sys_proc_exit",			/* 41 = cloudabi_sys_proc_exit */
-	"cloudabi_sys_proc_fork",			/* 42 = cloudabi_sys_proc_fork */
-	"cloudabi_sys_proc_raise",			/* 43 = cloudabi_sys_proc_raise */
-	"cloudabi_sys_random_get",			/* 44 = cloudabi_sys_random_get */
-	"cloudabi_sys_sock_accept",			/* 45 = cloudabi_sys_sock_accept */
-	"cloudabi_sys_sock_bind",			/* 46 = cloudabi_sys_sock_bind */
-	"cloudabi_sys_sock_connect",			/* 47 = cloudabi_sys_sock_connect */
-	"cloudabi_sys_sock_listen",			/* 48 = cloudabi_sys_sock_listen */
-	"cloudabi64_sys_sock_recv",			/* 49 = cloudabi64_sys_sock_recv */
-	"cloudabi64_sys_sock_send",			/* 50 = cloudabi64_sys_sock_send */
-	"cloudabi_sys_sock_shutdown",			/* 51 = cloudabi_sys_sock_shutdown */
-	"cloudabi_sys_sock_stat_get",			/* 52 = cloudabi_sys_sock_stat_get */
-	"cloudabi64_sys_thread_create",			/* 53 = cloudabi64_sys_thread_create */
-	"cloudabi_sys_thread_exit",			/* 54 = cloudabi_sys_thread_exit */
-	"cloudabi_sys_thread_tcb_set",			/* 55 = cloudabi_sys_thread_tcb_set */
+	"cloudabi64_sys_poll_fd",			/* 40 = cloudabi64_sys_poll_fd */
+	"cloudabi_sys_proc_exec",			/* 41 = cloudabi_sys_proc_exec */
+	"cloudabi_sys_proc_exit",			/* 42 = cloudabi_sys_proc_exit */
+	"cloudabi_sys_proc_fork",			/* 43 = cloudabi_sys_proc_fork */
+	"cloudabi_sys_proc_raise",			/* 44 = cloudabi_sys_proc_raise */
+	"cloudabi_sys_random_get",			/* 45 = cloudabi_sys_random_get */
+	"cloudabi_sys_sock_accept",			/* 46 = cloudabi_sys_sock_accept */
+	"cloudabi_sys_sock_bind",			/* 47 = cloudabi_sys_sock_bind */
+	"cloudabi_sys_sock_connect",			/* 48 = cloudabi_sys_sock_connect */
+	"cloudabi_sys_sock_listen",			/* 49 = cloudabi_sys_sock_listen */
+	"cloudabi64_sys_sock_recv",			/* 50 = cloudabi64_sys_sock_recv */
+	"cloudabi64_sys_sock_send",			/* 51 = cloudabi64_sys_sock_send */
+	"cloudabi_sys_sock_shutdown",			/* 52 = cloudabi_sys_sock_shutdown */
+	"cloudabi_sys_sock_stat_get",			/* 53 = cloudabi_sys_sock_stat_get */
+	"cloudabi64_sys_thread_create",			/* 54 = cloudabi64_sys_thread_create */
+	"cloudabi_sys_thread_exit",			/* 55 = cloudabi_sys_thread_exit */
 	"cloudabi_sys_thread_yield",			/* 56 = cloudabi_sys_thread_yield */
-	"cloudabi64_sys_poll_fd",			/* 57 = cloudabi64_sys_poll_fd */
 };
diff --git a/sys/compat/cloudabi64/cloudabi64_sysent.c b/sys/compat/cloudabi64/cloudabi64_sysent.c
index 50f4a651d118..64d330fe4b24 100644
--- a/sys/compat/cloudabi64/cloudabi64_sysent.c
+++ b/sys/compat/cloudabi64/cloudabi64_sysent.c
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: head/sys/contrib/cloudabi/syscalls.master 297468 2016-03-31 18:50:06Z ed 
+ * created from FreeBSD
  */
 
 #include <sys/sysent.h>
@@ -55,22 +55,21 @@ struct sysent cloudabi64_sysent[] = {
 	{ AS(cloudabi_sys_mem_unlock_args), (sy_call_t *)cloudabi_sys_mem_unlock, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 37 = cloudabi_sys_mem_unlock */
 	{ AS(cloudabi_sys_mem_unmap_args), (sy_call_t *)cloudabi_sys_mem_unmap, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 38 = cloudabi_sys_mem_unmap */
 	{ AS(cloudabi64_sys_poll_args), (sy_call_t *)cloudabi64_sys_poll, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 39 = cloudabi64_sys_poll */
-	{ AS(cloudabi_sys_proc_exec_args), (sy_call_t *)cloudabi_sys_proc_exec, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 40 = cloudabi_sys_proc_exec */
-	{ AS(cloudabi_sys_proc_exit_args), (sy_call_t *)cloudabi_sys_proc_exit, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 41 = cloudabi_sys_proc_exit */
-	{ 0, (sy_call_t *)cloudabi_sys_proc_fork, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 42 = cloudabi_sys_proc_fork */
-	{ AS(cloudabi_sys_proc_raise_args), (sy_call_t *)cloudabi_sys_proc_raise, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 43 = cloudabi_sys_proc_raise */
-	{ AS(cloudabi_sys_random_get_args), (sy_call_t *)cloudabi_sys_random_get, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 44 = cloudabi_sys_random_get */
-	{ AS(cloudabi_sys_sock_accept_args), (sy_call_t *)cloudabi_sys_sock_accept, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 45 = cloudabi_sys_sock_accept */
-	{ AS(cloudabi_sys_sock_bind_args), (sy_call_t *)cloudabi_sys_sock_bind, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 46 = cloudabi_sys_sock_bind */
-	{ AS(cloudabi_sys_sock_connect_args), (sy_call_t *)cloudabi_sys_sock_connect, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 47 = cloudabi_sys_sock_connect */
-	{ AS(cloudabi_sys_sock_listen_args), (sy_call_t *)cloudabi_sys_sock_listen, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 48 = cloudabi_sys_sock_listen */
-	{ AS(cloudabi64_sys_sock_recv_args), (sy_call_t *)cloudabi64_sys_sock_recv, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 49 = cloudabi64_sys_sock_recv */
-	{ AS(cloudabi64_sys_sock_send_args), (sy_call_t *)cloudabi64_sys_sock_send, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 50 = cloudabi64_sys_sock_send */
-	{ AS(cloudabi_sys_sock_shutdown_args), (sy_call_t *)cloudabi_sys_sock_shutdown, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 51 = cloudabi_sys_sock_shutdown */
-	{ AS(cloudabi_sys_sock_stat_get_args), (sy_call_t *)cloudabi_sys_sock_stat_get, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 52 = cloudabi_sys_sock_stat_get */
-	{ AS(cloudabi64_sys_thread_create_args), (sy_call_t *)cloudabi64_sys_thread_create, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 53 = cloudabi64_sys_thread_create */
-	{ AS(cloudabi_sys_thread_exit_args), (sy_call_t *)cloudabi_sys_thread_exit, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 54 = cloudabi_sys_thread_exit */
-	{ AS(cloudabi_sys_thread_tcb_set_args), (sy_call_t *)cloudabi_sys_thread_tcb_set, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 55 = cloudabi_sys_thread_tcb_set */
+	{ AS(cloudabi64_sys_poll_fd_args), (sy_call_t *)cloudabi64_sys_poll_fd, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 40 = cloudabi64_sys_poll_fd */
+	{ AS(cloudabi_sys_proc_exec_args), (sy_call_t *)cloudabi_sys_proc_exec, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 41 = cloudabi_sys_proc_exec */
+	{ AS(cloudabi_sys_proc_exit_args), (sy_call_t *)cloudabi_sys_proc_exit, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 42 = cloudabi_sys_proc_exit */
+	{ 0, (sy_call_t *)cloudabi_sys_proc_fork, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 43 = cloudabi_sys_proc_fork */
+	{ AS(cloudabi_sys_proc_raise_args), (sy_call_t *)cloudabi_sys_proc_raise, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 44 = cloudabi_sys_proc_raise */
+	{ AS(cloudabi_sys_random_get_args), (sy_call_t *)cloudabi_sys_random_get, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 45 = cloudabi_sys_random_get */
+	{ AS(cloudabi_sys_sock_accept_args), (sy_call_t *)cloudabi_sys_sock_accept, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 46 = cloudabi_sys_sock_accept */
+	{ AS(cloudabi_sys_sock_bind_args), (sy_call_t *)cloudabi_sys_sock_bind, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 47 = cloudabi_sys_sock_bind */
+	{ AS(cloudabi_sys_sock_connect_args), (sy_call_t *)cloudabi_sys_sock_connect, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 48 = cloudabi_sys_sock_connect */
+	{ AS(cloudabi_sys_sock_listen_args), (sy_call_t *)cloudabi_sys_sock_listen, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 49 = cloudabi_sys_sock_listen */
+	{ AS(cloudabi64_sys_sock_recv_args), (sy_call_t *)cloudabi64_sys_sock_recv, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 50 = cloudabi64_sys_sock_recv */
+	{ AS(cloudabi64_sys_sock_send_args), (sy_call_t *)cloudabi64_sys_sock_send, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 51 = cloudabi64_sys_sock_send */
+	{ AS(cloudabi_sys_sock_shutdown_args), (sy_call_t *)cloudabi_sys_sock_shutdown, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 52 = cloudabi_sys_sock_shutdown */
+	{ AS(cloudabi_sys_sock_stat_get_args), (sy_call_t *)cloudabi_sys_sock_stat_get, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 53 = cloudabi_sys_sock_stat_get */
+	{ AS(cloudabi64_sys_thread_create_args), (sy_call_t *)cloudabi64_sys_thread_create, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 54 = cloudabi64_sys_thread_create */
+	{ AS(cloudabi_sys_thread_exit_args), (sy_call_t *)cloudabi_sys_thread_exit, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 55 = cloudabi_sys_thread_exit */
 	{ 0, (sy_call_t *)cloudabi_sys_thread_yield, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 56 = cloudabi_sys_thread_yield */
-	{ AS(cloudabi64_sys_poll_fd_args), (sy_call_t *)cloudabi64_sys_poll_fd, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 57 = cloudabi64_sys_poll_fd */
 };
diff --git a/sys/compat/cloudabi64/cloudabi64_systrace_args.c b/sys/compat/cloudabi64/cloudabi64_systrace_args.c
index 9429e8e1e4d4..3e97b25a04ba 100644
--- a/sys/compat/cloudabi64/cloudabi64_systrace_args.c
+++ b/sys/compat/cloudabi64/cloudabi64_systrace_args.c
@@ -373,8 +373,20 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		*n_args = 3;
 		break;
 	}
-	/* cloudabi_sys_proc_exec */
+	/* cloudabi64_sys_poll_fd */
 	case 40: {
+		struct cloudabi64_sys_poll_fd_args *p = params;
+		iarg[0] = p->fd; /* cloudabi_fd_t */
+		uarg[1] = (intptr_t) p->in; /* const cloudabi64_subscription_t * */
+		uarg[2] = p->nin; /* size_t */
+		uarg[3] = (intptr_t) p->out; /* cloudabi64_event_t * */
+		uarg[4] = p->nout; /* size_t */
+		uarg[5] = (intptr_t) p->timeout; /* const cloudabi64_subscription_t * */
+		*n_args = 6;
+		break;
+	}
+	/* cloudabi_sys_proc_exec */
+	case 41: {
 		struct cloudabi_sys_proc_exec_args *p = params;
 		iarg[0] = p->fd; /* cloudabi_fd_t */
 		uarg[1] = (intptr_t) p->data; /* const void * */
@@ -385,26 +397,26 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		break;
 	}
 	/* cloudabi_sys_proc_exit */
-	case 41: {
+	case 42: {
 		struct cloudabi_sys_proc_exit_args *p = params;
 		iarg[0] = p->rval; /* cloudabi_exitcode_t */
 		*n_args = 1;
 		break;
 	}
 	/* cloudabi_sys_proc_fork */
-	case 42: {
+	case 43: {
 		*n_args = 0;
 		break;
 	}
 	/* cloudabi_sys_proc_raise */
-	case 43: {
+	case 44: {
 		struct cloudabi_sys_proc_raise_args *p = params;
 		iarg[0] = p->sig; /* cloudabi_signal_t */
 		*n_args = 1;
 		break;
 	}
 	/* cloudabi_sys_random_get */
-	case 44: {
+	case 45: {
 		struct cloudabi_sys_random_get_args *p = params;
 		uarg[0] = (intptr_t) p->buf; /* void * */
 		uarg[1] = p->nbyte; /* size_t */
@@ -412,7 +424,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		break;
 	}
 	/* cloudabi_sys_sock_accept */
-	case 45: {
+	case 46: {
 		struct cloudabi_sys_sock_accept_args *p = params;
 		iarg[0] = p->sock; /* cloudabi_fd_t */
 		uarg[1] = (intptr_t) p->buf; /* cloudabi_sockstat_t * */
@@ -420,7 +432,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		break;
 	}
 	/* cloudabi_sys_sock_bind */
-	case 46: {
+	case 47: {
 		struct cloudabi_sys_sock_bind_args *p = params;
 		iarg[0] = p->sock; /* cloudabi_fd_t */
 		iarg[1] = p->fd; /* cloudabi_fd_t */
@@ -430,7 +442,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		break;
 	}
 	/* cloudabi_sys_sock_connect */
-	case 47: {
+	case 48: {
 		struct cloudabi_sys_sock_connect_args *p = params;
 		iarg[0] = p->sock; /* cloudabi_fd_t */
 		iarg[1] = p->fd; /* cloudabi_fd_t */
@@ -440,7 +452,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		break;
 	}
 	/* cloudabi_sys_sock_listen */
-	case 48: {
+	case 49: {
 		struct cloudabi_sys_sock_listen_args *p = params;
 		iarg[0] = p->sock; /* cloudabi_fd_t */
 		iarg[1] = p->backlog; /* cloudabi_backlog_t */
@@ -448,7 +460,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		break;
 	}
 	/* cloudabi64_sys_sock_recv */
-	case 49: {
+	case 50: {
 		struct cloudabi64_sys_sock_recv_args *p = params;
 		iarg[0] = p->sock; /* cloudabi_fd_t */
 		uarg[1] = (intptr_t) p->in; /* const cloudabi64_recv_in_t * */
@@ -457,7 +469,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		break;
 	}
 	/* cloudabi64_sys_sock_send */
-	case 50: {
+	case 51: {
 		struct cloudabi64_sys_sock_send_args *p = params;
 		iarg[0] = p->sock; /* cloudabi_fd_t */
 		uarg[1] = (intptr_t) p->in; /* const cloudabi64_send_in_t * */
@@ -466,7 +478,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		break;
 	}
 	/* cloudabi_sys_sock_shutdown */
-	case 51: {
+	case 52: {
 		struct cloudabi_sys_sock_shutdown_args *p = params;
 		iarg[0] = p->sock; /* cloudabi_fd_t */
 		iarg[1] = p->how; /* cloudabi_sdflags_t */
@@ -474,7 +486,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		break;
 	}
 	/* cloudabi_sys_sock_stat_get */
-	case 52: {
+	case 53: {
 		struct cloudabi_sys_sock_stat_get_args *p = params;
 		iarg[0] = p->sock; /* cloudabi_fd_t */
 		uarg[1] = (intptr_t) p->buf; /* cloudabi_sockstat_t * */
@@ -483,44 +495,25 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		break;
 	}
 	/* cloudabi64_sys_thread_create */
-	case 53: {
+	case 54: {
 		struct cloudabi64_sys_thread_create_args *p = params;
 		uarg[0] = (intptr_t) p->attr; /* cloudabi64_threadattr_t * */
 		*n_args = 1;
 		break;
 	}
 	/* cloudabi_sys_thread_exit */
-	case 54: {
+	case 55: {
 		struct cloudabi_sys_thread_exit_args *p = params;
 		uarg[0] = (intptr_t) p->lock; /* cloudabi_lock_t * */
 		iarg[1] = p->scope; /* cloudabi_scope_t */
 		*n_args = 2;
 		break;
 	}
-	/* cloudabi_sys_thread_tcb_set */
-	case 55: {
-		struct cloudabi_sys_thread_tcb_set_args *p = params;
-		uarg[0] = (intptr_t) p->tcb; /* void * */
-		*n_args = 1;
-		break;
-	}
 	/* cloudabi_sys_thread_yield */
 	case 56: {
 		*n_args = 0;
 		break;
 	}
-	/* cloudabi64_sys_poll_fd */
-	case 57: {
-		struct cloudabi64_sys_poll_fd_args *p = params;
-		iarg[0] = p->fd; /* cloudabi_fd_t */
-		uarg[1] = (intptr_t) p->in; /* const cloudabi64_subscription_t * */
-		uarg[2] = p->nin; /* size_t */
-		uarg[3] = (intptr_t) p->out; /* cloudabi64_event_t * */
-		uarg[4] = p->nout; /* size_t */
-		uarg[5] = (intptr_t) p->timeout; /* const cloudabi64_subscription_t * */
-		*n_args = 6;
-		break;
-	}
 	default:
 		*n_args = 0;
 		break;
@@ -1177,13 +1170,38 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 			break;
 		};
 		break;
-	/* cloudabi_sys_proc_exec */
+	/* cloudabi64_sys_poll_fd */
 	case 40:
 		switch(ndx) {
 		case 0:
 			p = "cloudabi_fd_t";
 			break;
 		case 1:
+			p = "const cloudabi64_subscription_t *";
+			break;
+		case 2:
+			p = "size_t";
+			break;
+		case 3:
+			p = "cloudabi64_event_t *";
+			break;
+		case 4:
+			p = "size_t";
+			break;
+		case 5:
+			p = "const cloudabi64_subscription_t *";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* cloudabi_sys_proc_exec */
+	case 41:
+		switch(ndx) {
+		case 0:
+			p = "cloudabi_fd_t";
+			break;
+		case 1:
 			p = "const void *";
 			break;
 		case 2:
@@ -1200,7 +1218,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 		};
 		break;
 	/* cloudabi_sys_proc_exit */
-	case 41:
+	case 42:
 		switch(ndx) {
 		case 0:
 			p = "cloudabi_exitcode_t";
@@ -1210,10 +1228,10 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 		};
 		break;
 	/* cloudabi_sys_proc_fork */
-	case 42:
+	case 43:
 		break;
 	/* cloudabi_sys_proc_raise */
-	case 43:
+	case 44:
 		switch(ndx) {
 		case 0:
 			p = "cloudabi_signal_t";
@@ -1223,7 +1241,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 		};
 		break;
 	/* cloudabi_sys_random_get */
-	case 44:
+	case 45:
 		switch(ndx) {
 		case 0:
 			p = "void *";
@@ -1236,7 +1254,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 		};
 		break;
 	/* cloudabi_sys_sock_accept */
-	case 45:
+	case 46:
 		switch(ndx) {
 		case 0:
 			p = "cloudabi_fd_t";
@@ -1249,7 +1267,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 		};
 		break;
 	/* cloudabi_sys_sock_bind */
-	case 46:
+	case 47:
 		switch(ndx) {
 		case 0:
 			p = "cloudabi_fd_t";
@@ -1268,7 +1286,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 		};
 		break;
 	/* cloudabi_sys_sock_connect */
-	case 47:
+	case 48:
 		switch(ndx) {
 		case 0:
 			p = "cloudabi_fd_t";
@@ -1287,7 +1305,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 		};
 		break;
 	/* cloudabi_sys_sock_listen */
-	case 48:
+	case 49:
 		switch(ndx) {
 		case 0:
 			p = "cloudabi_fd_t";
@@ -1300,7 +1318,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 		};
 		break;
 	/* cloudabi64_sys_sock_recv */
-	case 49:
+	case 50:
 		switch(ndx) {
 		case 0:
 			p = "cloudabi_fd_t";
@@ -1316,7 +1334,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 		};
 		break;
 	/* cloudabi64_sys_sock_send */
-	case 50:
+	case 51:
 		switch(ndx) {
 		case 0:
 			p = "cloudabi_fd_t";
@@ -1332,7 +1350,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 		};
 		break;
 	/* cloudabi_sys_sock_shutdown */
-	case 51:
+	case 52:
 		switch(ndx) {
 		case 0:
 			p = "cloudabi_fd_t";
@@ -1345,7 +1363,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 		};
 		break;
 	/* cloudabi_sys_sock_stat_get */
-	case 52:
+	case 53:
 		switch(ndx) {
 		case 0:
 			p = "cloudabi_fd_t";
@@ -1361,7 +1379,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 		};
 		break;
 	/* cloudabi64_sys_thread_create */
-	case 53:
+	case 54:
 		switch(ndx) {
 		case 0:
 			p = "cloudabi64_threadattr_t *";
@@ -1371,7 +1389,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 		};
 		break;
 	/* cloudabi_sys_thread_exit */
-	case 54:
+	case 55:
 		switch(ndx) {
 		case 0:
 			p = "cloudabi_lock_t *";
@@ -1383,44 +1401,9 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 			break;
 		};
 		break;
-	/* cloudabi_sys_thread_tcb_set */
-	case 55:
-		switch(ndx) {
-		case 0:
-			p = "void *";
-			break;
-		default:
-			break;
-		};
-		break;
 	/* cloudabi_sys_thread_yield */
 	case 56:
 		break;
-	/* cloudabi64_sys_poll_fd */
-	case 57:
-		switch(ndx) {
-		case 0:
-			p = "cloudabi_fd_t";
-			break;
-		case 1:
-			p = "const cloudabi64_subscription_t *";
-			break;
-		case 2:
-			p = "size_t";
-			break;
-		case 3:
-			p = "cloudabi64_event_t *";
-			break;
-		case 4:
-			p = "size_t";
-			break;
-		case 5:
-			p = "const cloudabi64_subscription_t *";
-			break;
-		default:
-			break;
-		};
-		break;
 	default:
 		break;
 	};
@@ -1632,90 +1615,85 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 		if (ndx == 0 || ndx == 1)
 			p = "size_t";
 		break;
-	/* cloudabi_sys_proc_exec */
+	/* cloudabi64_sys_poll_fd */
 	case 40:
 		if (ndx == 0 || ndx == 1)
+			p = "size_t";
+		break;
+	/* cloudabi_sys_proc_exec */
+	case 41:
+		if (ndx == 0 || ndx == 1)
 			p = "void";
 		break;
 	/* cloudabi_sys_proc_exit */
-	case 41:
+	case 42:
 		if (ndx == 0 || ndx == 1)
 			p = "void";
 		break;
 	/* cloudabi_sys_proc_fork */
-	case 42:
-	/* cloudabi_sys_proc_raise */
 	case 43:
+	/* cloudabi_sys_proc_raise */
+	case 44:
 		if (ndx == 0 || ndx == 1)
 			p = "void";
 		break;
 	/* cloudabi_sys_random_get */
-	case 44:
+	case 45:
 		if (ndx == 0 || ndx == 1)
 			p = "void";
 		break;
 	/* cloudabi_sys_sock_accept */
-	case 45:
+	case 46:
 		if (ndx == 0 || ndx == 1)
 			p = "cloudabi_fd_t";
 		break;
 	/* cloudabi_sys_sock_bind */
-	case 46:
+	case 47:
 		if (ndx == 0 || ndx == 1)
 			p = "void";
 		break;
 	/* cloudabi_sys_sock_connect */
-	case 47:
+	case 48:
 		if (ndx == 0 || ndx == 1)
 			p = "void";
 		break;
 	/* cloudabi_sys_sock_listen */
-	case 48:
+	case 49:
 		if (ndx == 0 || ndx == 1)
 			p = "void";
 		break;
 	/* cloudabi64_sys_sock_recv */
-	case 49:
+	case 50:
 		if (ndx == 0 || ndx == 1)
 			p = "void";
 		break;
 	/* cloudabi64_sys_sock_send */
-	case 50:
+	case 51:
 		if (ndx == 0 || ndx == 1)
 			p = "void";
 		break;
 	/* cloudabi_sys_sock_shutdown */
-	case 51:
+	case 52:
 		if (ndx == 0 || ndx == 1)
 			p = "void";
 		break;
 	/* cloudabi_sys_sock_stat_get */
-	case 52:
+	case 53:
 		if (ndx == 0 || ndx == 1)
 			p = "void";
 		break;
 	/* cloudabi64_sys_thread_create */
-	case 53:
+	case 54:
 		if (ndx == 0 || ndx == 1)
 			p = "cloudabi_tid_t";
 		break;
 	/* cloudabi_sys_thread_exit */
-	case 54:
-		if (ndx == 0 || ndx == 1)
-			p = "void";
-		break;
-	/* cloudabi_sys_thread_tcb_set */
 	case 55:
 		if (ndx == 0 || ndx == 1)
 			p = "void";
 		break;
 	/* cloudabi_sys_thread_yield */
 	case 56:
-	/* cloudabi64_sys_poll_fd */
-	case 57:
-		if (ndx == 0 || ndx == 1)
-			p = "size_t";
-		break;
 	default:
 		break;
 	};