Switch predefined macro to __wasm

tyfkda · tyfkda · commit 91e3acfc82d8 · 2025-06-16T09:31:38.000+09:00
* `__wasm` * `__wasm32` #199
diff --git a/include/math.h b/include/math.h
@@ -18,7 +18,7 @@
 #define INFINITY    (1.0 / 0.0)
 #define HUGE_VAL    INFINITY
 
-#if defined(__riscv) || defined(__WASM)  // newlib environments.
+#if defined(__riscv) || defined(__wasm)  // newlib environments.
 #define FP_NAN        0
 #define FP_INFINITE   1
 #define FP_ZERO       2
@@ -103,7 +103,7 @@ inline int isnan(double x) {
 #if defined(__APPLE__)
   extern int __isnand(double);
   return __isnand(x);
-#elif defined(__riscv) || defined(__WASM)
+#elif defined(__riscv) || defined(__wasm)
   return fpclassify(x) == FP_NAN;
 #else
   extern int __isnan(double);
@@ -115,7 +115,7 @@ inline int isinf(double x) {
 #if defined(__APPLE__)
   extern int __isinfd(double);
   return __isinfd(x);
-#elif defined(__riscv) || defined(__WASM)
+#elif defined(__riscv) || defined(__wasm)
   return fpclassify(x) == FP_INFINITE;
 #else
   extern int __isinf(double);
diff --git a/include/setjmp.h b/include/setjmp.h
@@ -2,7 +2,7 @@
 
 #include <stdint.h>  // uintptr_t
 
-#if defined(__WASM)
+#if defined(__wasm)
 typedef uintptr_t jmp_buf[2];  // 0=Stack pointer, 1=longjmp-result.
 
 #elif defined(__aarch64__)
@@ -21,7 +21,7 @@ _Noreturn void longjmp(jmp_buf env, int result);
 #define _setjmp   setjmp
 #define _longjmp  longjmp
 
-#ifdef __WASM
+#ifdef __wasm
 #define setjmp(env)           __builtin_setjmp(env)
 #define longjmp(env, result)  __builtin_longjmp(env, result)
 #endif
diff --git a/include/stdarg.h b/include/stdarg.h
@@ -4,7 +4,7 @@
 
 #include_next <stdarg.h>
 
-#elif defined(__WASM)
+#elif defined(__wasm)
 
 typedef __builtin_va_list __gnuc_va_list;
 typedef __gnuc_va_list va_list;
diff --git a/include/unistd.h b/include/unistd.h
@@ -40,7 +40,7 @@ char *getcwd(char *buffer, size_t size);
 int brk(void *addr);
 void *sbrk(intptr_t increment);
 
-#if !defined(__WASM)
+#if !defined(__wasm)
 int unlinkat(int dirfd, const char *pathname, int flags);
 int dup(int);
 int pipe(int *);
diff --git a/libsrc/math/ceil.c b/libsrc/math/ceil.c
@@ -4,7 +4,7 @@
 
 #ifndef __NO_FLONUM
 double ceil(double x) {
-#if defined(__WASM)
+#if defined(__wasm)
 #define S(x)   S_(x)
 #define S_(x)  #x
 #define OP_LOCAL_GET      32   // 0x20
diff --git a/libsrc/math/copysign.c b/libsrc/math/copysign.c
@@ -4,7 +4,7 @@
 
 #ifndef __NO_FLONUM
 double copysign(double x, double f) {
-#if defined(__WASM)
+#if defined(__wasm)
 #define S(x)   S_(x)
 #define S_(x)  #x
 #define OP_LOCAL_GET      32   // 0x20
diff --git a/libsrc/math/floor.c b/libsrc/math/floor.c
@@ -4,7 +4,7 @@
 
 #ifndef __NO_FLONUM
 double floor(double x) {
-#if defined(__WASM)
+#if defined(__wasm)
 #define S(x)   S_(x)
 #define S_(x)  #x
 #define OP_LOCAL_GET      32   // 0x20
diff --git a/libsrc/math/sqrt.c b/libsrc/math/sqrt.c
@@ -2,7 +2,7 @@
 
 #ifndef __NO_FLONUM
 double sqrt(double x) {
-#if defined(__WASM)
+#if defined(__wasm)
 #define S(x)   S_(x)
 #define S_(x)  #x
 #define OP_LOCAL_GET      32   // 0x20
diff --git a/libsrc/misc/longjmp.c b/libsrc/misc/longjmp.c
@@ -1,7 +1,7 @@
 #if !defined(__GNUC__)
 #include "setjmp.h"
 
-#if defined(__WASM)
+#if defined(__wasm)
 // handled by builtin
 
 #elif defined(__x86_64__)
diff --git a/libsrc/misc/setjmp.c b/libsrc/misc/setjmp.c
@@ -1,7 +1,7 @@
 #if !defined(__GNUC__)
 #include "setjmp.h"
 
-#if defined(__WASM)
+#if defined(__wasm)
 // handled by builtin
 
 #elif defined(__x86_64__)
diff --git a/libsrc/stdlib/exit.c b/libsrc/stdlib/exit.c
@@ -3,10 +3,10 @@
 
 OnExitChain *__on_exit_chain;
 
-#if defined(__linux__) || defined(__WASM)
+#if defined(__linux__) || defined(__wasm)
 #include "stdbool.h"
 
-#if defined(__WASM)
+#if defined(__wasm)
 #include "../_wasm/wasi.h"
 #else
 #include "../unistd/_syscall.h"
diff --git a/libsrc/stdlib/getrandom.c b/libsrc/stdlib/getrandom.c
@@ -1,6 +1,6 @@
 #include "sys/random.h"
 
-#if defined(__WASM)
+#if defined(__wasm)
 #include "../_wasm/wasi.h"
 
 ssize_t getrandom(void *buf, size_t buflen, unsigned int flags) {
diff --git a/libsrc/string/memcpy.c b/libsrc/string/memcpy.c
@@ -1,7 +1,7 @@
 #include "string.h"
 
 void *memcpy(void *dst, const void *src, size_t n) {
-#if defined(__WASM)
+#if defined(__wasm)
 #define S(x)   S_(x)
 #define S_(x)  #x
 #define OP_LOCAL_GET      32   // 0x20
diff --git a/libsrc/string/memmove.c b/libsrc/string/memmove.c
@@ -1,7 +1,7 @@
 #include "string.h"
 
 void *memmove(void *dst, const void *src, size_t n) {
-#if defined(__WASM)
+#if defined(__wasm)
 #define S(x)   S_(x)
 #define S_(x)  #x
 #define OP_LOCAL_GET      32   // 0x20
diff --git a/libsrc/string/memset.c b/libsrc/string/memset.c
@@ -1,7 +1,7 @@
 #include "string.h"
 
 void *memset(void *buf, int val, size_t size) {
-#if defined(__WASM)
+#if defined(__wasm)
 #define S(x)   S_(x)
 #define S_(x)  #x
 #define OP_LOCAL_GET      32   // 0x20
diff --git a/src/config.h b/src/config.h
@@ -7,7 +7,7 @@
 #define XCC_ARCH_WASM     4
 
 #if !defined(XCC_TARGET_ARCH)
-# if defined(__WASM)
+# if defined(__wasm)
 #  define XCC_TARGET_ARCH  XCC_ARCH_WASM
 # elif defined(__x86_64__)
 #  define XCC_TARGET_ARCH  XCC_ARCH_X64
@@ -26,7 +26,7 @@
 #define XCC_PLATFORM_WASI   3
 
 #if !XCC_TARGET_PLATFORM
-# if defined(__WASM) || XCC_TARGET_ARCH == XCC_ARCH_WASM
+# if defined(__wasm) || XCC_TARGET_ARCH == XCC_ARCH_WASM
 #  define XCC_TARGET_PLATFORM  XCC_PLATFORM_WASI
 # elif defined(__APPLE__)
 #  define XCC_TARGET_PLATFORM  XCC_PLATFORM_APPLE
diff --git a/src/wcc/wcc.c b/src/wcc/wcc.c
@@ -628,7 +628,7 @@ static int do_compile(Options *opts) {
 }
 
 int main(int argc, char *argv[]) {
-#if defined(__WASM)
+#if defined(__wasm)
   const char *root = "/usr";
 #else
   const char *root = dirname(strdup(argv[0]));
@@ -642,7 +642,8 @@ int main(int argc, char *argv[]) {
   static const char *kPredefinedMacros[] = {
     "__XCC",
     "__ILP32__",
-    "__WASM",
+    "__wasm",
+    "__wasm32",
     "__STDC__",
     "__STDC_VERSION__=199901L",
     "__SIZEOF_POINTER__=4",
diff --git a/tests/valtest.c b/tests/valtest.c
@@ -122,7 +122,7 @@ int static_local(void) {
   return ++x;
 }
 
-#if !defined(__WASM)
+#if !defined(__wasm)
 int oldfuncptr(int (*f)(), int x) {
   return f(f(x));
 }
@@ -1073,7 +1073,7 @@ TEST(basic) {
     EXPECT("typedef[]", 5, sizeof(t2));
   }
 
-#if !defined(__WASM)
+#if !defined(__wasm)
   {
     int oldstylefunc();
     EXPECT("old-style func", 93, oldstylefunc(31));
@@ -1135,7 +1135,7 @@ TEST(basic) {
     EXPECT("nulchr contained string", 0, memcmp(expected, nulchr_contained, sizeof(nulchr_contained)));
   }
 
-#if !defined(__WASM)
+#if !defined(__wasm)
   {
 #define SUPPRESS_LABEL(label)  do { if (false) goto label; } while (0)
     int x = 1;
@@ -1178,7 +1178,7 @@ TTT:;
     }
     EXPECT("switch w/o case & default", 0, x);
 
-#if !defined(__WASM)
+#if !defined(__wasm)
     x = 94;
     switch (z) {
       if (0) {
