More header cleanups; disable more unsupported features.

Author: sunfishcode

expected/wasm32-wasi/predefined-macros.txt

@@ -2651,7 +2651,6 @@
 #define _POSIX_AIO_LISTIO_MAX 2
 #define _POSIX_AIO_MAX 1
 #define _POSIX_ARG_MAX 4096
-#define _POSIX_ASYNCHRONOUS_IO _POSIX_VERSION
 #define _POSIX_BARRIERS _POSIX_VERSION
 #define _POSIX_CHILD_MAX 25
 #define _POSIX_CHOWN_RESTRICTED 1
@@ -2673,16 +2672,13 @@
 #define _POSIX_OPEN_MAX 20
 #define _POSIX_PATH_MAX 256
 #define _POSIX_PIPE_BUF 512
-#define _POSIX_RAW_SOCKETS _POSIX_VERSION
 #define _POSIX_READER_WRITER_LOCKS _POSIX_VERSION
 #define _POSIX_REALTIME_SIGNALS _POSIX_VERSION
 #define _POSIX_REGEXP 1
 #define _POSIX_RE_DUP_MAX 255
 #define _POSIX_RTSIG_MAX 8
-#define _POSIX_SEMAPHORES _POSIX_VERSION
 #define _POSIX_SEM_NSEMS_MAX 256
 #define _POSIX_SEM_VALUE_MAX 32767
-#define _POSIX_SHARED_MEMORY_OBJECTS _POSIX_VERSION
 #define _POSIX_SIGQUEUE_MAX 32
 #define _POSIX_SPIN_LOCKS _POSIX_VERSION
 #define _POSIX_SSIZE_MAX 32767

libc-bottom-half/headers/public/__header_fcntl.h

@@ -13,14 +13,14 @@
 #define O_EXCL (__WASI_O_EXCL << 12)
 #define O_TRUNC (__WASI_O_TRUNC << 12)
 
-#define O_NOFOLLOW 0x1000000
-#define O_EXEC 0x2000000
-#define O_RDONLY 0x4000000
-#define O_SEARCH 0x8000000
-#define O_WRONLY 0x10000000
+#define O_NOFOLLOW (0x01000000)
+#define O_EXEC     (0x02000000)
+#define O_RDONLY   (0x04000000)
+#define O_SEARCH   (0x08000000)
+#define O_WRONLY   (0x10000000)
 
-#define O_CLOEXEC 0
-#define O_NOCTTY 0
+#define O_CLOEXEC  (0)
+#define O_NOCTTY   (0)
 
 #define O_RDWR (O_RDONLY | O_WRONLY)
 #define O_ACCMODE (O_EXEC | O_RDWR | O_SEARCH)
@@ -32,16 +32,16 @@
 #define POSIX_FADV_SEQUENTIAL __WASI_ADVICE_SEQUENTIAL
 #define POSIX_FADV_WILLNEED __WASI_ADVICE_WILLNEED
 
-#define F_GETFD 1
-#define F_SETFD 2
-#define F_GETFL 3
-#define F_SETFL 4
+#define F_GETFD (1)
+#define F_SETFD (2)
+#define F_GETFL (3)
+#define F_SETFL (4)
 
-#define FD_CLOEXEC 1
+#define FD_CLOEXEC (1)
 
-#define AT_EACCESS 0x0
-#define AT_SYMLINK_NOFOLLOW 0x1
-#define AT_SYMLINK_FOLLOW 0x2
-#define AT_REMOVEDIR 0x4
+#define AT_EACCESS          (0x0)
+#define AT_SYMLINK_NOFOLLOW (0x1)
+#define AT_SYMLINK_FOLLOW   (0x2)
+#define AT_REMOVEDIR        (0x4)
 
 #endif

libc-top-half/musl/include/unistd.h

@@ -123,11 +123,15 @@ int setpgid(pid_t, pid_t);
 pid_t setsid(void);
 pid_t getsid(pid_t);
 #endif
+#ifdef __wasilibc_unmodified_upstream
 char *ttyname(int);
 int ttyname_r(int, char *, size_t);
+#endif
 int isatty(int);
+#ifdef __wasilibc_unmodified_upstream
 pid_t tcgetpgrp(int);
 int tcsetpgrp(int, pid_t);
+#endif
 
 #ifdef __wasilibc_unmodified_upstream /* getpid */
 uid_t getuid(void);
@@ -164,11 +168,15 @@ size_t confstr(int, char *, size_t);
 int setreuid(uid_t, uid_t);
 int setregid(gid_t, gid_t);
 #endif
+#ifdef __wasilibc_unmodified_upstream
 int lockf(int, int, off_t);
+#endif
 long gethostid(void);
+#ifdef __wasilibc_unmodified_upstream
 int nice(int);
 void sync(void);
 pid_t setpgrp(void);
+#endif
 char *crypt(const char *, const char *);
 void encrypt(char *, int);
 void swab(const void *__restrict, void *__restrict, ssize_t);
@@ -190,13 +198,10 @@ int brk(void *);
 void *sbrk(intptr_t);
 #ifdef __wasilibc_unmodified_upstream
 pid_t vfork(void);
-#endif
 int vhangup(void);
-#ifdef __wasilibc_unmodified_upstream
 int chroot(const char *);
 int getpagesize(void);
 int getdtablesize(void);
-#endif
 int sethostname(const char *, size_t);
 int getdomainname(char *, size_t);
 int setdomainname(const char *, size_t);
@@ -208,10 +213,9 @@ void endusershell(void);
 char *getusershell(void);
 int acct(const char *);
 long syscall(long, ...);
-#ifdef __wasilibc_unmodified_upstream
 int execvpe(const char *, char *const [], char *const []);
-#endif
 int issetugid(void);
+#endif
 int getentropy(void *, size_t);
 #endif
 
@@ -226,7 +230,9 @@ int getresgid(gid_t *, gid_t *, gid_t *);
 #ifdef __wasilibc_unmodified_upstream /* cwd */
 char *get_current_dir_name(void);
 #endif
+#ifdef __wasilibc_unmodified_upstream /* syncfs */
 int syncfs(int);
+#endif
 #ifdef __wasilibc_unmodified_upstream /* getpid */
 int euidaccess(const char *, int);
 int eaccess(const char *, int);
@@ -265,7 +271,9 @@ int eaccess(const char *, int);
 #endif
 #define _POSIX_FSYNC            _POSIX_VERSION
 #define _POSIX_NO_TRUNC         1
+#ifdef __wasilibc_unmodified_upstream
 #define _POSIX_RAW_SOCKETS      _POSIX_VERSION
+#endif
 #define _POSIX_REALTIME_SIGNALS _POSIX_VERSION
 #define _POSIX_REGEXP           1
 #ifdef __wasilibc_unmodified_upstream
@@ -290,9 +298,11 @@ int eaccess(const char *, int);
 #define _POSIX_BARRIERS         _POSIX_VERSION
 #define _POSIX_SPIN_LOCKS       _POSIX_VERSION
 #define _POSIX_READER_WRITER_LOCKS _POSIX_VERSION
+#ifdef __wasilibc_unmodified_upstream
 #define _POSIX_ASYNCHRONOUS_IO  _POSIX_VERSION
 #define _POSIX_SEMAPHORES       _POSIX_VERSION
 #define _POSIX_SHARED_MEMORY_OBJECTS _POSIX_VERSION
+#endif
 
 #define _POSIX2_C_BIND          _POSIX_VERSION