Remove references to __asmjs__ macro (#12775)

Author: sbc100

system/include/emscripten/em_asm.h

@@ -25,7 +25,6 @@
 
 #else
 
-#ifndef __asmjs__
 // In wasm backend, we need to call the emscripten_asm_const_* functions with
 // the C vararg calling convention, because we will call it with a variety of
 // arguments, but need to generate a coherent import for the wasm module before
@@ -172,28 +171,6 @@ void emscripten_asm_const_async_on_main_thread(
 }
 #endif // __cplusplus
 
-#else // __asmjs__
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-#define _EM_ASM_PREP_ARGS(...) , ##__VA_ARGS__
-
-int emscripten_asm_const_int(const char* code, ...);
-double emscripten_asm_const_double(const char* code, ...);
-
-int emscripten_asm_const_int_sync_on_main_thread(const char* code, ...);
-double emscripten_asm_const_double_sync_on_main_thread(const char* code, ...);
-
-void emscripten_asm_const_async_on_main_thread(const char* code, ...);
-
-#ifdef __cplusplus
-}
-#endif // __cplusplus
-
-#endif // __asmjs__
-
 // Note: If the code block in the EM_ASM() family of functions below contains a comma,
 // then wrap the whole code block inside parentheses (). See tests/core/test_em_asm_2.cpp
 // for example code snippets.

system/include/libcxx/__config

@@ -54,7 +54,7 @@
 #  endif
 #endif  // _LIBCPP_STD_VER
 
-#if defined(__ELF__) || defined(__asmjs__) // XXX EMSCRIPTEN: Add define to avoid selecting coff format which activates declspec defines (the ELF define is actually never used)
+#if defined(__ELF__)
 #  define _LIBCPP_OBJECT_FORMAT_ELF   1
 #elif defined(__MACH__)
 #  define _LIBCPP_OBJECT_FORMAT_MACHO 1

system/lib/compiler-rt/lib/builtins/int_lib.h

@@ -48,7 +48,7 @@
 #define XSTR(a) STR(a)
 #define SYMBOL_NAME(name) XSTR(__USER_LABEL_PREFIX__) #name
 
-#if defined(__ELF__) || defined(__MINGW32__) || defined(__wasm__) || defined(__asmjs__)
+#if defined(__ELF__) || defined(__MINGW32__) || defined(__wasm__)
 #define COMPILER_RT_ALIAS(name, aliasname) \
   COMPILER_RT_ABI __typeof(name) aliasname __attribute__((__alias__(#name)));
 #elif defined(__APPLE__)

system/lib/compiler-rt/readme.txt

@@ -14,5 +14,4 @@ Run `system/lib/update_compiler_rt.py path/to/llvm-root`
 Local Change
 ------------
 
-lib/builtins/int_lib.h: __asmjs__ added to list of supported platforms.
 lib/builtins/powitf2.c: enable for wasm as well as PPC

system/lib/dlmalloc.c

@@ -1,13 +1,9 @@
 
 /* XXX Emscripten XXX */
 #if __EMSCRIPTEN__
-#if defined(__EMSCRIPTEN__) && !defined(__asmjs__)
 // When building for wasm we export `malloc` and `emscripten_builtin_malloc` as
 // weak alias of the internal `dlmalloc` which is static to this file.
 #define DLMALLOC_EXPORT static
-#else
-#define DLMALLOC_EXPORT __attribute__((__weak__))
-#endif
 /* mmap uses malloc, so malloc can't use mmap */
 #define HAVE_MMAP 0
 /* we can only grow the heap up anyhow, so don't try to trim */

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

@@ -49,83 +49,6 @@ static inline void a_or_64(volatile uint64_t *p, uint64_t v)
 }
 
 #ifdef __EMSCRIPTEN_PTHREADS__
-#ifdef __asmjs__
-#define a_store_l a_store_l
-static inline void a_store_l(volatile void *p, long x)
-{
-	emscripten_atomic_store_u32((void*)p, x);
-}
-
-#define a_or_l a_or_l
-static inline void a_or_l(volatile void *p, long v)
-{
-	emscripten_atomic_or_u32((void*)p, v);
-}
-
-#define a_cas_p a_cas_p
-static inline void *a_cas_p(volatile void *p, void *t, void *s)
-{
-	return (void*)emscripten_atomic_cas_u32(p, (uint32_t)t, (uint32_t)s);
-}
-
-#define a_cas_l a_cas_l
-static inline long a_cas_l(volatile void *p, long t, long s)
-{
-	return emscripten_atomic_cas_u32(p, t, s);
-}
-
-#define a_cas a_cas
-static inline int a_cas(volatile int *p, int t, int s)
-{
-	return emscripten_atomic_cas_u32(p, t, s);
-}
-
-#define a_or a_or
-static inline void a_or(volatile void *p, int v)
-{
-	emscripten_atomic_or_u32((void*)p, v);
-}
-
-#define a_and a_and
-static inline void a_and(volatile void *p, int v)
-{
-	emscripten_atomic_and_u32((void*)p, v);
-}
-
-#define a_swap a_swap
-static inline int a_swap(volatile int *x, int v)
-{
-	int old;
-	do {
-		old = emscripten_atomic_load_u32(x);
-	} while(emscripten_atomic_cas_u32(x, old, v) != old);
-	return old;
-}
-
-#define a_fetch_add a_fetch_add
-static inline int a_fetch_add(volatile int *x, int v)
-{
-	return emscripten_atomic_add_u32(x, v);
-}
-
-#define a_inc a_inc
-static inline void a_inc(volatile int *x)
-{
-	emscripten_atomic_add_u32((void*)x, 1);
-}
-
-#define a_dec a_dec
-static inline void a_dec(volatile int *x)
-{
-	emscripten_atomic_sub_u32((void*)x, 1);
-}
-
-#define a_store a_store
-static inline void a_store(volatile int *p, int x)
-{
-	emscripten_atomic_store_u32((void*)p, x);
-}
-#else // __asmjs__
 #define a_store_l a_store_l
 static inline void a_store_l(volatile void *p, long x)
 {
@@ -202,7 +125,6 @@ static inline void a_store(volatile int *p, int x)
 {
 	__c11_atomic_store((_Atomic int*)p, x, __ATOMIC_SEQ_CST);
 }
-#endif // __asmjs__
 #else // __EMSCRIPTEN_PTHREADS__
 #define a_store_l a_store_l
 static inline void a_store_l(volatile void *p, long x)

system/lib/libcxx/readme.txt

@@ -13,12 +13,10 @@ Local Modification
 
 Local modifications are marked with the comment: 'XXX EMSCRIPTEN'
 
-1. Define _LIBCPP_OBJECT_FORMAT_ELF under __asmjs__ in libcxx/__config.
+1. Define _LIBCPP_HAS_THREAD_API_PTHREAD in libcxx/__config./
 
-2. Define _LIBCPP_HAS_THREAD_API_PTHREAD in libcxx/__config./
+2. Define _LIBCPP_ELAST in libcxx/include/config_elast.h
 
-3. Define _LIBCPP_ELAST in libcxx/include/config_elast.h
+3. Set init_priority of __start_std_streams in libcxx/iostream.cpp
 
-4. Set init_priority of __start_std_streams in libcxx/iostream.cpp
-
-5. Use _LIBCPP_USING_GETENTROPY (like wasi)
+4. Use _LIBCPP_USING_GETENTROPY (like wasi)

tests/core/test_longjmp_unwind.c

@@ -10,6 +10,8 @@
 #include <stdio.h>
 #include <assert.h>
 
+#include <emscripten/stack.h>
+
 #define abs(x) ((x) < 0 ? (-x) : (x))
 
 // A minor stack change is ignorable (e.g., printf)
@@ -19,16 +21,9 @@
 
 jmp_buf jb;
 
-__attribute__((noinline)) int get_stack()
-{
-  int dummy;
-  int ptr = (int)&dummy;
-  return ptr;
-}
-
 __attribute__((noinline)) void bar()
 {
-  printf("before longjmp: %d\n", get_stack());
+  printf("before longjmp: %d\n", emscripten_stack_get_current());
   longjmp(jb, 1);
 }
 
@@ -38,25 +33,20 @@ __attribute__((noinline)) void foo()
 {
   temp = alloca(MAJOR);
   printf("major allocation at: %d\n", (int)temp);
-#ifdef __asmjs__
-  // asmjs stack grows up, but wasm backend stack grows down, so the delta
-  // between get_stack() and temp isn't related to the size of the alloca for
-  // wasm backend
-  assert(abs(get_stack() - (int)temp) >= MAJOR);
-#endif
+  assert(abs(emscripten_stack_get_current() - (int)temp) >= MAJOR);
   bar();
 }
 
 int main()
 {
-  int before = get_stack();
+  int before = emscripten_stack_get_current();
   printf("before setjmp: %d\n", before);
 
   if (!setjmp(jb)) {
     foo();
     return 0;
   } else {
-    int after = get_stack();
+    int after = emscripten_stack_get_current();
     printf("before setjmp: %d\n", after);
     assert(abs(after - before) < MINOR); // stack has been unwound (but may have minor printf changes
     printf("ok.\n");

tests/core/test_stddef.cpp

@@ -26,14 +26,8 @@ void abort(void);
 
 int main() {
   // max_align_t on wasm backend is 16 due to sizeof(long double) being 16.
-  // On asmjs sizeof(long double) is 8.
-#if __asmjs__
-  if (_Alignof(max_align_t) != 8)
-    abort();
-#else
   if (_Alignof(max_align_t) != 16)
     abort();
-#endif
   puts("success");
   return 0;
 }

tests/test_core.py

@@ -461,10 +461,9 @@ def test_bswap64(self):
   def test_sha1(self):
     self.do_runf(path_from_root('tests', 'sha1.c'), 'SHA1=15dd99a1991e0b3826fede3deffc1feba42278e6')
 
-  @no_wasm_backend('test checks that __asmjs__ is #defined')
-  def test_asmjs_unknown_emscripten(self):
+  def test_wasm32_unknown_emscripten(self):
     # No other configuration is supported, so always run this.
-    self.do_runf(path_from_root('tests', 'asmjs-unknown-emscripten.c'), '')
+    self.do_runf(path_from_root('tests', 'wasm32-unknown-emscripten.c'), '')
 
   def test_cube2md5(self):
     self.emcc_args += ['--embed-file', 'cube2md5.txt']

tests/asmjs-unknown-emscripten.c renamed to tests/wasm32-unknown-emscripten.c

@@ -8,8 +8,11 @@
 #ifndef __EMSCRIPTEN__
 #error __EMSCRIPTEN__ is not defined
 #endif
-#ifndef __asmjs__
-#error __asmjs__ is not defined
+#ifndef __wasm__
+#error __wasm__ is not defined
+#endif
+#ifndef __wasm32__
+#error __wasm32__ is not defined
 #endif
 #ifdef __cplusplus
 #ifndef _GNU_SOURCE
@@ -94,8 +97,8 @@ int main() {
   assert(sizeof(long) == 4);
   assert(sizeof(intmax_t) == 8);
   assert(__alignof(double) == 8);
-  assert(sizeof(long double) == 8);
-  assert(__alignof(long double) == 8);
+  assert(sizeof(long double) == 16);
+  assert(__alignof(long double) == 16);
   assert(sizeof(intptr_t) == 4);
   assert(sizeof(size_t) == 4);
   assert(sizeof(ptrdiff_t) == 4);