Fix build failures

Author: kleisauke

system/lib/libc/emscripten_mmap.c

@@ -102,7 +102,7 @@ int __syscall_msync(void *addr, size_t len, int flags) {
   return _msync_js(addr, len, map->prot, map->flags, map->fd, map->offset);
 }
 
-void *__syscall_mmap2(void *addr, size_t len, int prot, int flags, int fd, off_t offset) {
+intptr_t __syscall_mmap2(void *addr, size_t len, int prot, int flags, int fd, off_t offset) {
   if (addr != 0) {
     // We don't currently support location hints for the address of the mapping
     return -EINVAL;
@@ -147,5 +147,5 @@ void *__syscall_mmap2(void *addr, size_t len, int prot, int flags, int fd, off_t
   mappings = new_map;
   UNLOCK(lock);
 
-  return new_map->addr;
+  return (intptr_t)new_map->addr;
 }

system/lib/libc/emscripten_syscall_stubs.c

@@ -119,13 +119,14 @@ weak mode_t __syscall_umask(mode_t mask) {
   return old;
 }
 
-weak int __syscall_getrusage(int who, struct rusage *usage) {
+weak int __syscall_getrusage(int who, void *usage) {
   REPORT(getrusage);
-  memset(usage, 0, sizeof(*usage));
-  usage->ru_utime.tv_sec = 1;
-  usage->ru_utime.tv_usec = 2;
-  usage->ru_stime.tv_sec = 3;
-  usage->ru_stime.tv_usec = 4;
+  struct rusage *u = (struct rusage *)usage;
+  memset(u, 0, sizeof(*u));
+  u->ru_utime.tv_sec = 1;
+  u->ru_utime.tv_usec = 2;
+  u->ru_stime.tv_sec = 3;
+  u->ru_stime.tv_usec = 4;
   return 0;
 }
 
@@ -247,10 +248,10 @@ weak int __syscall_setsockopt(int sockfd, int level, int optname, const void *op
 UNIMPLEMENTED(acct, (const char *filename))
 UNIMPLEMENTED(mincore, (void *addr, size_t length, unsigned char *vec))
 UNIMPLEMENTED(pipe2, (int pipefd[2], int flags))
-UNIMPLEMENTED(pselect6, (int nfds, fd_set *rfds, fd_set *wfds, fd_set *efds, const struct timespec *ts, const void *mask))
+UNIMPLEMENTED(pselect6, (int nfds, fd_set *rfds, fd_set *wfds, fd_set *efds, const void *ts, const void *mask))
 UNIMPLEMENTED(recvmmsg, (int sockfd, struct mmsghdr *msgvec, unsigned int vlen, unsigned int flags, struct timespec *timeout))
 UNIMPLEMENTED(sendmmsg, (int sockfd, struct mmsghdr *msgvec, unsigned int vlen, unsigned int flags))
 UNIMPLEMENTED(shutdown, (int sockfd, int how, ...))
 UNIMPLEMENTED(socketpair, (int domain, int type, int protocol, int fd[2], ...))
 UNIMPLEMENTED(socketcall, (int call, long args[6]))
-UNIMPLEMENTED(wait4, (pid_t pid, int *wstatus, int options, struct rusage *rusage))
+UNIMPLEMENTED(wait4, (pid_t pid, int *wstatus, int options, void *rusage))

system/lib/libc/musl/arch/emscripten/syscall_arch.h

@@ -37,19 +37,19 @@ mode_t __syscall_umask(mode_t mask);
 pid_t __syscall_getppid(void);
 pid_t __syscall_getpgrp(void);
 pid_t __syscall_setsid(void);
-int __syscall_getrusage(int who, struct rusage *usage);
+int __syscall_getrusage(int who, void *usage);
 int __syscall_munmap(void *addr, size_t len);
 int __syscall_fchmod(int fd, mode_t mode);
 int __syscall_getpriority(int which, id_t who);
 int __syscall_setpriority(int which, id_t who, int prio);
 int __syscall_socketcall(int call, long args[6]);
-pid_t __syscall_wait4(pid_t pid, int *wstatus, int options, struct rusage *rusage);
+pid_t __syscall_wait4(pid_t pid, int *wstatus, int options, void *rusage);
 int __syscall_setdomainname(const char *name, size_t len);
 int __syscall_uname(struct utsname *buf);
 int __syscall_mprotect(size_t start, size_t len, int prot);
 pid_t __syscall_getpgid(pid_t pid);
 int __syscall_fchdir(int fd);
-int __syscall__newselect(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout);
+int __syscall__newselect(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, void *timeout);
 int __syscall_msync(void *addr, size_t len, int flags);
 pid_t __syscall_getsid(pid_t pid);
 int __syscall_fdatasync(int fd);
@@ -60,7 +60,7 @@ int __syscall_munlockall(void);
 int __syscall_mremap(void *old_addr, size_t old_size, size_t new_size, int flags, void *new_addr);
 int __syscall_poll(struct pollfd *fds, nfds_t nfds, int timeout);
 int __syscall_getcwd(char *buf, size_t size);
-void *__syscall_mmap2(void *addr, size_t len, int prot, int flags, int fd, off_t offset);
+intptr_t __syscall_mmap2(void *addr, size_t len, int prot, int flags, int fd, off_t offset);
 int __syscall_truncate64(const char *path, off_t length);
 int __syscall_ftruncate64(int fd, off_t length);
 int __syscall_stat64(const char *path, struct stat *buf);
@@ -82,7 +82,7 @@ int __syscall_setuid32(uid_t uid);
 int __syscall_setgid32(gid_t gid);
 int __syscall_mincore(void *addr, size_t length, unsigned char *vec);
 int __syscall_madvise(void *addr, size_t length, int advice);
-int __syscall_getdents64(int fd, struct dirent *dirp, size_t count);
+int __syscall_getdents64(int fd, void *dirp, size_t count);
 int __syscall_fcntl64(int fd, int cmd, ...);
 int __syscall_statfs64(const char *path, size_t size, struct statfs *buf);
 int __syscall_fstatfs64(int fd, size_t size, struct statfs *buf);
@@ -99,7 +99,7 @@ int __syscall_symlinkat(const char *target, int newdirfd, const char *linkpath);
 int __syscall_readlinkat(int dirfd, const char *path, char *buf, size_t bufsize);
 int __syscall_fchmodat2(int dirfd, const char *path, mode_t mode, int flags);
 int __syscall_faccessat(int dirfd, const char *path, int amode, int flags);
-int __syscall_pselect6(int nfds, fd_set *rfds, fd_set *wfds, fd_set *efds, const struct timespec *ts, const void *mask);
+int __syscall_pselect6(int nfds, fd_set *rfds, fd_set *wfds, fd_set *efds, const void *ts, const void *mask);
 int __syscall_utimensat(int dirfd, const char *path, const struct timespec times[2], int flags);
 int __syscall_fallocate(int fd, int mode, off_t offset, off_t len);
 int __syscall_dup3(int oldfd, int newfd, int flags);

system/lib/wasmfs/js_api.cpp

@@ -237,7 +237,7 @@ int _wasmfs_ftruncate(int fd, off_t length) {
 int _wasmfs_close(int fd) { return __wasi_fd_close(fd); }
 
 void* _wasmfs_mmap(size_t length, int prot, int flags, int fd, off_t offset) {
-  return __syscall_mmap2(0, length, prot, flags, fd, offset);
+  return (void*)__syscall_mmap2(0, length, prot, flags, fd, offset);
 }
 
 int _wasmfs_msync(void* addr, size_t length, int flags) {

system/lib/wasmfs/syscalls.cpp

@@ -900,7 +900,9 @@ int wasmfs_unmount(const char* path) {
   return lockedParent.removeChild(childName);
 }
 
-int __syscall_getdents64(int fd, struct dirent* dirp, size_t count) {
+int __syscall_getdents64(int fd, void* dirp, size_t count) {
+  dirent* result = (dirent*)dirp;
+
   // Check if the result buffer is too small.
   if (count / sizeof(dirent) == 0) {
     return -EINVAL;
@@ -933,29 +935,29 @@ int __syscall_getdents64(int fd, struct dirent* dirp, size_t count) {
   for (; index < dirents.size() && bytesRead + sizeof(dirent) <= count;
        index++) {
     const auto& entry = dirents[index];
-    dirp->d_ino = entry.ino;
-    dirp->d_off = index + 1;
-    dirp->d_reclen = sizeof(dirent);
+    result->d_ino = entry.ino;
+    result->d_off = index + 1;
+    result->d_reclen = sizeof(dirent);
     switch (entry.kind) {
       case File::UnknownKind:
-        dirp->d_type = DT_UNKNOWN;
+        result->d_type = DT_UNKNOWN;
         break;
       case File::DataFileKind:
-        dirp->d_type = DT_REG;
+        result->d_type = DT_REG;
         break;
       case File::DirectoryKind:
-        dirp->d_type = DT_DIR;
+        result->d_type = DT_DIR;
         break;
       case File::SymlinkKind:
-        dirp->d_type = DT_LNK;
+        result->d_type = DT_LNK;
         break;
       default:
-        dirp->d_type = DT_UNKNOWN;
+        result->d_type = DT_UNKNOWN;
         break;
     }
-    assert(entry.name.size() + 1 <= sizeof(dirp->d_name));
-    strcpy(dirp->d_name, entry.name.c_str());
-    ++dirp;
+    assert(entry.name.size() + 1 <= sizeof(result->d_name));
+    strcpy(result->d_name, entry.name.c_str());
+    ++result;
     bytesRead += sizeof(dirent);
   }
 
@@ -1772,7 +1774,7 @@ int __syscall__newselect(int nfds,
                          fd_set* readfds_,
                          fd_set* writefds_,
                          fd_set* exceptfds_,
-                         struct timeval* timeout_) {
+                         void* timeout_) {
   // TODO: Implement this syscall. For now, we return an error code,
   //       specifically ENOMEM which is valid per the docs:
   //          ENOMEM Unable to allocate memory for internal tables