Update build scripts

Author: Arshia001

.gitignore

@@ -133,6 +133,7 @@ config.h.in
 /scripts/phpize
 php
 php.wasm
+php-eh.wasm
 
 # ------------------------------------------------------------------------------
 # Lexer files generated by re2c

wasix-build-eh.sh

@@ -5,10 +5,12 @@ set -eou
 make -j16
 
 wasm-opt -O3 \
+  --experimental-new-eh \
+  --no-validation \
+  --all-features \
+  --strip-debug \
   --asyncify \
   --pass-arg=asyncify-imports@wasix_32v1.proc_snapshot \
   --pass-arg=asyncify-ignore-indirect \
-  -pa max-func-params@32 \
-  sapi/cli/php -o sapi/cli/php.wasm
-
-wasm-strip sapi/cli/php.wasm
+  --pass-arg=max-func-params@32 \
+  sapi/cli/php -o sapi/cli/php-eh.wasm

wasix-build.sh

@@ -4,6 +4,8 @@ set -eou
 
 make -j16
 
-wasm-opt -O3 --asyncify sapi/cli/php -o sapi/cli/php.wasm -pa max-func-params@32
-
-wasm-strip sapi/cli/php.wasm
+wasm-opt -O3 \
+  --strip-debug \
+  --asyncify \
+  --pass-arg=max-func-params@32 \
+  sapi/cli/php -o sapi/cli/php.wasm

wasix-configure.sh

@@ -45,11 +45,11 @@ export \
   PHP_BUILD_SYSTEM="clang(WASIX)" \
   PHP_EXTRA_INCLUDES="" \
   PHP_IPV6="yes" \
-  RANLIB=llvm-ranlib-15 \
-  AR=llvm-ar-15 \
-  NM=llvm-nm-15 \
-  CC="clang-15 --target=wasm32-wasi --sysroot=$SYSROOT" \
-  CXX="clang++-15 --target=wasm32-wasi --sysroot=$SYSROOT" \
+  RANLIB=llvm-ranlib-20 \
+  AR=llvm-ar-20 \
+  NM=llvm-nm-20 \
+  CC="clang-20 --target=wasm32-wasi --sysroot=$SYSROOT" \
+  CXX="clang++-20 --target=wasm32-wasi --sysroot=$SYSROOT" \
   CFLAGS="-matomics -mbulk-memory -mmutable-globals -pthread -mthread-model posix -ftls-model=local-exec \
     -fno-trapping-math -D_WASI_EMULATED_MMAN -D_WASI_EMULATED_SIGNAL -D_WASI_EMULATED_PROCESS_CLOCKS \
     -g -flto -O2" \
@@ -59,7 +59,8 @@ export \
   LIBS="-Wl,--shared-memory -Wl,--max-memory=4294967296 -Wl,--import-memory -Wl,--export-dynamic \
     -Wl,--export=__heap_base -Wl,--export=__stack_pointer -Wl,--export=__data_end -Wl,--export=__wasm_init_tls \
     -Wl,--export=__wasm_signal -Wl,--export=__tls_size -Wl,--export=__tls_align -Wl,--export=__tls_base \
-    -lwasi-emulated-mman -flto -g -Wl,-z,stack-size=8388608 -Wl,--error-limit=0 -L$PHP_WASIX_DEPS/lib -v"
+    -lwasi-emulated-mman -flto -g -Wl,-z,stack-size=8388608 -Wl,--error-limit=0 -L$PHP_WASIX_DEPS/lib -v \
+    --no-wasm-opt"
 
 ./buildconf --force
 

wasix-execute-eh.sh

@@ -3,13 +3,15 @@
 set -eo
 
 wasmer run sapi/cli/php-eh.wasm \
-  --singlepass \
+  --llvm \
   --net \
   --mapdir /app:../wordpress \
   --mapdir /etc/ssl:../php-wasix-deps/openssl/ssl \
   --mapdir /icu:../php-wasix-deps/icu \
   --env SSL_CERT_DIR=/etc/ssl/certs \
-  --env PHP_CLI_SERVER_WORKERS=3 \
+  --env OPENSSL_CONF=/etc/ssl/openssl.cnf \
+  --use amin/bash \
+  --forward-host-env \
   -- \
   -S localhost:8080 \
   -t /app \

wasix-execute.sh

@@ -9,6 +9,8 @@ wasmer run sapi/cli/php.wasm \
   --mapdir /etc/ssl:../php-wasix-deps/openssl/ssl \
   --mapdir /icu:../php-wasix-deps/icu \
   --env SSL_CERT_DIR=/etc/ssl/certs \
+  --use amin/bash \
+  --forward-host-env \
   --env PHP_CLI_SERVER_WORKERS=3 \
   -- \
   -S localhost:8080 \

wasmer-eh.toml

@@ -0,0 +1,22 @@
+[package]
+name = 'php/php-eh'
+version = '8.3.404-beta.4'
+description = 'PHP with wasm exception handling support'
+readme = 'README.md'
+
+# See more keys and definitions at https://docs.wasmer.io/registry/manifest
+
+[dependencies]
+
+[[module]]
+name = 'php'
+source = 'sapi/cli/php-eh.wasm'
+abi = 'wasi'
+
+[[command]]
+name = 'php'
+module = 'php'
+
+[fs]
+"/etc/ssl" = "../php-wasix-deps/openssl/ssl"
+"/icu" = "../php-wasix-deps/icu"

wasmer.toml

@@ -1,6 +1,6 @@
 [package]
 name = 'php/php'
-version = '8.3.402'
+version = '8.3.404-beta.4'
 description = 'PHP is a popular general-purpose scripting language that is especially suited to web development. Fast, flexible and pragmatic, PHP powers everything from your blog to the most popular websites in the world. PHP is distributed under the PHP License v3.01.'
 readme = 'README.md'