Skip to content

Commit e5f14be

Browse files
sunfishcodesunfishcode
committed
Add comments explaining changes to upstream source files.
Add at least a one-line comment on every `#ifdef __wasilibc_unmodified_upstream` briefly indicating what its purpose is. While here, reenable some of the code that was previously disabled when getenv wasn't supported, as getenv is now supported.
1 parent 685d014 commit e5f14be

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+163
-177
lines changed

‎libc-top-half/musl/include/alltypes.h.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ TYPEDEF unsigned long wctype_t;
3434
TYPEDEF void * timer_t;
3535
TYPEDEF int clockid_t;
3636
TYPEDEF long clock_t;
37-
#ifdef __wasilibc_unmodified_upstream
37+
#ifdef __wasilibc_unmodified_upstream /* Use alternate WASI libc headers */
3838
STRUCT timeval { time_t tv_sec; suseconds_t tv_usec; };
3939
STRUCT timespec { time_t tv_sec; long tv_nsec; };
4040
#else
@@ -70,7 +70,7 @@ TYPEDEF struct __locale_struct * locale_t;
7070

7171
TYPEDEF struct __sigset_t { unsigned long __bits[128/sizeof(long)]; } sigset_t;
7272

73-
#ifdef __wasilibc_unmodified_upstream
73+
#ifdef __wasilibc_unmodified_upstream /* Use alternate WASI libc headers */
7474
STRUCT iovec { void *iov_base; size_t iov_len; };
7575
#else
7676
#include <__struct_iovec.h>

‎libc-top-half/musl/include/arpa/inet.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ uint16_t htons(uint16_t);
1313
uint32_t ntohl(uint32_t);
1414
uint16_t ntohs(uint16_t);
1515

16-
#ifdef __wasilibc_unmodified_upstream /* inet_addr */
16+
#ifdef __wasilibc_unmodified_upstream /* WASI has no inet_addr */
1717
in_addr_t inet_addr (const char *);
1818
in_addr_t inet_network (const char *);
1919
char *inet_ntoa (struct in_addr);
@@ -22,7 +22,7 @@ int inet_pton (int, const char *__restrict, void *__restrict);
2222
const char *inet_ntop (int, const void *__restrict, char *__restrict, socklen_t);
2323

2424
int inet_aton (const char *, struct in_addr *);
25-
#ifdef __wasilibc_unmodified_upstream /* inet_makeaddr */
25+
#ifdef __wasilibc_unmodified_upstream /* WASI has no inet_makeaddr */
2626
struct in_addr inet_makeaddr(in_addr_t, in_addr_t);
2727
in_addr_t inet_lnaof(struct in_addr);
2828
in_addr_t inet_netof(struct in_addr);

‎libc-top-half/musl/include/dirent.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef _DIRENT_H
22
#define _DIRENT_H
33

4-
#ifdef __wasilibc_unmodified_upstream
4+
#ifdef __wasilibc_unmodified_upstream /* Use alternate WASI libc headers */
55
#else
66
#include <__header_dirent.h>
77
#endif
@@ -19,7 +19,7 @@ extern "C" {
1919

2020
#include <bits/alltypes.h>
2121

22-
#ifdef __wasilibc_unmodified_upstream
22+
#ifdef __wasilibc_unmodified_upstream /* Use alternate WASI libc headers */
2323
typedef struct __dirstream DIR;
2424
#else
2525
#include <__typedef_DIR.h>
@@ -29,7 +29,7 @@ typedef struct __dirstream DIR;
2929
#define _DIRENT_HAVE_D_OFF
3030
#define _DIRENT_HAVE_D_TYPE
3131

32-
#ifdef __wasilibc_unmodified_upstream
32+
#ifdef __wasilibc_unmodified_upstream /* Use alternate WASI libc headers */
3333
struct dirent {
3434
ino_t d_ino;
3535
off_t d_off;
@@ -62,7 +62,7 @@ long telldir(DIR *);
6262
#endif
6363

6464
#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
65-
#ifdef __wasilibc_unmodified_upstream
65+
#ifdef __wasilibc_unmodified_upstream /* Use alternate WASI libc headers */
6666
#define DT_UNKNOWN 0
6767
#define DT_FIFO 1
6868
#define DT_CHR 2

‎libc-top-half/musl/include/errno.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ extern "C" {
77

88
#include <features.h>
99

10-
#ifdef __wasilibc_unmodified_upstream
10+
#ifdef __wasilibc_unmodified_upstream /* Use alternate WASI libc headers */
1111
#include <bits/errno.h>
1212

1313
#ifdef __GNUC__

‎libc-top-half/musl/include/fcntl.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef _FCNTL_H
22
#define _FCNTL_H
33

4-
#ifdef __wasilibc_unmodified_upstream
4+
#ifdef __wasilibc_unmodified_upstream /* Use alternate WASI libc headers */
55
#else
66
#include <__header_fcntl.h>
77
#endif
@@ -40,7 +40,7 @@ int openat(int, const char *, int, ...);
4040
int posix_fadvise(int, off_t, off_t, int);
4141
int posix_fallocate(int, off_t, off_t);
4242

43-
#ifdef __wasilibc_unmodified_upstream
43+
#ifdef __wasilibc_unmodified_upstream /* Use alternate WASI libc headers */
4444
#define O_SEARCH O_PATH
4545
#define O_EXEC O_PATH
4646

‎libc-top-half/musl/include/float.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
extern "C" {
66
#endif
77

8-
#ifdef __wasilibc_unmodified_upstream
8+
#ifdef __wasilibc_unmodified_upstream /* Use the compiler's definition of FLT_ROUNDS */
99
int __flt_rounds(void);
1010
#define FLT_ROUNDS (__flt_rounds())
1111
#else

‎libc-top-half/musl/include/ftw.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ struct FTW {
2626
int level;
2727
};
2828

29-
#ifdef __wasilibc_unmodified_upstream
29+
#ifdef __wasilibc_unmodified_upstream /* WASI libc doesn't build the legacy functions */
3030
int ftw(const char *, int (*)(const char *, const struct stat *, int), int);
3131
#endif
3232
int nftw(const char *, int (*)(const char *, const struct stat *, int, struct FTW *), int, int);
3333

3434
#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
35-
#ifdef __wasilibc_unmodified_upstream
35+
#ifdef __wasilibc_unmodified_upstream /* WASI libc doesn't build the legacy functions */
3636
#define ftw64 ftw
3737
#endif
3838
#define nftw64 nftw

‎libc-top-half/musl/include/limits.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
#define SEM_VALUE_MAX 0x7fffffff
6262
#define SEM_NSEMS_MAX 256
6363
#define DELAYTIMER_MAX 0x7fffffff
64-
#ifdef __wasilibc_unmodified_upstream /* mq */
64+
#ifdef __wasilibc_unmodified_upstream /* WASI has no mq */
6565
#define MQ_PRIO_MAX 32768
6666
#endif
6767
#define LOGIN_NAME_MAX 256
@@ -116,7 +116,7 @@
116116
#define _POSIX_LOGIN_NAME_MAX 9
117117
#define _POSIX_MAX_CANON 255
118118
#define _POSIX_MAX_INPUT 255
119-
#ifdef __wasilibc_unmodified_upstream /* mq */
119+
#ifdef __wasilibc_unmodified_upstream /* WASI has no mq */
120120
#define _POSIX_MQ_OPEN_MAX 8
121121
#define _POSIX_MQ_PRIO_MAX 32
122122
#endif

‎libc-top-half/musl/include/locale.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ extern "C" {
77

88
#include <features.h>
99

10-
#ifdef __wasilibc_unmodified_upstream
10+
#ifdef __wasilibc_unmodified_upstream /* Use the compiler's definition of NULL */
1111
#ifdef __cplusplus
1212
#define NULL 0L
1313
#else

‎libc-top-half/musl/include/netinet/in.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@ extern "C" {
88
#include <features.h>
99
#include <inttypes.h>
1010
#include <sys/socket.h>
11-
#ifdef __wasilibc_unmodified_upstream
11+
#ifdef __wasilibc_unmodified_upstream /* Use alternate WASI libc headers */
1212
#else
1313
#include <__header_netinet_in.h>
1414
#endif
1515

1616
typedef uint16_t in_port_t;
1717
typedef uint32_t in_addr_t;
18-
#ifdef __wasilibc_unmodified_upstream
18+
#ifdef __wasilibc_unmodified_upstream /* Use alternate WASI libc headers */
1919
struct in_addr { in_addr_t s_addr; };
2020
#endif
2121

22-
#ifdef __wasilibc_unmodified_upstream
22+
#ifdef __wasilibc_unmodified_upstream /* Use alternate WASI libc headers */
2323
struct sockaddr_in {
2424
sa_family_t sin_family;
2525
in_port_t sin_port;
@@ -28,7 +28,7 @@ struct sockaddr_in {
2828
};
2929
#endif
3030

31-
#ifdef __wasilibc_unmodified_upstream
31+
#ifdef __wasilibc_unmodified_upstream /* Use alternate WASI libc headers */
3232
struct in6_addr {
3333
union {
3434
uint8_t __s6_addr[16];
@@ -41,7 +41,7 @@ struct in6_addr {
4141
#define s6_addr32 __in6_union.__s6_addr32
4242
#endif
4343

44-
#ifdef __wasilibc_unmodified_upstream
44+
#ifdef __wasilibc_unmodified_upstream /* Use alternate WASI libc headers */
4545
struct sockaddr_in6 {
4646
sa_family_t sin6_family;
4747
in_port_t sin6_port;
@@ -83,7 +83,7 @@ uint16_t ntohs(uint16_t);
8383

8484
#define IPPORT_RESERVED 1024
8585

86-
#ifdef __wasilibc_unmodified_upstream
86+
#ifdef __wasilibc_unmodified_upstream /* Use alternate WASI libc headers */
8787
#define IPPROTO_IP 0
8888
#define IPPROTO_HOPOPTS 0
8989
#define IPPROTO_ICMP 1

‎libc-top-half/musl/include/poll.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ extern "C" {
99

1010
#include <bits/poll.h>
1111

12-
#ifdef __wasilibc_unmodified_upstream
12+
#ifdef __wasilibc_unmodified_upstream /* Use alternate WASI libc headers */
1313
#define POLLIN 0x001
1414
#define POLLPRI 0x002
1515
#define POLLOUT 0x004
@@ -30,13 +30,13 @@ extern "C" {
3030
#include <__header_poll.h>
3131
#endif
3232

33-
#ifdef __wasilibc_unmodified_upstream
33+
#ifdef __wasilibc_unmodified_upstream /* Use alternate WASI libc headers */
3434
typedef unsigned long nfds_t;
3535
#else
3636
#include <__typedef_nfds_t.h>
3737
#endif
3838

39-
#ifdef __wasilibc_unmodified_upstream
39+
#ifdef __wasilibc_unmodified_upstream /* Use alternate WASI libc headers */
4040
struct pollfd {
4141
int fd;
4242
short events;

‎libc-top-half/musl/include/pthread.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,11 @@ extern "C" {
5555
#define PTHREAD_PROCESS_SHARED 1
5656

5757

58-
#ifdef __wasilibc_unmodified_upstream
58+
#if defined(__wasilibc_unmodified_upstream) || defined(_REENTRANT)
5959
#define PTHREAD_MUTEX_INITIALIZER {{{0}}}
6060
#define PTHREAD_RWLOCK_INITIALIZER {{{0}}}
6161
#define PTHREAD_COND_INITIALIZER {{{0}}}
6262
#else
63-
/* TODO: Threads support. */
6463
#define PTHREAD_MUTEX_INITIALIZER 0
6564
#define PTHREAD_RWLOCK_INITIALIZER 0
6665
#define PTHREAD_COND_INITIALIZER 0

‎libc-top-half/musl/include/setjmp.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ extern "C" {
77

88
#include <features.h>
99

10-
#ifdef __wasilibc_unmodified_upstream /* setjmp */
10+
#ifdef __wasilibc_unmodified_upstream /* WASI has no setjmp */
1111
#include <bits/setjmp.h>
1212

1313
typedef struct __jmp_buf_tag {

‎libc-top-half/musl/include/signal.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -189,15 +189,15 @@ struct sigevent {
189189
#define SIGEV_NONE 1
190190
#define SIGEV_THREAD 2
191191

192-
#ifdef __wasilibc_unmodified_upstream /* realtime signals */
192+
#ifdef __wasilibc_unmodified_upstream /* WASI has no realtime signals */
193193
int __libc_current_sigrtmin(void);
194194
int __libc_current_sigrtmax(void);
195195

196196
#define SIGRTMIN (__libc_current_sigrtmin())
197197
#define SIGRTMAX (__libc_current_sigrtmax())
198198
#endif
199199

200-
#ifdef __wasilibc_unmodified_upstream /* signals */
200+
#ifdef __wasilibc_unmodified_upstream /* WASI has no signals */
201201
int kill(pid_t, int);
202202

203203
int sigemptyset(sigset_t *);
@@ -219,14 +219,14 @@ int sigqueue(pid_t, int, union sigval);
219219
int pthread_sigmask(int, const sigset_t *__restrict, sigset_t *__restrict);
220220
int pthread_kill(pthread_t, int);
221221

222-
#ifdef __wasilibc_unmodified_upstream /* signals */
222+
#ifdef __wasilibc_unmodified_upstream /* WASI has no signals */
223223
void psiginfo(const siginfo_t *, const char *);
224224
void psignal(int, const char *);
225225
#endif
226226

227227
#endif
228228

229-
#ifdef __wasilibc_unmodified_upstream /* signals */
229+
#ifdef __wasilibc_unmodified_upstream /* WASI has no signals */
230230
#if defined(_XOPEN_SOURCE) || defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
231231
int killpg(pid_t, int);
232232
int sigaltstack(const stack_t *__restrict, stack_t *__restrict);
@@ -254,7 +254,7 @@ void (*sigset(int, void (*)(int)))(int);
254254
#endif
255255
#endif
256256

257-
#ifdef __wasilibc_unmodified_upstream /* signals */
257+
#ifdef __wasilibc_unmodified_upstream /* WASI has no signals */
258258
#if defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
259259
#define NSIG _NSIG
260260
typedef void (*sig_t)(int);
@@ -278,7 +278,7 @@ int sigandset(sigset_t *, const sigset_t *, const sigset_t *);
278278

279279
typedef int sig_atomic_t;
280280

281-
#ifdef __wasilibc_unmodified_upstream /* signals */
281+
#ifdef __wasilibc_unmodified_upstream /* WASI has no signals */
282282
void (*signal(int, void (*)(int)))(int);
283283
#endif
284284
int raise(int);

‎libc-top-half/musl/include/stdarg.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef _STDARG_H
22
#define _STDARG_H
33

4-
#ifdef __wasilibc_unmodified_upstream
4+
#ifdef __wasilibc_unmodified_upstream /* Use the compiler's stdarg.h */
55
#ifdef __cplusplus
66
extern "C" {
77
#endif

‎libc-top-half/musl/include/stddef.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#ifdef __wasilibc_unmodified_upstream
1+
#ifdef __wasilibc_unmodified_upstream /* Use the compiler's stddef.h */
22
#ifndef _STDDEF_H
33
#define _STDDEF_H
44

‎libc-top-half/musl/include/stdio.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ extern "C" {
2121

2222
#include <bits/alltypes.h>
2323

24-
#ifdef __wasilibc_unmodified_upstream
24+
#ifdef __wasilibc_unmodified_upstream /* Use the compiler's definition of NULL */
2525
#ifdef __cplusplus
2626
#define NULL 0L
2727
#else
@@ -35,7 +35,7 @@ extern "C" {
3535
#undef EOF
3636
#define EOF (-1)
3737

38-
#ifdef __wasilibc_unmodified_upstream
38+
#ifdef __wasilibc_unmodified_upstream /* Use alternate WASI libc headers */
3939
#undef SEEK_SET
4040
#undef SEEK_CUR
4141
#undef SEEK_END
@@ -53,7 +53,7 @@ extern "C" {
5353
#define BUFSIZ 1024
5454
#define FILENAME_MAX 4096
5555
#define FOPEN_MAX 1000
56-
#ifdef __wasilibc_unmodified_upstream
56+
#ifdef __wasilibc_unmodified_upstream /* WASI has no tmpnam */
5757
#define TMP_MAX 10000
5858
#define L_tmpnam 20
5959
#endif
@@ -105,7 +105,7 @@ int putchar(int);
105105

106106
char *fgets(char *__restrict, int, FILE *__restrict);
107107
#if __STDC_VERSION__ < 201112L
108-
#ifdef __wasilibc_unmodified_upstream
108+
#ifdef __wasilibc_unmodified_upstream /* gets is obsolete */
109109
char *gets(char *);
110110
#else
111111
char *gets(char *) __attribute__((__deprecated__("gets is not defined on WASI")));
@@ -137,7 +137,7 @@ void perror(const char *);
137137
int setvbuf(FILE *__restrict, char *__restrict, int, size_t);
138138
void setbuf(FILE *__restrict, char *__restrict);
139139

140-
#ifdef __wasilibc_unmodified_upstream
140+
#ifdef __wasilibc_unmodified_upstream /* WASI has no tmpnam or tmpfile */
141141
char *tmpnam(char *);
142142
FILE *tmpfile(void);
143143
#else
@@ -173,7 +173,7 @@ char *ctermid(char *);
173173
#endif
174174

175175

176-
#ifdef __wasilibc_unmodified_upstream
176+
#ifdef __wasilibc_unmodified_upstream /* WASI has no tempnam */
177177
#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
178178
|| defined(_BSD_SOURCE)
179179
#define P_tmpdir "/tmp"

‎libc-top-half/musl/include/stdlib.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ extern "C" {
77

88
#include <features.h>
99

10-
#ifdef __wasilibc_unmodified_upstream
10+
#ifdef __wasilibc_unmodified_upstream /* Use the compiler's definition of NULL */
1111
#ifdef __cplusplus
1212
#define NULL 0L
1313
#else

0 commit comments

Comments
 (0)