Sync CloudABI compatibility against the latest upstream version (v0.13).

With Flower (CloudABI's network connection daemon) becoming more
complete, there is no longer any need for creating any unconnected
sockets. Socket pairs in combination with file descriptor passing is all
that is necessary, as that is what is used by Flower to pass network
connections from the public internet to listening processes.

Remove all of the kernel bits that were used to implement socket(),
listen(), bindat() and connectat(). In principle, accept() and
SO_ACCEPTCONN may also be removed, but there are still some consumers
left.

Obtained from:	https://github.com/NuxiNL/cloudabi
MFC after:	1 month

8 files changed, 85 insertions, 253 deletions

diff --git a/sys/contrib/cloudabi/cloudabi_types_common.h b/sys/contrib/cloudabi/cloudabi_types_common.h
index b5c204e859e8..a5176d4df35c 100644
--- a/sys/contrib/cloudabi/cloudabi_types_common.h
+++ b/sys/contrib/cloudabi/cloudabi_types_common.h
@@ -249,47 +249,42 @@ typedef uint16_t cloudabi_riflags_t;
 #define CLOUDABI_SOCK_RECV_WAITALL 0x0010
 
 typedef uint64_t cloudabi_rights_t;
-#define CLOUDABI_RIGHT_FD_DATASYNC            0x0000000000000001
-#define CLOUDABI_RIGHT_FD_READ                0x0000000000000002
-#define CLOUDABI_RIGHT_FD_SEEK                0x0000000000000004
-#define CLOUDABI_RIGHT_FD_STAT_PUT_FLAGS      0x0000000000000008
-#define CLOUDABI_RIGHT_FD_SYNC                0x0000000000000010
-#define CLOUDABI_RIGHT_FD_TELL                0x0000000000000020
-#define CLOUDABI_RIGHT_FD_WRITE               0x0000000000000040
-#define CLOUDABI_RIGHT_FILE_ADVISE            0x0000000000000080
-#define CLOUDABI_RIGHT_FILE_ALLOCATE          0x0000000000000100
-#define CLOUDABI_RIGHT_FILE_CREATE_DIRECTORY  0x0000000000000200
-#define CLOUDABI_RIGHT_FILE_CREATE_FILE       0x0000000000000400
-#define CLOUDABI_RIGHT_FILE_CREATE_FIFO       0x0000000000000800
-#define CLOUDABI_RIGHT_FILE_LINK_SOURCE       0x0000000000001000
-#define CLOUDABI_RIGHT_FILE_LINK_TARGET       0x0000000000002000
-#define CLOUDABI_RIGHT_FILE_OPEN              0x0000000000004000
-#define CLOUDABI_RIGHT_FILE_READDIR           0x0000000000008000
-#define CLOUDABI_RIGHT_FILE_READLINK          0x0000000000010000
-#define CLOUDABI_RIGHT_FILE_RENAME_SOURCE     0x0000000000020000
-#define CLOUDABI_RIGHT_FILE_RENAME_TARGET     0x0000000000040000
-#define CLOUDABI_RIGHT_FILE_STAT_FGET         0x0000000000080000
-#define CLOUDABI_RIGHT_FILE_STAT_FPUT_SIZE    0x0000000000100000
-#define CLOUDABI_RIGHT_FILE_STAT_FPUT_TIMES   0x0000000000200000
-#define CLOUDABI_RIGHT_FILE_STAT_GET          0x0000000000400000
-#define CLOUDABI_RIGHT_FILE_STAT_PUT_TIMES    0x0000000000800000
-#define CLOUDABI_RIGHT_FILE_SYMLINK           0x0000000001000000
-#define CLOUDABI_RIGHT_FILE_UNLINK            0x0000000002000000
-#define CLOUDABI_RIGHT_MEM_MAP                0x0000000004000000
-#define CLOUDABI_RIGHT_MEM_MAP_EXEC           0x0000000008000000
-#define CLOUDABI_RIGHT_POLL_FD_READWRITE      0x0000000010000000
-#define CLOUDABI_RIGHT_POLL_MODIFY            0x0000000020000000
-#define CLOUDABI_RIGHT_POLL_PROC_TERMINATE    0x0000000040000000
-#define CLOUDABI_RIGHT_POLL_WAIT              0x0000000080000000
-#define CLOUDABI_RIGHT_PROC_EXEC              0x0000000100000000
-#define CLOUDABI_RIGHT_SOCK_ACCEPT            0x0000000200000000
-#define CLOUDABI_RIGHT_SOCK_BIND_DIRECTORY    0x0000000400000000
-#define CLOUDABI_RIGHT_SOCK_BIND_SOCKET       0x0000000800000000
-#define CLOUDABI_RIGHT_SOCK_CONNECT_DIRECTORY 0x0000001000000000
-#define CLOUDABI_RIGHT_SOCK_CONNECT_SOCKET    0x0000002000000000
-#define CLOUDABI_RIGHT_SOCK_LISTEN            0x0000004000000000
-#define CLOUDABI_RIGHT_SOCK_SHUTDOWN          0x0000008000000000
-#define CLOUDABI_RIGHT_SOCK_STAT_GET          0x0000010000000000
+#define CLOUDABI_RIGHT_FD_DATASYNC           0x0000000000000001
+#define CLOUDABI_RIGHT_FD_READ               0x0000000000000002
+#define CLOUDABI_RIGHT_FD_SEEK               0x0000000000000004
+#define CLOUDABI_RIGHT_FD_STAT_PUT_FLAGS     0x0000000000000008
+#define CLOUDABI_RIGHT_FD_SYNC               0x0000000000000010
+#define CLOUDABI_RIGHT_FD_TELL               0x0000000000000020
+#define CLOUDABI_RIGHT_FD_WRITE              0x0000000000000040
+#define CLOUDABI_RIGHT_FILE_ADVISE           0x0000000000000080
+#define CLOUDABI_RIGHT_FILE_ALLOCATE         0x0000000000000100
+#define CLOUDABI_RIGHT_FILE_CREATE_DIRECTORY 0x0000000000000200
+#define CLOUDABI_RIGHT_FILE_CREATE_FILE      0x0000000000000400
+#define CLOUDABI_RIGHT_FILE_CREATE_FIFO      0x0000000000000800
+#define CLOUDABI_RIGHT_FILE_LINK_SOURCE      0x0000000000001000
+#define CLOUDABI_RIGHT_FILE_LINK_TARGET      0x0000000000002000
+#define CLOUDABI_RIGHT_FILE_OPEN             0x0000000000004000
+#define CLOUDABI_RIGHT_FILE_READDIR          0x0000000000008000
+#define CLOUDABI_RIGHT_FILE_READLINK         0x0000000000010000
+#define CLOUDABI_RIGHT_FILE_RENAME_SOURCE    0x0000000000020000
+#define CLOUDABI_RIGHT_FILE_RENAME_TARGET    0x0000000000040000
+#define CLOUDABI_RIGHT_FILE_STAT_FGET        0x0000000000080000
+#define CLOUDABI_RIGHT_FILE_STAT_FPUT_SIZE   0x0000000000100000
+#define CLOUDABI_RIGHT_FILE_STAT_FPUT_TIMES  0x0000000000200000
+#define CLOUDABI_RIGHT_FILE_STAT_GET         0x0000000000400000
+#define CLOUDABI_RIGHT_FILE_STAT_PUT_TIMES   0x0000000000800000
+#define CLOUDABI_RIGHT_FILE_SYMLINK          0x0000000001000000
+#define CLOUDABI_RIGHT_FILE_UNLINK           0x0000000002000000
+#define CLOUDABI_RIGHT_MEM_MAP               0x0000000004000000
+#define CLOUDABI_RIGHT_MEM_MAP_EXEC          0x0000000008000000
+#define CLOUDABI_RIGHT_POLL_FD_READWRITE     0x0000000010000000
+#define CLOUDABI_RIGHT_POLL_MODIFY           0x0000000020000000
+#define CLOUDABI_RIGHT_POLL_PROC_TERMINATE   0x0000000040000000
+#define CLOUDABI_RIGHT_POLL_WAIT             0x0000000080000000
+#define CLOUDABI_RIGHT_PROC_EXEC             0x0000000100000000
+#define CLOUDABI_RIGHT_SOCK_ACCEPT           0x0000000200000000
+#define CLOUDABI_RIGHT_SOCK_SHUTDOWN         0x0000008000000000
+#define CLOUDABI_RIGHT_SOCK_STAT_GET         0x0000010000000000
 
 typedef uint16_t cloudabi_roflags_t;
 #define CLOUDABI_SOCK_RECV_FDS_TRUNCATED  0x0001
diff --git a/sys/contrib/cloudabi/cloudabi_vdso_aarch64.S b/sys/contrib/cloudabi/cloudabi_vdso_aarch64.S
index 80f8084ce230..8564dfd74f76 100644
--- a/sys/contrib/cloudabi/cloudabi_vdso_aarch64.S
+++ b/sys/contrib/cloudabi/cloudabi_vdso_aarch64.S
@@ -413,51 +413,33 @@ ENTRY(cloudabi_sys_sock_accept)
   ret
 END(cloudabi_sys_sock_accept)
 
-ENTRY(cloudabi_sys_sock_bind)
-  mov w8, #45
-  svc #0
-  ret
-END(cloudabi_sys_sock_bind)
-
-ENTRY(cloudabi_sys_sock_connect)
-  mov w8, #46
-  svc #0
-  ret
-END(cloudabi_sys_sock_connect)
-
-ENTRY(cloudabi_sys_sock_listen)
-  mov w8, #47
-  svc #0
-  ret
-END(cloudabi_sys_sock_listen)
-
 ENTRY(cloudabi_sys_sock_recv)
-  mov w8, #48
+  mov w8, #45
   svc #0
   ret
 END(cloudabi_sys_sock_recv)
 
 ENTRY(cloudabi_sys_sock_send)
-  mov w8, #49
+  mov w8, #46
   svc #0
   ret
 END(cloudabi_sys_sock_send)
 
 ENTRY(cloudabi_sys_sock_shutdown)
-  mov w8, #50
+  mov w8, #47
   svc #0
   ret
 END(cloudabi_sys_sock_shutdown)
 
 ENTRY(cloudabi_sys_sock_stat_get)
-  mov w8, #51
+  mov w8, #48
   svc #0
   ret
 END(cloudabi_sys_sock_stat_get)
 
 ENTRY(cloudabi_sys_thread_create)
   str x1, [sp, #-8]
-  mov w8, #52
+  mov w8, #49
   svc #0
   ldr x2, [sp, #-8]
   b.cs 1f
@@ -468,12 +450,12 @@ ENTRY(cloudabi_sys_thread_create)
 END(cloudabi_sys_thread_create)
 
 ENTRY(cloudabi_sys_thread_exit)
-  mov w8, #53
+  mov w8, #50
   svc #0
 END(cloudabi_sys_thread_exit)
 
 ENTRY(cloudabi_sys_thread_yield)
-  mov w8, #54
+  mov w8, #51
   svc #0
   ret
 END(cloudabi_sys_thread_yield)
diff --git a/sys/contrib/cloudabi/cloudabi_vdso_armv6.S b/sys/contrib/cloudabi/cloudabi_vdso_armv6.S
index 26944ff6bc44..6fc626d19813 100644
--- a/sys/contrib/cloudabi/cloudabi_vdso_armv6.S
+++ b/sys/contrib/cloudabi/cloudabi_vdso_armv6.S
@@ -375,51 +375,33 @@ ENTRY(cloudabi_sys_sock_accept)
   bx lr
 END(cloudabi_sys_sock_accept)
 
-ENTRY(cloudabi_sys_sock_bind)
-  mov ip, #45
-  swi 0
-  bx lr
-END(cloudabi_sys_sock_bind)
-
-ENTRY(cloudabi_sys_sock_connect)
-  mov ip, #46
-  swi 0
-  bx lr
-END(cloudabi_sys_sock_connect)
-
-ENTRY(cloudabi_sys_sock_listen)
-  mov ip, #47
-  swi 0
-  bx lr
-END(cloudabi_sys_sock_listen)
-
 ENTRY(cloudabi_sys_sock_recv)
-  mov ip, #48
+  mov ip, #45
   swi 0
   bx lr
 END(cloudabi_sys_sock_recv)
 
 ENTRY(cloudabi_sys_sock_send)
-  mov ip, #49
+  mov ip, #46
   swi 0
   bx lr
 END(cloudabi_sys_sock_send)
 
 ENTRY(cloudabi_sys_sock_shutdown)
-  mov ip, #50
+  mov ip, #47
   swi 0
   bx lr
 END(cloudabi_sys_sock_shutdown)
 
 ENTRY(cloudabi_sys_sock_stat_get)
-  mov ip, #51
+  mov ip, #48
   swi 0
   bx lr
 END(cloudabi_sys_sock_stat_get)
 
 ENTRY(cloudabi_sys_thread_create)
   str r1, [sp, #-4]
-  mov ip, #52
+  mov ip, #49
   swi 0
   ldrcc r2, [sp, #-4]
   strcc r0, [r2]
@@ -428,12 +410,12 @@ ENTRY(cloudabi_sys_thread_create)
 END(cloudabi_sys_thread_create)
 
 ENTRY(cloudabi_sys_thread_exit)
-  mov ip, #53
+  mov ip, #50
   swi 0
 END(cloudabi_sys_thread_exit)
 
 ENTRY(cloudabi_sys_thread_yield)
-  mov ip, #54
+  mov ip, #51
   swi 0
   bx lr
 END(cloudabi_sys_thread_yield)
diff --git a/sys/contrib/cloudabi/cloudabi_vdso_i686.S b/sys/contrib/cloudabi/cloudabi_vdso_i686.S
index a226103d57b6..47d02b254f1b 100644
--- a/sys/contrib/cloudabi/cloudabi_vdso_i686.S
+++ b/sys/contrib/cloudabi/cloudabi_vdso_i686.S
@@ -400,50 +400,32 @@ ENTRY(cloudabi_sys_sock_accept)
   ret
 END(cloudabi_sys_sock_accept)
 
-ENTRY(cloudabi_sys_sock_bind)
-  mov $45, %eax
-  int $0x80
-  ret
-END(cloudabi_sys_sock_bind)
-
-ENTRY(cloudabi_sys_sock_connect)
-  mov $46, %eax
-  int $0x80
-  ret
-END(cloudabi_sys_sock_connect)
-
-ENTRY(cloudabi_sys_sock_listen)
-  mov $47, %eax
-  int $0x80
-  ret
-END(cloudabi_sys_sock_listen)
-
 ENTRY(cloudabi_sys_sock_recv)
-  mov $48, %eax
+  mov $45, %eax
   int $0x80
   ret
 END(cloudabi_sys_sock_recv)
 
 ENTRY(cloudabi_sys_sock_send)
-  mov $49, %eax
+  mov $46, %eax
   int $0x80
   ret
 END(cloudabi_sys_sock_send)
 
 ENTRY(cloudabi_sys_sock_shutdown)
-  mov $50, %eax
+  mov $47, %eax
   int $0x80
   ret
 END(cloudabi_sys_sock_shutdown)
 
 ENTRY(cloudabi_sys_sock_stat_get)
-  mov $51, %eax
+  mov $48, %eax
   int $0x80
   ret
 END(cloudabi_sys_sock_stat_get)
 
 ENTRY(cloudabi_sys_thread_create)
-  mov $52, %eax
+  mov $49, %eax
   int $0x80
   jc 1f
   mov 8(%esp), %ecx
@@ -454,12 +436,12 @@ ENTRY(cloudabi_sys_thread_create)
 END(cloudabi_sys_thread_create)
 
 ENTRY(cloudabi_sys_thread_exit)
-  mov $53, %eax
+  mov $50, %eax
   int $0x80
 END(cloudabi_sys_thread_exit)
 
 ENTRY(cloudabi_sys_thread_yield)
-  mov $54, %eax
+  mov $51, %eax
   int $0x80
   ret
 END(cloudabi_sys_thread_yield)
diff --git a/sys/contrib/cloudabi/cloudabi_vdso_i686_on_64bit.S b/sys/contrib/cloudabi/cloudabi_vdso_i686_on_64bit.S
index a9bb629904aa..460936c6f227 100644
--- a/sys/contrib/cloudabi/cloudabi_vdso_i686_on_64bit.S
+++ b/sys/contrib/cloudabi/cloudabi_vdso_i686_on_64bit.S
@@ -1015,63 +1015,6 @@ ENTRY(cloudabi_sys_sock_accept)
   ret
 END(cloudabi_sys_sock_accept)
 
-ENTRY(cloudabi_sys_sock_bind)
-  push %ebp
-  mov %esp, %ebp
-  mov 8(%ebp), %ecx
-  mov %ecx, -32(%ebp)
-  mov 12(%ebp), %ecx
-  mov %ecx, -24(%ebp)
-  mov 16(%ebp), %ecx
-  mov %ecx, -16(%ebp)
-  movl $0, -12(%ebp)
-  mov 20(%ebp), %ecx
-  mov %ecx, -8(%ebp)
-  movl $0, -4(%ebp)
-  mov $45, %eax
-  mov %ebp, %ecx
-  sub $32, %ecx
-  int $0x80
-  pop %ebp
-  ret
-END(cloudabi_sys_sock_bind)
-
-ENTRY(cloudabi_sys_sock_connect)
-  push %ebp
-  mov %esp, %ebp
-  mov 8(%ebp), %ecx
-  mov %ecx, -32(%ebp)
-  mov 12(%ebp), %ecx
-  mov %ecx, -24(%ebp)
-  mov 16(%ebp), %ecx
-  mov %ecx, -16(%ebp)
-  movl $0, -12(%ebp)
-  mov 20(%ebp), %ecx
-  mov %ecx, -8(%ebp)
-  movl $0, -4(%ebp)
-  mov $46, %eax
-  mov %ebp, %ecx
-  sub $32, %ecx
-  int $0x80
-  pop %ebp
-  ret
-END(cloudabi_sys_sock_connect)
-
-ENTRY(cloudabi_sys_sock_listen)
-  push %ebp
-  mov %esp, %ebp
-  mov 8(%ebp), %ecx
-  mov %ecx, -16(%ebp)
-  mov 12(%ebp), %ecx
-  mov %ecx, -8(%ebp)
-  mov $47, %eax
-  mov %ebp, %ecx
-  sub $16, %ecx
-  int $0x80
-  pop %ebp
-  ret
-END(cloudabi_sys_sock_listen)
-
 ENTRY(cloudabi_sys_sock_recv)
   push %ebp
   mov %esp, %ebp
@@ -1083,7 +1026,7 @@ ENTRY(cloudabi_sys_sock_recv)
   mov 16(%ebp), %ecx
   mov %ecx, -8(%ebp)
   movl $0, -4(%ebp)
-  mov $48, %eax
+  mov $45, %eax
   mov %ebp, %ecx
   sub $24, %ecx
   int $0x80
@@ -1102,7 +1045,7 @@ ENTRY(cloudabi_sys_sock_send)
   mov 16(%ebp), %ecx
   mov %ecx, -8(%ebp)
   movl $0, -4(%ebp)
-  mov $49, %eax
+  mov $46, %eax
   mov %ebp, %ecx
   sub $24, %ecx
   int $0x80
@@ -1117,7 +1060,7 @@ ENTRY(cloudabi_sys_sock_shutdown)
   mov %ecx, -16(%ebp)
   mov 12(%ebp), %ecx
   mov %ecx, -8(%ebp)
-  mov $50, %eax
+  mov $47, %eax
   mov %ebp, %ecx
   sub $16, %ecx
   int $0x80
@@ -1135,7 +1078,7 @@ ENTRY(cloudabi_sys_sock_stat_get)
   movl $0, -12(%ebp)
   mov 16(%ebp), %ecx
   mov %ecx, -8(%ebp)
-  mov $51, %eax
+  mov $48, %eax
   mov %ebp, %ecx
   sub $24, %ecx
   int $0x80
@@ -1149,7 +1092,7 @@ ENTRY(cloudabi_sys_thread_create)
   mov 8(%ebp), %ecx
   mov %ecx, -16(%ebp)
   movl $0, -12(%ebp)
-  mov $52, %eax
+  mov $49, %eax
   mov %ebp, %ecx
   sub $16, %ecx
   int $0x80
@@ -1171,7 +1114,7 @@ ENTRY(cloudabi_sys_thread_exit)
   movl $0, -12(%ebp)
   mov 12(%ebp), %ecx
   mov %ecx, -8(%ebp)
-  mov $53, %eax
+  mov $50, %eax
   mov %ebp, %ecx
   sub $16, %ecx
   int $0x80
@@ -1180,7 +1123,7 @@ END(cloudabi_sys_thread_exit)
 ENTRY(cloudabi_sys_thread_yield)
   push %ebp
   mov %esp, %ebp
-  mov $54, %eax
+  mov $51, %eax
   mov %ebp, %ecx
   sub $16, %ecx
   int $0x80
diff --git a/sys/contrib/cloudabi/cloudabi_vdso_x86_64.S b/sys/contrib/cloudabi/cloudabi_vdso_x86_64.S
index c68047cc6e3d..18e89ed55488 100644
--- a/sys/contrib/cloudabi/cloudabi_vdso_x86_64.S
+++ b/sys/contrib/cloudabi/cloudabi_vdso_x86_64.S
@@ -431,53 +431,33 @@ ENTRY(cloudabi_sys_sock_accept)
   ret
 END(cloudabi_sys_sock_accept)
 
-ENTRY(cloudabi_sys_sock_bind)
-  mov %rcx, %r10
-  mov $45, %eax
-  syscall
-  ret
-END(cloudabi_sys_sock_bind)
-
-ENTRY(cloudabi_sys_sock_connect)
-  mov %rcx, %r10
-  mov $46, %eax
-  syscall
-  ret
-END(cloudabi_sys_sock_connect)
-
-ENTRY(cloudabi_sys_sock_listen)
-  mov $47, %eax
-  syscall
-  ret
-END(cloudabi_sys_sock_listen)
-
 ENTRY(cloudabi_sys_sock_recv)
-  mov $48, %eax
+  mov $45, %eax
   syscall
   ret
 END(cloudabi_sys_sock_recv)
 
 ENTRY(cloudabi_sys_sock_send)
-  mov $49, %eax
+  mov $46, %eax
   syscall
   ret
 END(cloudabi_sys_sock_send)
 
 ENTRY(cloudabi_sys_sock_shutdown)
-  mov $50, %eax
+  mov $47, %eax
   syscall
   ret
 END(cloudabi_sys_sock_shutdown)
 
 ENTRY(cloudabi_sys_sock_stat_get)
-  mov $51, %eax
+  mov $48, %eax
   syscall
   ret
 END(cloudabi_sys_sock_stat_get)
 
 ENTRY(cloudabi_sys_thread_create)
   push %rsi
-  mov $52, %eax
+  mov $49, %eax
   syscall
   pop %rcx
   jc 1f
@@ -488,12 +468,12 @@ ENTRY(cloudabi_sys_thread_create)
 END(cloudabi_sys_thread_create)
 
 ENTRY(cloudabi_sys_thread_exit)
-  mov $53, %eax
+  mov $50, %eax
   syscall
 END(cloudabi_sys_thread_exit)
 
 ENTRY(cloudabi_sys_thread_yield)
-  mov $54, %eax
+  mov $51, %eax
   syscall
   ret
 END(cloudabi_sys_thread_yield)
diff --git a/sys/contrib/cloudabi/syscalls32.master b/sys/contrib/cloudabi/syscalls32.master
index 02ef57f17fa4..69c2f8d250c4 100644
--- a/sys/contrib/cloudabi/syscalls32.master
+++ b/sys/contrib/cloudabi/syscalls32.master
@@ -262,46 +262,30 @@
 					cloudabi_fd_t sock, \
 					void *unused); }
 
-45	AUE_NULL	STD	{ void cloudabi_sys_sock_bind( \
-					cloudabi_fd_t sock, \
-					cloudabi_fd_t fd, \
-					const char *path, \
-					size_t path_len); }
-
-46	AUE_NULL	STD	{ void cloudabi_sys_sock_connect( \
-					cloudabi_fd_t sock, \
-					cloudabi_fd_t fd, \
-					const char *path, \
-					size_t path_len); }
-
-47	AUE_NULL	STD	{ void cloudabi_sys_sock_listen( \
-					cloudabi_fd_t sock, \
-					cloudabi_backlog_t backlog); }
-
-48	AUE_NULL	STD	{ void cloudabi32_sys_sock_recv( \
+45	AUE_NULL	STD	{ void cloudabi32_sys_sock_recv( \
 					cloudabi_fd_t sock, \
 					const cloudabi32_recv_in_t *in, \
 					cloudabi32_recv_out_t *out); }
 
-49	AUE_NULL	STD	{ void cloudabi32_sys_sock_send( \
+46	AUE_NULL	STD	{ void cloudabi32_sys_sock_send( \
 					cloudabi_fd_t sock, \
 					const cloudabi32_send_in_t *in, \
 					cloudabi32_send_out_t *out); }
 
-50	AUE_NULL	STD	{ void cloudabi_sys_sock_shutdown( \
+47	AUE_NULL	STD	{ void cloudabi_sys_sock_shutdown( \
 					cloudabi_fd_t sock, \
 					cloudabi_sdflags_t how); }
 
-51	AUE_NULL	STD	{ void cloudabi_sys_sock_stat_get( \
+48	AUE_NULL	STD	{ void cloudabi_sys_sock_stat_get( \
 					cloudabi_fd_t sock, \
 					cloudabi_sockstat_t *buf, \
 					cloudabi_ssflags_t flags); }
 
-52	AUE_NULL	STD	{ cloudabi_tid_t cloudabi32_sys_thread_create( \
+49	AUE_NULL	STD	{ cloudabi_tid_t cloudabi32_sys_thread_create( \
 					cloudabi32_threadattr_t *attr); }
 
-53	AUE_NULL	STD	{ void cloudabi_sys_thread_exit( \
+50	AUE_NULL	STD	{ void cloudabi_sys_thread_exit( \
 					cloudabi_lock_t *lock, \
 					cloudabi_scope_t scope); }
 
-54	AUE_NULL	STD	{ void cloudabi_sys_thread_yield(); }
+51	AUE_NULL	STD	{ void cloudabi_sys_thread_yield(); }
diff --git a/sys/contrib/cloudabi/syscalls64.master b/sys/contrib/cloudabi/syscalls64.master
index e35863099500..642bb8c6e9db 100644
--- a/sys/contrib/cloudabi/syscalls64.master
+++ b/sys/contrib/cloudabi/syscalls64.master
@@ -262,46 +262,30 @@
 					cloudabi_fd_t sock, \
 					void *unused); }
 
-45	AUE_NULL	STD	{ void cloudabi_sys_sock_bind( \
-					cloudabi_fd_t sock, \
-					cloudabi_fd_t fd, \
-					const char *path, \
-					size_t path_len); }
-
-46	AUE_NULL	STD	{ void cloudabi_sys_sock_connect( \
-					cloudabi_fd_t sock, \
-					cloudabi_fd_t fd, \
-					const char *path, \
-					size_t path_len); }
-
-47	AUE_NULL	STD	{ void cloudabi_sys_sock_listen( \
-					cloudabi_fd_t sock, \
-					cloudabi_backlog_t backlog); }
-
-48	AUE_NULL	STD	{ void cloudabi64_sys_sock_recv( \
+45	AUE_NULL	STD	{ void cloudabi64_sys_sock_recv( \
 					cloudabi_fd_t sock, \
 					const cloudabi64_recv_in_t *in, \
 					cloudabi64_recv_out_t *out); }
 
-49	AUE_NULL	STD	{ void cloudabi64_sys_sock_send( \
+46	AUE_NULL	STD	{ void cloudabi64_sys_sock_send( \
 					cloudabi_fd_t sock, \
 					const cloudabi64_send_in_t *in, \
 					cloudabi64_send_out_t *out); }
 
-50	AUE_NULL	STD	{ void cloudabi_sys_sock_shutdown( \
+47	AUE_NULL	STD	{ void cloudabi_sys_sock_shutdown( \
 					cloudabi_fd_t sock, \
 					cloudabi_sdflags_t how); }
 
-51	AUE_NULL	STD	{ void cloudabi_sys_sock_stat_get( \
+48	AUE_NULL	STD	{ void cloudabi_sys_sock_stat_get( \
 					cloudabi_fd_t sock, \
 					cloudabi_sockstat_t *buf, \
 					cloudabi_ssflags_t flags); }
 
-52	AUE_NULL	STD	{ cloudabi_tid_t cloudabi64_sys_thread_create( \
+49	AUE_NULL	STD	{ cloudabi_tid_t cloudabi64_sys_thread_create( \
 					cloudabi64_threadattr_t *attr); }
 
-53	AUE_NULL	STD	{ void cloudabi_sys_thread_exit( \
+50	AUE_NULL	STD	{ void cloudabi_sys_thread_exit( \
 					cloudabi_lock_t *lock, \
 					cloudabi_scope_t scope); }
 
-54	AUE_NULL	STD	{ void cloudabi_sys_thread_yield(); }
+51	AUE_NULL	STD	{ void cloudabi_sys_thread_yield(); }