Skip to content

Commit

Permalink
Remove more unsupported headers. (WebAssembly#123)
Browse files Browse the repository at this point in the history
utime.h, sysmacros.h, and libintl.h are all currently unsupported.
Removing them helps programs that autodetect features based on the
existence of headers.
  • Loading branch information
sunfishcode committed Nov 4, 2019
1 parent ec3ee5e commit eb7230c
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 12 deletions.
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,10 @@ override MUSL_OMIT_HEADERS += \
"net/route.h" \
"netinet/if_ether.h" \
"netinet/ether.h" \
"sys/timerfd.h"
"sys/timerfd.h" \
"libintl.h" \
"sys/sysmacros.h" \
"utime.h"

ifeq ($(THREAD_MODEL), single)
# Remove headers not supported in single-threaded mode.
Expand Down
3 changes: 0 additions & 3 deletions expected/wasm32-wasi/include-all.c
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@
#include <iso646.h>
#include <langinfo.h>
#include <libgen.h>
#include <libintl.h>
#include <limits.h>
#include <locale.h>
#include <malloc.h>
Expand Down Expand Up @@ -148,7 +147,6 @@
#include <sys/stropts.h>
#include <sys/syscall.h>
#include <sys/sysinfo.h>
#include <sys/sysmacros.h>
#include <sys/time.h>
#include <sys/timeb.h>
#include <sys/times.h>
Expand All @@ -166,7 +164,6 @@
#include <time.h>
#include <uchar.h>
#include <unistd.h>
#include <utime.h>
#include <values.h>
#include <wasi/core.h>
#include <wasi/libc-find-relpath.h>
Expand Down
8 changes: 0 additions & 8 deletions expected/wasm32-wasi/predefined-macros.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2103,7 +2103,6 @@
#define _ISO646_H
#define _LANGINFO_H
#define _LIBGEN_H
#define _LIBINTL_H
#define _LIMITS_H
#define _LOCALE_H
#define _MALLOC_H
Expand Down Expand Up @@ -2391,7 +2390,6 @@
#define _SYS_STAT_H
#define _SYS_SYSCALL_H
#define _SYS_SYSINFO_H
#define _SYS_SYSMACROS_H
#define _SYS_TIMEB_H
#define _SYS_TIMES_H
#define _SYS_TIMEX_H
Expand All @@ -2407,7 +2405,6 @@
#define _TIME_H
#define _UCHAR_H
#define _UNISTD_H
#define _UTIME_H
#define _VALUES_H
#define _VA_LIST
#define _WCHAR_H
Expand Down Expand Up @@ -2561,7 +2558,6 @@
#define __compiler_ATOMIC_WCHAR_T_LOCK_FREE 2
#define __GNUC_STDC_INLINE__ 1
#define __GNUC_VA_LIST 1
#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 1 : -1)
#define __GXX_ABI_VERSION 1002
#define __ILP32__ 1
#define __INT16_C_SUFFIX__
Expand Down Expand Up @@ -2883,7 +2879,6 @@
#define __UINT_LEAST8_MAX__ 255
#define __UINT_LEAST8_TYPE__ unsigned char
#define __USER_LABEL_PREFIX__
#define __USE_GNU_GETTEXT 1
#define __WASI_ADVICE_DONTNEED (UINT8_C(4))
#define __WASI_ADVICE_NOREUSE (UINT8_C(5))
#define __WASI_ADVICE_NORMAL (UINT8_C(0))
Expand Down Expand Up @@ -3327,10 +3322,7 @@
#define lseek(fd,offset,whence) ({ off_t __f = (fd); off_t __o = (offset); off_t __w = (whence); __builtin_constant_p((offset)) && __builtin_constant_p((whence)) && __o == 0 && __w == SEEK_CUR ? __wasilibc_tell(__f) : lseek(__f, __o, __w); })
#define lseek64 lseek
#define lstat64 lstat
#define major(x) ((unsigned)( (((x)>>31>>1) & 0xfffff000) | (((x)>>8) & 0x00000fff) ))
#define makedev(x,y) ( (((x)&0xfffff000ULL) << 32) | (((x)&0x00000fffULL) << 8) | (((y)&0xffffff00ULL) << 12) | (((y)&0x000000ffULL)) )
#define math_errhandling 2
#define minor(x) ((unsigned)( (((x)>>12) & 0xffffff00) | ((x) & 0x000000ff) ))
#define mld_cksum mld_icmp6_hdr.icmp6_cksum
#define mld_code mld_icmp6_hdr.icmp6_code
#define mld_maxdelay mld_icmp6_hdr.icmp6_data16[0]
Expand Down

0 comments on commit eb7230c

Please sign in to comment.