Move <wasi.h> to <wasi/core.h>.

This reflects that in the future, WASI may grow additional APIs beyond
the core set.

Also move <wasi-libc.h> to <wasi/libc.h>.

Author: sunfishcode

expected/wasm32-wasi/include-all.c

@@ -182,7 +182,7 @@
 #include <unistd.h>
 #include <utime.h>
 #include <values.h>
-#include <wasi-libc.h>
-#include <wasi.h>
+#include <wasi/core.h>
+#include <wasi/libc.h>
 #include <wchar.h>
 #include <wctype.h>

expected/wasm32-wasi/predefined-macros.txt

@@ -3624,7 +3624,8 @@
 #define __tm_zone tm_zone
 #define __va_copy(d,s) __builtin_va_copy(d,s)
 #define __wasi__ 1
-#define __wasi_h 
+#define __wasi_core_h 
+#define __wasi_libc_h 
 #define __wasilibc___errno_values_h 
 #define __wasilibc___fd_set_h 
 #define __wasilibc___function___isatty_h 
@@ -3666,7 +3667,6 @@
 #define __wasilibc___typedef_sa_family_t_h 
 #define __wasilibc___typedef_sigset_t_h 
 #define __wasilibc___typedef_socklen_t_h 
-#define __wasilibc_wasilibc_h 
 #define __wasm 1
 #define __wasm32 1
 #define __wasm32__ 1

libc-bottom-half/cloudlibc/src/common/clock.h

@@ -5,7 +5,7 @@
 #ifndef COMMON_CLOCK_H
 #define COMMON_CLOCK_H
 
-#include <wasi.h>
+#include <wasi/core.h>
 
 // In this implementation we define clockid_t as a pointer type, so that
 // we can implement them as full objects. Right now we only use those

libc-bottom-half/cloudlibc/src/common/errno.h

@@ -5,7 +5,7 @@
 #ifndef COMMON_ERRNO_H
 #define COMMON_ERRNO_H
 
-#include <wasi.h>
+#include <wasi/core.h>
 
 // Translates ENOTCAPABLE to ENOTDIR if not a directory.
 static inline __wasi_errno_t errno_fixup_directory(__wasi_fd_t fd,

libc-bottom-half/cloudlibc/src/common/time.h

@@ -10,7 +10,7 @@
 
 #include <sys/time.h>
 
-#include <wasi.h>
+#include <wasi/core.h>
 #include <stdbool.h>
 #include <time.h>
 

libc-bottom-half/cloudlibc/src/common/tls.h

@@ -6,7 +6,7 @@
 #define COMMON_TLS_H
 
 #include <assert.h>
-#include <wasi.h>
+#include <wasi/core.h>
 #include <stdalign.h>
 #include <stddef.h>
 

libc-bottom-half/cloudlibc/src/libc/dirent/dirent_impl.h

@@ -5,7 +5,7 @@
 #ifndef DIRENT_DIRENT_IMPL_H
 #define DIRENT_DIRENT_IMPL_H
 
-#include <wasi.h>
+#include <wasi/core.h>
 #include <stddef.h>
 
 struct dirent;

libc-bottom-half/cloudlibc/src/libc/dirent/fdopendir.c

@@ -4,7 +4,7 @@
 
 #include <common/errno.h>
 
-#include <wasi.h>
+#include <wasi/core.h>
 #include <dirent.h>
 #include <errno.h>
 #include <stdlib.h>

libc-bottom-half/cloudlibc/src/libc/dirent/readdir.c

@@ -5,7 +5,7 @@
 #include <sys/stat.h>
 
 #include <assert.h>
-#include <wasi.h>
+#include <wasi/core.h>
 #include <dirent.h>
 #include <errno.h>
 #include <stddef.h>

libc-bottom-half/cloudlibc/src/libc/dirent/rewinddir.c

@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: BSD-2-Clause
 
-#include <wasi.h>
+#include <wasi/core.h>
 #include <dirent.h>
 
 #include "dirent_impl.h"