Correct errors from upgrading emscripten

Author: mho22

packages/php-wasm/compile/php/Dockerfile

@@ -2232,10 +2232,10 @@ RUN set -euxo pipefail; \
 			export JSPI_ADD_IMPORTS=",fd_close"; \
 			export JSPI_ADD_EXPORTS=",fd_close"; \
 		fi; \
-		export ASYNCIFY_FLAGS=" -s ASYNCIFY=2 -sSUPPORT_LONGJMP=wasm -fwasm-exceptions -sJSPI_IMPORTS=js_open_process,js_fd_read,js_waitpid,js_process_status,js_create_input_device,wasm_setsockopt,wasm_shutdown,wasm_close,wasm_recv,__syscall_fcntl64,js_flock,js_release_file_locks,js_waitpid$JSPI_ADD_IMPORTS -sJSPI_EXPORTS=php_wasm_init,wasm_sleep,wasm_read,emscripten_sleep,wasm_sapi_handle_request,wasm_sapi_request_shutdown,wasm_poll_socket,wrap_select,__wrap_select,select,php_pollfd_for,fflush,wasm_popen,wasm_read,wasm_php_exec,run_cli,wasm_recv$JSPI_ADD_EXPORTS -s EXPORTED_RUNTIME_METHODS=ccall,PROXYFS,wasmExports "; \
+		export ASYNCIFY_FLAGS=" -s ASYNCIFY=2 -sSUPPORT_LONGJMP=wasm -fwasm-exceptions -sJSPI_IMPORTS=js_open_process,js_fd_read,js_waitpid,js_process_status,js_create_input_device,wasm_setsockopt,wasm_shutdown,wasm_close,wasm_recv,__syscall_fcntl64,js_flock,js_release_file_locks,js_waitpid$JSPI_ADD_IMPORTS -sJSPI_EXPORTS=php_wasm_init,wasm_sleep,wasm_read,emscripten_sleep,wasm_sapi_handle_request,wasm_sapi_request_shutdown,wasm_poll_socket,wrap_select,__wrap_select,select,php_pollfd_for,fflush,wasm_popen,wasm_read,wasm_php_exec,run_cli,wasm_recv,__wasm_call_ctors$JSPI_ADD_EXPORTS -s EXPORTED_RUNTIME_METHODS=ccall,PROXYFS,wasmExports "; \
 		echo '#define PLAYGROUND_JSPI 1' > /root/php_wasm_asyncify.h; \
 	else \
-		export ASYNCIFY_FLAGS=" -s ASYNCIFY=1 -s ASYNCIFY_IGNORE_INDIRECT=1 -s EXPORTED_RUNTIME_METHODS=ccall,PROXYFS,wasmExports,setErrNo $(cat /root/.emcc-php-asyncify-flags)  "; \
+		export ASYNCIFY_FLAGS=" -s ASYNCIFY=1 -s ASYNCIFY_IGNORE_INDIRECT=1 -s EXPORTED_RUNTIME_METHODS=ccall,PROXYFS,wasmExports $(cat /root/.emcc-php-asyncify-flags)  "; \
 		echo '' > /root/php_wasm_asyncify.h; \
 	fi; \
 	export EXPORTED_FUNCTIONS=$'["_exit", \n\

packages/php-wasm/compile/shared/build.js

@@ -29,8 +29,8 @@ const argParser = yargs(process.argv.slice(2))
 			description: 'Build with DWARF debug information.',
 		},
 		WITH_JSPI: {
-			type: 'boolean',
-			default: false,
+			type: 'string',
+			choices: ['yes', 'no'],
 			description: 'Build with JSPI support',
 		},
 	});

packages/php-wasm/compile/shared/intl/Dockerfile

@@ -59,6 +59,7 @@ RUN cd /root && git apply --no-index /root/php${PHP_VERSION:0:3}*.patch -v
 RUN source /root/emsdk/emsdk_env.sh && \
 	cd php-src && \
 	emconfigure ./configure \
+	--host=i386-unknown-freebsd \
 	--disable-fiber-asm \
 	--enable-embed \
 	--disable-cgi \
@@ -126,8 +127,8 @@ RUN set -euxo pipefail; \
 	cd /root/icu/source; \
 	mkdir -p /root; \
 	source /root/emsdk/emsdk_env.sh; \
-	export CFLAGS="-sSIDE_MODULE -D__x86_64__"; \
-	export CXXFLAGS="-sSIDE_MODULE -D__x86_64__"; \
+	export CFLAGS="-fPIC -D__x86_64__"; \
+	export CXXFLAGS="-fPIC -D__x86_64__"; \
 
 	emconfigure ./configure \
 		--host=i386-unknown-freebsd \
@@ -185,7 +186,7 @@ RUN set -euxo pipefail; \
 	fi; \
 
 	if [ "$WITH_JSPI" = "yes" ]; then \
-		export EMCC_FLAGS="${EMCC_FLAGS} -sJSPI"; \
+		export EMCC_FLAGS="${EMCC_FLAGS} -sSUPPORT_LONGJMP=wasm -fwasm-exceptions -sJSPI"; \
 	else \
 		export EMCC_FLAGS="${EMCC_FLAGS} -sASYNCIFY -sASYNCIFY_ADVISE"; \
 	fi; \

packages/php-wasm/compile/xdebug/Dockerfile

@@ -53,6 +53,7 @@ RUN cd /root && git apply --no-index /root/php${PHP_VERSION:0:3}*.patch -v
 RUN source /root/emsdk/emsdk_env.sh && \
 	cd php-src && \
 	emconfigure ./configure \
+	--host=i386-unknown-freebsd \
 	--disable-fiber-asm \
 	--enable-embed \
 	--disable-cgi \
@@ -128,7 +129,7 @@ RUN set -euxo pipefail; \
 	fi; \
 
 	if [ "$JSPI" = "yes" ]; then \
-		export EMCC_FLAGS="${EMCC_FLAGS} -sJSPI -sJSPI_IMPORTS=wasm_recv -sJSPI_EXPORTS=wasm_recv -sSUPPORT_LONGJMP=wasm -fwasm-exceptions "; \
+		export EMCC_FLAGS="${EMCC_FLAGS} -sSUPPORT_LONGJMP=wasm -fwasm-exceptions -sJSPI -sJSPI_IMPORTS=wasm_recv -sJSPI_EXPORTS=wasm_recv"; \
 	else \
 		# execute_internal must be in ASYNCIFY_IMPORTS for Xdebug to trace internal PHP functions.
 		# This enables async unwinding during breakpoints or stepping inside internal calls.