From: Dan Gohman <sunfish@mozilla.com>
Date: Tue, 14 May 2019 15:58:02 +0000 (-0700)
Subject: Don't install <sys/xattr.h>, which isn't supported on WASI.
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=84a2343ce4cb36aae5ccc6bb3101c30b06e071fc;p=wasi-libc.git

Don't install <sys/xattr.h>, which isn't supported on WASI.
---

diff --git a/Makefile b/Makefile
index bc20ed0..c6170ca 100644
--- a/Makefile
+++ b/Makefile
@@ -384,7 +384,7 @@ include_dirs:
 	      "$(SYSROOT_INC)/pty.h" \
 	      "$(SYSROOT_INC)/dlfcn.h" \
 	      "$(SYSROOT_INC)/ulimit.h" \
-	      "$(SYSROOT_INC)/xattr.h" \
+	      "$(SYSROOT_INC)/sys/xattr.h" \
 	      "$(SYSROOT_INC)/wordexp.h" \
 	      "$(SYSROOT_INC)/spawn.h" \
 	      "$(SYSROOT_INC)/ucontext.h" \
diff --git a/expected/wasm32-wasi/include-all.c b/expected/wasm32-wasi/include-all.c
index 2ded5dd..3ca0641 100644
--- a/expected/wasm32-wasi/include-all.c
+++ b/expected/wasm32-wasi/include-all.c
@@ -153,7 +153,6 @@
 #include <sys/sysmacros.h>
 #include <sys/time.h>
 #include <sys/timeb.h>
-#include <sys/timerfd.h>
 #include <sys/times.h>
 #include <sys/timex.h>
 #include <sys/ttydefaults.h>
@@ -161,7 +160,6 @@
 #include <sys/uio.h>
 #include <sys/un.h>
 #include <sys/utsname.h>
-#include <sys/xattr.h>
 #include <syscall.h>
 #include <sysexits.h>
 #include <tar.h>
diff --git a/expected/wasm32-wasi/predefined-macros.txt b/expected/wasm32-wasi/predefined-macros.txt
index 8de7a37..0198f97 100644
--- a/expected/wasm32-wasi/predefined-macros.txt
+++ b/expected/wasm32-wasi/predefined-macros.txt
@@ -1876,10 +1876,6 @@
 #define TELQUAL_NAME 3
 #define TELQUAL_REPLY 2
 #define TELQUAL_SEND 1
-#define TFD_CLOEXEC O_CLOEXEC
-#define TFD_NONBLOCK O_NONBLOCK
-#define TFD_TIMER_ABSTIME 1
-#define TFD_TIMER_CANCEL_ON_SET (1 << 1)
 #define TGEXEC 00010
 #define TGREAD 00040
 #define TGWRITE 00020
@@ -2398,7 +2394,6 @@
 #define _SYS_SYSINFO_H 
 #define _SYS_SYSMACROS_H 
 #define _SYS_TIMEB_H 
-#define _SYS_TIMERFD_H 
 #define _SYS_TIMES_H 
 #define _SYS_TIMEX_H 
 #define _SYS_TIME_H 
@@ -2407,7 +2402,6 @@
 #define _SYS_UIO_H 
 #define _SYS_UN_H 
 #define _SYS_UTSNAME_H 
-#define _SYS_XATTR_H 
 #define _TAR_H 
 #define _TGMATH_H 
 #define _THREADS_H 
@@ -2798,7 +2792,6 @@
 #define __UAPI_DEF_IP_MREQ 0
 #define __UAPI_DEF_SOCKADDR_IN 0
 #define __UAPI_DEF_SOCKADDR_IN6 0
-#define __UAPI_DEF_XATTR 0
 #define __UINT16_C_SUFFIX__ 
 #define __UINT16_FMTX__ "hX"
 #define __UINT16_FMTo__ "ho"