zig

commit 6376103b23617735044970f08c2a314c46b97c98 (tree)
parent f1267e02c49f5d571420d687a6337a85ab76767d
Author: Carl Åstholm <carl@astholm.se>
Date:   Sun, 11 Jan 2026 21:15:10 +0100

wasi-libc: De-deduplicate erroneously removed headers

05d8b565ad1a1d6c0c1e93dc47f1d828043fcafc deduplicated wasi-libc headers
that are identical to upstream musl, but because some public headers
match the same `#include <>` patterns as private headers, this resulted
in unmodified upstream musl headers sometimes getting prioritized when
compiling wasi-libc, resulting in incorrect definitions. For example,
`UTIME_OMIT` is supposed to be -2 on WASI, but became 0x3ffffffe.

The restored headers were sourced from
<https://github.com/WebAssembly/wasi-libc/tree/c89896107d7b57aef69dcadede47409ee4f702ee>
which is the same revision as the most recent wasi-libc sync
07cc32b0041e5e12f72d682fd06a995fe904d556.

Diffstat:
A
lib/libc/wasi/libc-top-half/musl/src/include/arpa/inet.h
 | 
8
++++++++
A
lib/libc/wasi/libc-top-half/musl/src/include/stdlib.h
 | 
19
+++++++++++++++++++
A
lib/libc/wasi/libc-top-half/musl/src/include/string.h
 | 
11
+++++++++++
A
lib/libc/wasi/libc-top-half/musl/src/include/sys/mman.h
 | 
20
++++++++++++++++++++
A
lib/libc/wasi/libc-top-half/musl/src/include/sys/stat.h
 | 
9
+++++++++
A
lib/libc/wasi/libc-top-half/musl/src/include/sys/time.h
 | 
8
++++++++

6 files changed, 75 insertions(+), 0 deletions(-)
diff --git a/lib/libc/wasi/libc-top-half/musl/src/include/arpa/inet.h b/lib/libc/wasi/libc-top-half/musl/src/include/arpa/inet.h
@@ -0,0 +1,8 @@
+#ifndef ARPA_INET_H
+#define ARPA_INET_H
+
+#include "../../../include/arpa/inet.h"
+
+hidden int __inet_aton(const char *, struct in_addr *);
+
+#endif
diff --git a/lib/libc/wasi/libc-top-half/musl/src/include/stdlib.h b/lib/libc/wasi/libc-top-half/musl/src/include/stdlib.h
@@ -0,0 +1,19 @@
+#ifndef STDLIB_H
+#define STDLIB_H
+
+#include "../../include/stdlib.h"
+
+hidden int __putenv(char *, size_t, char *);
+hidden void __env_rm_add(char *, char *);
+hidden int __mkostemps(char *, int, int);
+hidden int __ptsname_r(int, char *, size_t);
+hidden char *__randname(char *);
+hidden void __qsort_r (void *, size_t, size_t, int (*)(const void *, const void *, void *), void *);
+
+hidden void *__libc_malloc(size_t);
+hidden void *__libc_malloc_impl(size_t);
+hidden void *__libc_calloc(size_t, size_t);
+hidden void *__libc_realloc(void *, size_t);
+hidden void __libc_free(void *);
+
+#endif
diff --git a/lib/libc/wasi/libc-top-half/musl/src/include/string.h b/lib/libc/wasi/libc-top-half/musl/src/include/string.h
@@ -0,0 +1,11 @@
+#ifndef STRING_H
+#define STRING_H
+
+#include "../../include/string.h"
+
+hidden void *__memrchr(const void *, int, size_t);
+hidden char *__stpcpy(char *, const char *);
+hidden char *__stpncpy(char *, const char *, size_t);
+hidden char *__strchrnul(const char *, int);
+
+#endif
diff --git a/lib/libc/wasi/libc-top-half/musl/src/include/sys/mman.h b/lib/libc/wasi/libc-top-half/musl/src/include/sys/mman.h
@@ -0,0 +1,20 @@
+#ifndef SYS_MMAN_H
+#define SYS_MMAN_H
+
+#include "../../../include/sys/mman.h"
+
+hidden void __vm_wait(void);
+hidden void __vm_lock(void);
+hidden void __vm_unlock(void);
+
+hidden void *__mmap(void *, size_t, int, int, int, off_t);
+hidden int __munmap(void *, size_t);
+hidden void *__mremap(void *, size_t, size_t, int, ...);
+hidden int __madvise(void *, size_t, int);
+hidden int __mprotect(void *, size_t, int);
+
+hidden const unsigned char *__map_file(const char *, size_t *);
+
+hidden char *__shm_mapname(const char *, char *);
+
+#endif
diff --git a/lib/libc/wasi/libc-top-half/musl/src/include/sys/stat.h b/lib/libc/wasi/libc-top-half/musl/src/include/sys/stat.h
@@ -0,0 +1,9 @@
+#ifndef SYS_STAT_H
+#define SYS_STAT_H
+
+#include "../../../include/sys/stat.h"
+
+hidden int __fstat(int, struct stat *);
+hidden int __fstatat(int, const char *restrict, struct stat *restrict, int);
+
+#endif
diff --git a/lib/libc/wasi/libc-top-half/musl/src/include/sys/time.h b/lib/libc/wasi/libc-top-half/musl/src/include/sys/time.h
@@ -0,0 +1,8 @@
+#ifndef SYS_TIME_H
+#define SYS_TIME_H
+
+#include "../../../include/sys/time.h"
+
+hidden int __futimesat(int, const char *, const struct timeval [2]);
+
+#endif