Sever wasip2's dependence on wasip1 headers

expected/wasm32-wasip1-threads/defined-symbols.txt

@@ -1390,4 +1390,4 @@ y0f
 y1
 y1f
 yn
-ynf
+ynf

expected/wasm32-wasip1-threads/predefined-macros.txt

@@ -175,62 +175,62 @@
 #define DONT 254
 #define DOUBLEBITS (sizeof(double) * 8)
 #define DTTOIF(x) (__wasilibc_dttoif(x))
-#define DT_BLK __WASI_FILETYPE_BLOCK_DEVICE
-#define DT_CHR __WASI_FILETYPE_CHARACTER_DEVICE
-#define DT_DIR __WASI_FILETYPE_DIRECTORY
-#define DT_FIFO __WASI_FILETYPE_SOCKET_STREAM
-#define DT_LNK __WASI_FILETYPE_SYMBOLIC_LINK
-#define DT_REG __WASI_FILETYPE_REGULAR_FILE
+#define DT_BLK 1
+#define DT_CHR 2
+#define DT_DIR 3
+#define DT_FIFO 6
+#define DT_LNK 7
+#define DT_REG 4
 #define DT_SOCK 20
-#define DT_UNKNOWN __WASI_FILETYPE_UNKNOWN
+#define DT_UNKNOWN 0
 #define D_FMT 0x20029
 #define D_T_FMT 0x20028
-#define E2BIG __WASI_ERRNO_2BIG
-#define EACCES __WASI_ERRNO_ACCES
+#define E2BIG 1
+#define EACCES 2
 #define EACCESS 2
-#define EADDRINUSE __WASI_ERRNO_ADDRINUSE
-#define EADDRNOTAVAIL __WASI_ERRNO_ADDRNOTAVAIL
-#define EAFNOSUPPORT __WASI_ERRNO_AFNOSUPPORT
-#define EAGAIN __WASI_ERRNO_AGAIN
-#define EALREADY __WASI_ERRNO_ALREADY
-#define EBADF __WASI_ERRNO_BADF
+#define EADDRINUSE 3
+#define EADDRNOTAVAIL 4
+#define EAFNOSUPPORT 5
+#define EAGAIN 6
+#define EALREADY 7
+#define EBADF 8
 #define EBADID 5
-#define EBADMSG __WASI_ERRNO_BADMSG
+#define EBADMSG 9
 #define EBADOP 4
-#define EBUSY __WASI_ERRNO_BUSY
+#define EBUSY 10
 #define EC 247
-#define ECANCELED __WASI_ERRNO_CANCELED
-#define ECHILD __WASI_ERRNO_CHILD
-#define ECONNABORTED __WASI_ERRNO_CONNABORTED
-#define ECONNREFUSED __WASI_ERRNO_CONNREFUSED
-#define ECONNRESET __WASI_ERRNO_CONNRESET
-#define EDEADLK __WASI_ERRNO_DEADLK
-#define EDESTADDRREQ __WASI_ERRNO_DESTADDRREQ
-#define EDOM __WASI_ERRNO_DOM
-#define EDQUOT __WASI_ERRNO_DQUOT
-#define EEXIST __WASI_ERRNO_EXIST
+#define ECANCELED 11
+#define ECHILD 12
+#define ECONNABORTED 13
+#define ECONNREFUSED 14
+#define ECONNRESET 15
+#define EDEADLK 16
+#define EDESTADDRREQ 17
+#define EDOM 18
+#define EDQUOT 19
+#define EEXIST 20
 #define EEXISTS 6
-#define EFAULT __WASI_ERRNO_FAULT
-#define EFBIG __WASI_ERRNO_FBIG
+#define EFAULT 21
+#define EFBIG 22
 #define EFD_CLOEXEC O_CLOEXEC
 #define EFD_NONBLOCK O_NONBLOCK
 #define EFD_SEMAPHORE 1
-#define EHOSTUNREACH __WASI_ERRNO_HOSTUNREACH
-#define EIDRM __WASI_ERRNO_IDRM
-#define EILSEQ __WASI_ERRNO_ILSEQ
-#define EINPROGRESS __WASI_ERRNO_INPROGRESS
-#define EINTR __WASI_ERRNO_INTR
-#define EINVAL __WASI_ERRNO_INVAL
-#define EIO __WASI_ERRNO_IO
-#define EISCONN __WASI_ERRNO_ISCONN
-#define EISDIR __WASI_ERRNO_ISDIR
+#define EHOSTUNREACH 23
+#define EIDRM 24
+#define EILSEQ 25
+#define EINPROGRESS 26
+#define EINTR 27
+#define EINVAL 28
+#define EIO 29
+#define EISCONN 30
+#define EISDIR 31
 #define EL 248
-#define ELOOP __WASI_ERRNO_LOOP
-#define EMFILE __WASI_ERRNO_MFILE
-#define EMLINK __WASI_ERRNO_MLINK
-#define EMSGSIZE __WASI_ERRNO_MSGSIZE
-#define EMULTIHOP __WASI_ERRNO_MULTIHOP
-#define ENAMETOOLONG __WASI_ERRNO_NAMETOOLONG
+#define ELOOP 32
+#define EMFILE 33
+#define EMLINK 34
+#define EMSGSIZE 35
+#define EMULTIHOP 36
+#define ENAMETOOLONG 37
 #define ENCRYPT_CNT 9
 #define ENCRYPT_DEC_KEYID 8
 #define ENCRYPT_ENC_KEYID 7
@@ -249,60 +249,60 @@
 #define ENCTYPE_DES_OFB64 2
 #define ENCTYPE_NAME(x) enctype_names[x]
 #define ENCTYPE_NAME_OK(x) ((unsigned int)(x) < ENCTYPE_CNT)
-#define ENETDOWN __WASI_ERRNO_NETDOWN
-#define ENETRESET __WASI_ERRNO_NETRESET
-#define ENETUNREACH __WASI_ERRNO_NETUNREACH
-#define ENFILE __WASI_ERRNO_NFILE
-#define ENOBUFS __WASI_ERRNO_NOBUFS
-#define ENODEV __WASI_ERRNO_NODEV
-#define ENOENT __WASI_ERRNO_NOENT
-#define ENOEXEC __WASI_ERRNO_NOEXEC
-#define ENOLCK __WASI_ERRNO_NOLCK
-#define ENOLINK __WASI_ERRNO_NOLINK
-#define ENOMEM __WASI_ERRNO_NOMEM
-#define ENOMSG __WASI_ERRNO_NOMSG
-#define ENOPROTOOPT __WASI_ERRNO_NOPROTOOPT
+#define ENETDOWN 38
+#define ENETRESET 39
+#define ENETUNREACH 40
+#define ENFILE 41
+#define ENOBUFS 42
+#define ENODEV 43
+#define ENOENT 44
+#define ENOEXEC 45
+#define ENOLCK 46
+#define ENOLINK 47
+#define ENOMEM 48
+#define ENOMSG 49
+#define ENOPROTOOPT 50
 #define ENOSPACE 3
-#define ENOSPC __WASI_ERRNO_NOSPC
-#define ENOSYS __WASI_ERRNO_NOSYS
-#define ENOTCAPABLE __WASI_ERRNO_NOTCAPABLE
-#define ENOTCONN __WASI_ERRNO_NOTCONN
-#define ENOTDIR __WASI_ERRNO_NOTDIR
-#define ENOTEMPTY __WASI_ERRNO_NOTEMPTY
+#define ENOSPC 51
+#define ENOSYS 52
+#define ENOTCAPABLE 76
+#define ENOTCONN 53
+#define ENOTDIR 54
+#define ENOTEMPTY 55
 #define ENOTFOUND 1
-#define ENOTRECOVERABLE __WASI_ERRNO_NOTRECOVERABLE
-#define ENOTSOCK __WASI_ERRNO_NOTSOCK
-#define ENOTSUP __WASI_ERRNO_NOTSUP
-#define ENOTTY __WASI_ERRNO_NOTTY
+#define ENOTRECOVERABLE 56
+#define ENOTSOCK 57
+#define ENOTSUP 58
+#define ENOTTY 59
 #define ENOUSER 7
 #define ENV_ESC 2
 #define ENV_USERVAR 3
-#define ENXIO __WASI_ERRNO_NXIO
+#define ENXIO 60
 #define EOF (-1)
 #define EOPNOTSUPP ENOTSUP
 #define EOR 239
-#define EOVERFLOW __WASI_ERRNO_OVERFLOW
-#define EOWNERDEAD __WASI_ERRNO_OWNERDEAD
-#define EPERM __WASI_ERRNO_PERM
-#define EPIPE __WASI_ERRNO_PIPE
-#define EPROTO __WASI_ERRNO_PROTO
-#define EPROTONOSUPPORT __WASI_ERRNO_PROTONOSUPPORT
-#define EPROTOTYPE __WASI_ERRNO_PROTOTYPE
+#define EOVERFLOW 61
+#define EOWNERDEAD 62
+#define EPERM 63
+#define EPIPE 64
+#define EPROTO 65
+#define EPROTONOSUPPORT 66
+#define EPROTOTYPE 67
 #define ERA 0x2002C
-#define ERANGE __WASI_ERRNO_RANGE
+#define ERANGE 68
 #define ERA_D_FMT 0x2002E
 #define ERA_D_T_FMT 0x20030
 #define ERA_T_FMT 0x20031
-#define EROFS __WASI_ERRNO_ROFS
+#define EROFS 69
 #define ERROR 05
-#define ESPIPE __WASI_ERRNO_SPIPE
-#define ESRCH __WASI_ERRNO_SRCH
-#define ESTALE __WASI_ERRNO_STALE
-#define ETIMEDOUT __WASI_ERRNO_TIMEDOUT
-#define ETXTBSY __WASI_ERRNO_TXTBSY
+#define ESPIPE 70
+#define ESRCH 71
+#define ESTALE 72
+#define ETIMEDOUT 73
+#define ETXTBSY 74
 #define EUNDEF 0
 #define EWOULDBLOCK EAGAIN
-#define EXDEV __WASI_ERRNO_XDEV
+#define EXDEV 75
 #define EXIT_FAILURE 1
 #define EXIT_SUCCESS 0
 #define EX_CANTCREAT 73
@@ -1294,22 +1294,22 @@
 #define OLD_ENV_VAR 1
 #define ONCE_FLAG_INIT 0
 #define O_ACCMODE (O_EXEC | O_RDWR | O_SEARCH)
-#define O_APPEND __WASI_FDFLAGS_APPEND
+#define O_APPEND 0x0001
 #define O_CLOEXEC (0)
-#define O_CREAT (__WASI_OFLAGS_CREAT << 12)
-#define O_DIRECTORY (__WASI_OFLAGS_DIRECTORY << 12)
-#define O_DSYNC __WASI_FDFLAGS_DSYNC
-#define O_EXCL (__WASI_OFLAGS_EXCL << 12)
+#define O_CREAT (0x0001 << 12)
+#define O_DIRECTORY (0x0002 << 12)
+#define O_DSYNC 0x0002
+#define O_EXCL (0x0004 << 12)
 #define O_EXEC (0x02000000)
 #define O_NOCTTY (0)
 #define O_NOFOLLOW (0x01000000)
-#define O_NONBLOCK __WASI_FDFLAGS_NONBLOCK
+#define O_NONBLOCK 0x0004
 #define O_RDONLY (0x04000000)
 #define O_RDWR (O_RDONLY | O_WRONLY)
-#define O_RSYNC __WASI_FDFLAGS_RSYNC
+#define O_RSYNC 0x0008
 #define O_SEARCH (0x08000000)
-#define O_SYNC __WASI_FDFLAGS_SYNC
-#define O_TRUNC (__WASI_OFLAGS_TRUNC << 12)
+#define O_SYNC 0x0010
+#define O_TRUNC (0x0008 << 12)
 #define O_TTY_INIT (0)
 #define O_WRONLY (0x10000000)
 #define PACKETSZ NS_PACKETSZ
@@ -1362,12 +1362,12 @@
 #define POLLRDNORM 0x1
 #define POLLWRNORM 0x2
 #define POSIX_CLOSE_RESTART 0
-#define POSIX_FADV_DONTNEED __WASI_ADVICE_DONTNEED
-#define POSIX_FADV_NOREUSE __WASI_ADVICE_NOREUSE
-#define POSIX_FADV_NORMAL __WASI_ADVICE_NORMAL
-#define POSIX_FADV_RANDOM __WASI_ADVICE_RANDOM
-#define POSIX_FADV_SEQUENTIAL __WASI_ADVICE_SEQUENTIAL
-#define POSIX_FADV_WILLNEED __WASI_ADVICE_WILLNEED
+#define POSIX_FADV_DONTNEED 4
+#define POSIX_FADV_NOREUSE 5
+#define POSIX_FADV_NORMAL 0
+#define POSIX_FADV_RANDOM 2
+#define POSIX_FADV_SEQUENTIAL 1
+#define POSIX_FADV_WILLNEED 3
 #define PRELIM 1
 #define PRIX16 __UINT16_FMTX__
 #define PRIX32 __UINT32_FMTX__
@@ -1620,9 +1620,9 @@
 #define SCNxMAX __UINTMAX_FMTx__
 #define SCNxPTR __UINTPTR_FMTx__
 #define SE 240
-#define SEEK_CUR __WASI_WHENCE_CUR
-#define SEEK_END __WASI_WHENCE_END
-#define SEEK_SET __WASI_WHENCE_SET
+#define SEEK_CUR 1
+#define SEEK_END 2
+#define SEEK_SET 0
 #define SEGSIZE 512
 #define SEM_FAILED ((sem_t *)0)
 #define SEM_NSEMS_MAX 256
@@ -1631,9 +1631,9 @@
 #define SHORTBITS (sizeof(short) * 8)
 #define SHRT_MAX 0x7fff
 #define SHRT_MIN (-1-0x7fff)
-#define SHUT_RD __WASI_SDFLAGS_RD
+#define SHUT_RD 1
 #define SHUT_RDWR (SHUT_RD | SHUT_WR)
-#define SHUT_WR __WASI_SDFLAGS_WR
+#define SHUT_WR 2
 #define SIG_ATOMIC_MAX INT32_MAX
 #define SIG_ATOMIC_MIN INT32_MIN
 #define SIZE_MAX UINT32_MAX
@@ -1674,9 +1674,9 @@
 #define SNDPIPE 0x002
 #define SNDZERO 0x001
 #define SOCK_CLOEXEC (0x00002000)
-#define SOCK_DGRAM __WASI_FILETYPE_SOCKET_DGRAM
+#define SOCK_DGRAM 5
 #define SOCK_NONBLOCK (0x00004000)
-#define SOCK_STREAM __WASI_FILETYPE_SOCKET_STREAM
+#define SOCK_STREAM 6
 #define SOL_SOCKET 0x7fffffff
 #define SOL_TCP 6
 #define SOL_UDP 17
@@ -1907,7 +1907,7 @@
 #define TH_RST 0x04
 #define TH_SYN 0x02
 #define TH_URG 0x20
-#define TIMER_ABSTIME __WASI_SUBCLOCKFLAGS_SUBSCRIPTION_CLOCK_ABSTIME
+#define TIMER_ABSTIME 1
 #define TIMESPEC_TO_TIMEVAL(tv,ts) ( (tv)->tv_sec = (ts)->tv_sec, (tv)->tv_usec = (ts)->tv_nsec / 1000, (void)0 )
 #define TIMEVAL_TO_TIMESPEC(tv,ts) ( (ts)->tv_sec = (tv)->tv_sec, (ts)->tv_nsec = (tv)->tv_usec * 1000, (void)0 )
 #define TIME_BAD TIME_ERROR

expected/wasm32-wasip1/defined-symbols.txt

@@ -1347,4 +1347,4 @@ y0f
 y1
 y1f
 yn
-ynf
+ynf