Update for __WASI_PATH_FILESTAT_SET_ATIM renaming.

Author: sunfishcode

expected/wasm32-wasi/predefined-macros.txt

@@ -3506,6 +3506,10 @@
 #define __WASI_FDFLAG_NONBLOCK (UINT16_C(0x0004))
 #define __WASI_FDFLAG_RSYNC (UINT16_C(0x0008))
 #define __WASI_FDFLAG_SYNC (UINT16_C(0x0010))
+#define __WASI_FILESTAT_SET_ATIM (UINT16_C(0x0001))
+#define __WASI_FILESTAT_SET_ATIM_NOW (UINT16_C(0x0002))
+#define __WASI_FILESTAT_SET_MTIM (UINT16_C(0x0004))
+#define __WASI_FILESTAT_SET_MTIM_NOW (UINT16_C(0x0008))
 #define __WASI_FILETYPE_BLOCK_DEVICE (UINT8_C(1))
 #define __WASI_FILETYPE_CHARACTER_DEVICE (UINT8_C(2))
 #define __WASI_FILETYPE_DIRECTORY (UINT8_C(3))
@@ -3519,10 +3523,6 @@
 #define __WASI_O_DIRECTORY (UINT16_C(0x0002))
 #define __WASI_O_EXCL (UINT16_C(0x0004))
 #define __WASI_O_TRUNC (UINT16_C(0x0008))
-#define __WASI_PATH_FILESTAT_SET_ATIM (UINT16_C(0x0001))
-#define __WASI_PATH_FILESTAT_SET_ATIM_NOW (UINT16_C(0x0002))
-#define __WASI_PATH_FILESTAT_SET_MTIM (UINT16_C(0x0004))
-#define __WASI_PATH_FILESTAT_SET_MTIM_NOW (UINT16_C(0x0008))
 #define __WASI_RIGHT_FD_ADVISE (UINT64_C(0x0000000000000080))
 #define __WASI_RIGHT_FD_ALLOCATE (UINT64_C(0x0000000000000100))
 #define __WASI_RIGHT_FD_DATASYNC (UINT64_C(0x0000000000000001))

libc-bottom-half/cloudlibc/src/libc/sys/stat/stat_impl.h

@@ -98,7 +98,7 @@ static inline bool utimens_get_timestamps(const struct timespec *times,
 #ifdef __wasilibc_unmodified_upstream // fstat
     *flags = __WASI_FILESTAT_ATIM_NOW | __WASI_FILESTAT_MTIM_NOW;
 #else
-    *flags = __WASI_PATH_FILESTAT_SET_ATIM_NOW | __WASI_PATH_FILESTAT_SET_MTIM_NOW;
+    *flags = __WASI_FILESTAT_SET_ATIM_NOW | __WASI_FILESTAT_SET_MTIM_NOW;
 #endif
   } else {
     // Set individual timestamps.
@@ -108,7 +108,7 @@ static inline bool utimens_get_timestamps(const struct timespec *times,
 #ifdef __wasilibc_unmodified_upstream // fstat
         *flags |= __WASI_FILESTAT_ATIM_NOW;
 #else
-        *flags |= __WASI_PATH_FILESTAT_SET_ATIM_NOW;
+        *flags |= __WASI_FILESTAT_SET_ATIM_NOW;
 #endif
         break;
       case UTIME_OMIT:
@@ -118,7 +118,7 @@ static inline bool utimens_get_timestamps(const struct timespec *times,
         *flags |= __WASI_FILESTAT_ATIM;
         if (!timespec_to_timestamp_exact(&times[0], &fs->st_atim))
 #else
-        *flags |= __WASI_PATH_FILESTAT_SET_ATIM;
+        *flags |= __WASI_FILESTAT_SET_ATIM;
         if (!timespec_to_timestamp_exact(&times[0], st_atim))
 #endif
           return false;
@@ -130,7 +130,7 @@ static inline bool utimens_get_timestamps(const struct timespec *times,
 #ifdef __wasilibc_unmodified_upstream // fstat
         *flags |= __WASI_FILESTAT_MTIM_NOW;
 #else
-        *flags |= __WASI_PATH_FILESTAT_SET_MTIM_NOW;
+        *flags |= __WASI_FILESTAT_SET_MTIM_NOW;
 #endif
         break;
       case UTIME_OMIT:
@@ -140,7 +140,7 @@ static inline bool utimens_get_timestamps(const struct timespec *times,
         *flags |= __WASI_FILESTAT_MTIM;
         if (!timespec_to_timestamp_exact(&times[1], &fs->st_mtim))
 #else
-        *flags |= __WASI_PATH_FILESTAT_SET_MTIM;
+        *flags |= __WASI_FILESTAT_SET_MTIM;
         if (!timespec_to_timestamp_exact(&times[1], st_mtim))
 #endif
           return false;

libc-bottom-half/headers/public/wasi/core.h

@@ -163,10 +163,10 @@ typedef uint8_t __wasi_filetype_t;
 #define __WASI_FILETYPE_SYMBOLIC_LINK    (UINT8_C(7))
 
 typedef uint16_t __wasi_fstflags_t;
-#define __WASI_PATH_FILESTAT_SET_ATIM     (UINT16_C(0x0001))
-#define __WASI_PATH_FILESTAT_SET_ATIM_NOW (UINT16_C(0x0002))
-#define __WASI_PATH_FILESTAT_SET_MTIM     (UINT16_C(0x0004))
-#define __WASI_PATH_FILESTAT_SET_MTIM_NOW (UINT16_C(0x0008))
+#define __WASI_FILESTAT_SET_ATIM     (UINT16_C(0x0001))
+#define __WASI_FILESTAT_SET_ATIM_NOW (UINT16_C(0x0002))
+#define __WASI_FILESTAT_SET_MTIM     (UINT16_C(0x0004))
+#define __WASI_FILESTAT_SET_MTIM_NOW (UINT16_C(0x0008))
 
 typedef uint64_t __wasi_inode_t;