wasi-sdk-no-simd128.diff

diff --git a/Makefile b/Makefile
index 18d664f..6e59274 100644
--- a/Makefile
+++ b/Makefile
@@ -51,8 +51,8 @@ default: build
 	@echo "Use -fdebug-prefix-map=$(ROOT_DIR)=wasisdk://v$(VERSION)"
 
 check:
-	CC="clang --sysroot=$(BUILD_PREFIX)/share/wasi-sysroot -fno-strict-aliasing -msimd128 -mnontrapping-fptoint -msign-ext -mbulk-memory -mmutable-globals -mmultivalue -mreference-types -Xclang -target-abi -Xclang experimental-mv" \
-	CXX="clang++ --sysroot=$(BUILD_PREFIX)/share/wasi-sysroot -fno-exceptions -fno-exceptions -fno-strict-aliasing -msimd128 -mnontrapping-fptoint -msign-ext -mbulk-memory -mmutable-globals -mmultivalue -mreference-types -Xclang -target-abi -Xclang experimental-mv" \
+	CC="clang --sysroot=$(BUILD_PREFIX)/share/wasi-sysroot -fno-strict-aliasing -mnontrapping-fptoint -msign-ext -mbulk-memory -mmutable-globals -mmultivalue -mreference-types -Xclang -target-abi -Xclang experimental-mv" \
+	CXX="clang++ --sysroot=$(BUILD_PREFIX)/share/wasi-sysroot -fno-exceptions -fno-exceptions -fno-strict-aliasing -mnontrapping-fptoint -msign-ext -mbulk-memory -mmutable-globals -mmultivalue -mreference-types -Xclang -target-abi -Xclang experimental-mv" \
 	PATH="$(PATH_PREFIX)/bin:$$PATH" tests/run.sh "$(BUILD_PREFIX)" "$(RUNTIME)" "$(ADAPTER)" "$(WASM_TOOLS)"
 
 clean:
Submodule src/wasi-libc contains modified content
diff --git a/src/wasi-libc/Makefile b/src/wasi-libc/Makefile
index 53b3144..e2e76d5 100644
--- a/src/wasi-libc/Makefile
+++ b/src/wasi-libc/Makefile
@@ -8,7 +8,7 @@ NM ?= $(patsubst %clang,%llvm-nm,$(filter-out ccache sccache,$(CC)))
 ifeq ($(origin AR), default)
 AR = $(patsubst %clang,%llvm-ar,$(filter-out ccache sccache,$(CC)))
 endif
-EXTRA_CFLAGS ?= -O3 -fno-strict-aliasing -DNDEBUG -msimd128 -mnontrapping-fptoint -msign-ext -mbulk-memory -mmutable-globals -mmultivalue -mreference-types -Xclang -target-abi -Xclang experimental-mv
+EXTRA_CFLAGS ?= -O3 -fno-strict-aliasing -DNDEBUG -mnontrapping-fptoint -msign-ext -mbulk-memory -mmutable-globals -mmultivalue -mreference-types -Xclang -target-abi -Xclang experimental-mv
 # The directory where we build the sysroot.
 SYSROOT ?= $(CURDIR)/sysroot
 # A directory to install to for "make install".
diff --git a/src/wasi-libc/expected/wasm32-wasi-preview2/predefined-macros.txt b/src/wasi-libc/expected/wasm32-wasi-preview2/predefined-macros.txt
index 1c8146a..ebe86c1 100644
--- a/src/wasi-libc/expected/wasm32-wasi-preview2/predefined-macros.txt
+++ b/src/wasi-libc/expected/wasm32-wasi-preview2/predefined-macros.txt
@@ -3187,7 +3187,6 @@
 #define __wasm_multivalue__ 1
 #define __wasm_nontrapping_fptoint__ 1
 #define __wasm_reference_types__ 1
-#define __wasm_simd128__ 1
 #define _tolower(a) ((a)|0x20)
 #define _toupper(a) ((a)&0x5f)
 #define acos(x) __tg_real_complex(acos, (x))
diff --git a/src/wasi-libc/expected/wasm32-wasi-threads/predefined-macros.txt b/src/wasi-libc/expected/wasm32-wasi-threads/predefined-macros.txt
index fd0252a..c799b7e 100644
--- a/src/wasi-libc/expected/wasm32-wasi-threads/predefined-macros.txt
+++ b/src/wasi-libc/expected/wasm32-wasi-threads/predefined-macros.txt
@@ -3127,7 +3127,6 @@
 #define __wasm_multivalue__ 1
 #define __wasm_nontrapping_fptoint__ 1
 #define __wasm_reference_types__ 1
-#define __wasm_simd128__ 1
 #define _tolower(a) ((a)|0x20)
 #define _toupper(a) ((a)&0x5f)
 #define acos(x) __tg_real_complex(acos, (x))
diff --git a/src/wasi-libc/expected/wasm32-wasi/predefined-macros.txt b/src/wasi-libc/expected/wasm32-wasi/predefined-macros.txt
index 44594e1..133bbbc 100644
--- a/src/wasi-libc/expected/wasm32-wasi/predefined-macros.txt
+++ b/src/wasi-libc/expected/wasm32-wasi/predefined-macros.txt
@@ -3089,7 +3089,6 @@
 #define __wasm_multivalue__ 1
 #define __wasm_nontrapping_fptoint__ 1
 #define __wasm_reference_types__ 1
-#define __wasm_simd128__ 1
 #define _tolower(a) ((a)|0x20)
 #define _toupper(a) ((a)&0x5f)
 #define acos(x) __tg_real_complex(acos, (x))
diff --git a/wasi-sdk-pthread.cmake b/wasi-sdk-pthread.cmake
index ebbd2cd..5590b56 100644
--- a/wasi-sdk-pthread.cmake
+++ b/wasi-sdk-pthread.cmake
@@ -7,8 +7,8 @@ set(CMAKE_SYSTEM_NAME WASI)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR wasm32)
 set(triple wasm32-wasi-threads)
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread -fno-strict-aliasing -msimd128 -mnontrapping-fptoint -msign-ext -mbulk-memory -mmutable-globals -mmultivalue -mreference-types -Xclang -target-abi -Xclang experimental-mv")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -fno-exceptions -fno-strict-aliasing -msimd128 -mnontrapping-fptoint -msign-ext -mbulk-memory -mmutable-globals -mmultivalue -mreference-types -Xclang -target-abi -Xclang experimental-mv")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread -fno-strict-aliasing -mnontrapping-fptoint -msign-ext -mbulk-memory -mmutable-globals -mmultivalue -mreference-types -Xclang -target-abi -Xclang experimental-mv")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -fno-exceptions -fno-strict-aliasing -mnontrapping-fptoint -msign-ext -mbulk-memory -mmutable-globals -mmultivalue -mreference-types -Xclang -target-abi -Xclang experimental-mv")
 # wasi-threads requires --import-memory.
 # wasi requires --export-memory.
 # (--export-memory is implicit unless --import-memory is given)
diff --git a/wasi-sdk.cmake b/wasi-sdk.cmake
index 16494ae..06938f6 100644
--- a/wasi-sdk.cmake
+++ b/wasi-sdk.cmake
@@ -31,8 +31,8 @@ set(CMAKE_RANLIB ${WASI_SDK_PREFIX}/bin/llvm-ranlib${WASI_HOST_EXE_SUFFIX})
 set(CMAKE_C_COMPILER_TARGET ${triple})
 set(CMAKE_CXX_COMPILER_TARGET ${triple})
 set(CMAKE_ASM_COMPILER_TARGET ${triple})
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-strict-aliasing -msimd128 -mnontrapping-fptoint -msign-ext -mbulk-memory -mmutable-globals -mmultivalue -mreference-types -Xclang -target-abi -Xclang experimental-mv")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-strict-aliasing -msimd128 -mnontrapping-fptoint -msign-ext -mbulk-memory -mmutable-globals -mmultivalue -mreference-types -Xclang -target-abi -Xclang experimental-mv")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-strict-aliasing -mnontrapping-fptoint -msign-ext -mbulk-memory -mmutable-globals -mmultivalue -mreference-types -Xclang -target-abi -Xclang experimental-mv")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-strict-aliasing -mnontrapping-fptoint -msign-ext -mbulk-memory -mmutable-globals -mmultivalue -mreference-types -Xclang -target-abi -Xclang experimental-mv")
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--error-limit=0,--growable-table,--stack-first")
 
 # Don't look in the sysroot for executables to run during the build