MFC r303818, r303833, r303941, r304478, r304481, r304483, r304484, r304554,

    r304555, r304556, r304557, r304558, r304559, r304561, r304563, r304564,
    r304565, r304615, r304742, r304743, r304744, r304745, r304748, r304886,
    r304991, r305928, r305938, r305987, r306185:

  Bring CloudABI support back in sync with HEAD.

  - Add support for running 32-bit executables on amd64, armv6 and i386.

  - As these new architectures require the use of the vDSO, merge back
    vDSO support for 64-bit executables running on amd64 and arm64 as
    well. This has the advantage that support for vDSO-less execution
    can be phased out when 11.0 becomes unsupported, as opposed to 11.x.

  This change has been tested by running the cloudlibc unit tests on all
  supported architectures, which seems to work fine.

1 files changed, 315 insertions, 0 deletions

diff --git a/sys/contrib/cloudabi/syscalls64.master b/sys/contrib/cloudabi/syscalls64.master
new file mode 100644
index 0000000..b2378bd
--- /dev/null
+++ b/sys/contrib/cloudabi/syscalls64.master
@@ -0,0 +1,315 @@
+ $FreeBSD$
+
+; Copyright (c) 2016 Nuxi (https://nuxi.nl/) and contributors.
+;
+; Redistribution and use in source and binary forms, with or without
+; modification, are permitted provided that the following conditions
+; are met:
+; 1. Redistributions of source code must retain the above copyright
+;    notice, this list of conditions and the following disclaimer.
+; 2. Redistributions in binary form must reproduce the above copyright
+;    notice, this list of conditions and the following disclaimer in the
+;    documentation and/or other materials provided with the distribution.
+;
+; THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+; ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+; IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+; ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+; FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+; DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+; OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+; HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+; LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+; OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+; SUCH DAMAGE.
+;
+; This file is automatically generated. Do not edit.
+;
+; Source: https://github.com/NuxiNL/cloudabi
+
+#include <sys/sysent.h>
+#include <sys/sysproto.h>
+
+#include <contrib/cloudabi/cloudabi64_types.h>
+
+#include <compat/cloudabi64/cloudabi64_proto.h>
+
+0	AUE_NULL	STD	{ cloudabi_timestamp_t \
+					cloudabi_sys_clock_res_get( \
+					cloudabi_clockid_t clock_id); }
+
+1	AUE_NULL	STD	{ cloudabi_timestamp_t \
+					cloudabi_sys_clock_time_get( \
+					cloudabi_clockid_t clock_id, \
+					cloudabi_timestamp_t precision); }
+
+2	AUE_NULL	STD	{ void cloudabi_sys_condvar_signal( \
+					cloudabi_condvar_t *condvar, \
+					cloudabi_scope_t scope, \
+					cloudabi_nthreads_t nwaiters); }
+
+3	AUE_NULL	STD	{ void cloudabi_sys_fd_close( \
+					cloudabi_fd_t fd); }
+
+4	AUE_NULL	STD	{ cloudabi_fd_t cloudabi_sys_fd_create1( \
+					cloudabi_filetype_t type); }
+
+5	AUE_NULL	STD	{ void cloudabi_sys_fd_create2( \
+					cloudabi_filetype_t type); }
+
+6	AUE_NULL	STD	{ void cloudabi_sys_fd_datasync( \
+					cloudabi_fd_t fd); }
+
+7	AUE_NULL	STD	{ cloudabi_fd_t cloudabi_sys_fd_dup( \
+					cloudabi_fd_t from); }
+
+8	AUE_NULL	STD	{ size_t cloudabi64_sys_fd_pread( \
+					cloudabi_fd_t fd, \
+					const cloudabi64_iovec_t *iov, \
+					size_t iovcnt, \
+					cloudabi_filesize_t offset); }
+
+9	AUE_NULL	STD	{ size_t cloudabi64_sys_fd_pwrite( \
+					cloudabi_fd_t fd, \
+					const cloudabi64_ciovec_t *iov, \
+					size_t iovcnt, \
+					cloudabi_filesize_t offset); }
+
+10	AUE_NULL	STD	{ size_t cloudabi64_sys_fd_read( \
+					cloudabi_fd_t fd, \
+					const cloudabi64_iovec_t *iov, \
+					size_t iovcnt); }
+
+11	AUE_NULL	STD	{ void cloudabi_sys_fd_replace( \
+					cloudabi_fd_t from, \
+					cloudabi_fd_t to); }
+
+12	AUE_NULL	STD	{ cloudabi_filesize_t \
+					cloudabi_sys_fd_seek( \
+					cloudabi_fd_t fd, \
+					cloudabi_filedelta_t offset, \
+					cloudabi_whence_t whence); }
+
+13	AUE_NULL	STD	{ void cloudabi_sys_fd_stat_get( \
+					cloudabi_fd_t fd, \
+					cloudabi_fdstat_t *buf); }
+
+14	AUE_NULL	STD	{ void cloudabi_sys_fd_stat_put( \
+					cloudabi_fd_t fd, \
+					const cloudabi_fdstat_t *buf, \
+					cloudabi_fdsflags_t flags); }
+
+15	AUE_NULL	STD	{ void cloudabi_sys_fd_sync( \
+					cloudabi_fd_t fd); }
+
+16	AUE_NULL	STD	{ size_t cloudabi64_sys_fd_write( \
+					cloudabi_fd_t fd, \
+					const cloudabi64_ciovec_t *iov, \
+					size_t iovcnt); }
+
+17	AUE_NULL	STD	{ void cloudabi_sys_file_advise( \
+					cloudabi_fd_t fd, \
+					cloudabi_filesize_t offset, \
+					cloudabi_filesize_t len, \
+					cloudabi_advice_t advice); }
+
+18	AUE_NULL	STD	{ void cloudabi_sys_file_allocate( \
+					cloudabi_fd_t fd, \
+					cloudabi_filesize_t offset, \
+					cloudabi_filesize_t len); }
+
+19	AUE_NULL	STD	{ void cloudabi_sys_file_create( \
+					cloudabi_fd_t fd, \
+					const char *path, \
+					size_t pathlen, \
+					cloudabi_filetype_t type); }
+
+20	AUE_NULL	STD	{ void cloudabi_sys_file_link( \
+					cloudabi_lookup_t fd1, \
+					const char *path1, \
+					size_t path1len, \
+					cloudabi_fd_t fd2, \
+					const char *path2, \
+					size_t path2len); }
+
+21	AUE_NULL	STD	{ cloudabi_fd_t cloudabi_sys_file_open( \
+					cloudabi_lookup_t dirfd, \
+					const char *path, \
+					size_t pathlen, \
+					cloudabi_oflags_t oflags, \
+					const cloudabi_fdstat_t *fds); }
+
+22	AUE_NULL	STD	{ size_t cloudabi_sys_file_readdir( \
+					cloudabi_fd_t fd, \
+					void *buf, \
+					size_t nbyte, \
+					cloudabi_dircookie_t cookie); }
+
+23	AUE_NULL	STD	{ size_t cloudabi_sys_file_readlink( \
+					cloudabi_fd_t fd, \
+					const char *path, \
+					size_t pathlen, \
+					char *buf, \
+					size_t bufsize); }
+
+24	AUE_NULL	STD	{ void cloudabi_sys_file_rename( \
+					cloudabi_fd_t oldfd, \
+					const char *old, \
+					size_t oldlen, \
+					cloudabi_fd_t newfd, \
+					const char *new, \
+					size_t newlen); }
+
+25	AUE_NULL	STD	{ void cloudabi_sys_file_stat_fget( \
+					cloudabi_fd_t fd, \
+					cloudabi_filestat_t *buf); }
+
+26	AUE_NULL	STD	{ void cloudabi_sys_file_stat_fput( \
+					cloudabi_fd_t fd, \
+					const cloudabi_filestat_t *buf, \
+					cloudabi_fsflags_t flags); }
+
+27	AUE_NULL	STD	{ void cloudabi_sys_file_stat_get( \
+					cloudabi_lookup_t fd, \
+					const char *path, \
+					size_t pathlen, \
+					cloudabi_filestat_t *buf); }
+
+28	AUE_NULL	STD	{ void cloudabi_sys_file_stat_put( \
+					cloudabi_lookup_t fd, \
+					const char *path, \
+					size_t pathlen, \
+					const cloudabi_filestat_t *buf, \
+					cloudabi_fsflags_t flags); }
+
+29	AUE_NULL	STD	{ void cloudabi_sys_file_symlink( \
+					const char *path1, \
+					size_t path1len, \
+					cloudabi_fd_t fd, \
+					const char *path2, \
+					size_t path2len); }
+
+30	AUE_NULL	STD	{ void cloudabi_sys_file_unlink( \
+					cloudabi_fd_t fd, \
+					const char *path, \
+					size_t pathlen, \
+					cloudabi_ulflags_t flags); }
+
+31	AUE_NULL	STD	{ void cloudabi_sys_lock_unlock( \
+					cloudabi_lock_t *lock, \
+					cloudabi_scope_t scope); }
+
+32	AUE_NULL	STD	{ void cloudabi_sys_mem_advise( \
+					void *addr, \
+					size_t len, \
+					cloudabi_advice_t advice); }
+
+33	AUE_NULL	STD	{ void cloudabi_sys_mem_lock( \
+					const void *addr, \
+					size_t len); }
+
+34	AUE_NULL	STD	{ void cloudabi_sys_mem_map( \
+					void *addr, \
+					size_t len, \
+					cloudabi_mprot_t prot, \
+					cloudabi_mflags_t flags, \
+					cloudabi_fd_t fd, \
+					cloudabi_filesize_t off); }
+
+35	AUE_NULL	STD	{ void cloudabi_sys_mem_protect( \
+					void *addr, \
+					size_t len, \
+					cloudabi_mprot_t prot); }
+
+36	AUE_NULL	STD	{ void cloudabi_sys_mem_sync( \
+					void *addr, \
+					size_t len, \
+					cloudabi_msflags_t flags); }
+
+37	AUE_NULL	STD	{ void cloudabi_sys_mem_unlock( \
+					const void *addr, \
+					size_t len); }
+
+38	AUE_NULL	STD	{ void cloudabi_sys_mem_unmap( \
+					void *addr, \
+					size_t len); }
+
+39	AUE_NULL	STD	{ size_t cloudabi64_sys_poll( \
+					const cloudabi64_subscription_t *in, \
+					cloudabi64_event_t *out, \
+					size_t nsubscriptions); }
+
+40	AUE_NULL	STD	{ size_t cloudabi64_sys_poll_fd( \
+					cloudabi_fd_t fd, \
+					const cloudabi64_subscription_t *in, \
+					size_t nin, \
+					cloudabi64_event_t *out, \
+					size_t nout, \
+					const cloudabi64_subscription_t *timeout); }
+
+41	AUE_NULL	STD	{ void cloudabi_sys_proc_exec( \
+					cloudabi_fd_t fd, \
+					const void *data, \
+					size_t datalen, \
+					const cloudabi_fd_t *fds, \
+					size_t fdslen); }
+
+42	AUE_NULL	STD	{ void cloudabi_sys_proc_exit( \
+					cloudabi_exitcode_t rval); }
+
+43	AUE_NULL	STD	{ void cloudabi_sys_proc_fork(); }
+
+44	AUE_NULL	STD	{ void cloudabi_sys_proc_raise( \
+					cloudabi_signal_t sig); }
+
+45	AUE_NULL	STD	{ void cloudabi_sys_random_get( \
+					void *buf, \
+					size_t nbyte); }
+
+46	AUE_NULL	STD	{ cloudabi_fd_t cloudabi_sys_sock_accept( \
+					cloudabi_fd_t sock, \
+					cloudabi_sockstat_t *buf); }
+
+47	AUE_NULL	STD	{ void cloudabi_sys_sock_bind( \
+					cloudabi_fd_t sock, \
+					cloudabi_fd_t fd, \
+					const char *path, \
+					size_t pathlen); }
+
+48	AUE_NULL	STD	{ void cloudabi_sys_sock_connect( \
+					cloudabi_fd_t sock, \
+					cloudabi_fd_t fd, \
+					const char *path, \
+					size_t pathlen); }
+
+49	AUE_NULL	STD	{ void cloudabi_sys_sock_listen( \
+					cloudabi_fd_t sock, \
+					cloudabi_backlog_t backlog); }
+
+50	AUE_NULL	STD	{ void cloudabi64_sys_sock_recv( \
+					cloudabi_fd_t sock, \
+					const cloudabi64_recv_in_t *in, \
+					cloudabi64_recv_out_t *out); }
+
+51	AUE_NULL	STD	{ void cloudabi64_sys_sock_send( \
+					cloudabi_fd_t sock, \
+					const cloudabi64_send_in_t *in, \
+					cloudabi64_send_out_t *out); }
+
+52	AUE_NULL	STD	{ void cloudabi_sys_sock_shutdown( \
+					cloudabi_fd_t sock, \
+					cloudabi_sdflags_t how); }
+
+53	AUE_NULL	STD	{ void cloudabi_sys_sock_stat_get( \
+					cloudabi_fd_t sock, \
+					cloudabi_sockstat_t *buf, \
+					cloudabi_ssflags_t flags); }
+
+54	AUE_NULL	STD	{ cloudabi_tid_t cloudabi64_sys_thread_create( \
+					cloudabi64_threadattr_t *attr); }
+
+55	AUE_NULL	STD	{ void cloudabi_sys_thread_exit( \
+					cloudabi_lock_t *lock, \
+					cloudabi_scope_t scope); }
+
+56	AUE_NULL	STD	{ void cloudabi_sys_thread_yield(); }