From 7791fe2e7bc8a26f19b85d7f13608cb7e08608ee Mon Sep 17 00:00:00 2001 From: DanielZ224 Date: Mon, 27 Apr 2026 01:56:47 +0000 Subject: [PATCH] Remove set_stack_pointer.o from app compile scripts --- bash/compile_bash.sh | 3 +-- coreutils/compile_coreutils.sh | 1 - cpython/compile_cpython.sh | 1 - curl/compile_curl.sh | 1 - git/compile_git.sh | 1 - grep/compile_grep.sh | 1 - lmbench/src/compile_lmbench.sh | 1 - nginx/compile_nginx.sh | 1 - postgres/compile_postgres.sh | 1 - 9 files changed, 1 insertion(+), 10 deletions(-) diff --git a/bash/compile_bash.sh b/bash/compile_bash.sh index e5734790d1..3da184905b 100755 --- a/bash/compile_bash.sh +++ b/bash/compile_bash.sh @@ -58,7 +58,7 @@ FORCE_CONFIGURE="${FORCE_CONFIGURE:-0}" # LIND_DYLINK controls whether we produce a statically-linked or a shared # (PIE/dynamic) wasm binary. Set LIND_DYLINK=1 to get the shared path; # the default is static (0). The shared path adds the PIE linker flags, links -# in lind_debug.o and set_stack_pointer.o, runs add-export-tool to inject the +# in lind_debug.o, runs add-export-tool to inject the # __wasm_apply_* and __stack_pointer exports, and uses the additional wasm-opt # passes required for shared modules. ################## @@ -120,7 +120,6 @@ if [[ "$LIND_DYLINK" == "1" ]]; then # lind_debug.o lives in the glibc build tree (not installed to the sysroot) DYLINK_CRT_OBJS=( - "$LIND_WASM_ROOT/src/glibc/build/csu/set_stack_pointer.o" "$LIND_WASM_ROOT/src/glibc/build/lind_debug.o" ) for obj in "${DYLINK_CRT_OBJS[@]}"; do diff --git a/coreutils/compile_coreutils.sh b/coreutils/compile_coreutils.sh index 748670871c..3373e344ef 100755 --- a/coreutils/compile_coreutils.sh +++ b/coreutils/compile_coreutils.sh @@ -107,7 +107,6 @@ if [[ "$LIND_DYLINK" == "1" ]]; then # Extra CRT objects required for dynamic PIE executables DYLINK_CRT_OBJS=( - "$MERGED_SYSROOT/lib/wasm32-wasi/set_stack_pointer.o" "$MERGED_SYSROOT/lib/wasm32-wasi/crt1_shared.o" "$MERGED_SYSROOT/lib/wasm32-wasi/lind_utils.o" ) diff --git a/cpython/compile_cpython.sh b/cpython/compile_cpython.sh index b21e750bc2..402827d562 100755 --- a/cpython/compile_cpython.sh +++ b/cpython/compile_cpython.sh @@ -294,7 +294,6 @@ if [[ "$LIND_DYLINK" == "1" ]]; then "$BUILD_WASM/Modules/_decimal/libmpdec/libmpdec.a" \ "$BUILD_WASM/Modules/_hacl/libHacl_HMAC.a" \ "$BUILD_WASM/Modules/_hacl/libHacl_Hash_SHA3.a" \ - "$SYSROOT/lib/wasm32-wasi/set_stack_pointer.o" \ "$SYSROOT/lib/wasm32-wasi/crt1_shared.o" \ "$SYSROOT/lib/wasm32-wasi/lind_utils.o" \ -ldl -lwasi-emulated-signal -lwasi-emulated-getpid -lwasi-emulated-process-clocks -lpthread -lm diff --git a/curl/compile_curl.sh b/curl/compile_curl.sh index cdd36da1ec..88af97de7e 100755 --- a/curl/compile_curl.sh +++ b/curl/compile_curl.sh @@ -82,7 +82,6 @@ if [[ "$LIND_DYLINK" == "1" ]]; then fi DYLINK_CRT_OBJS=( - "$MERGED_SYSROOT/lib/wasm32-wasi/set_stack_pointer.o" "$MERGED_SYSROOT/lib/wasm32-wasi/crt1_shared.o" "$MERGED_SYSROOT/lib/wasm32-wasi/lind_utils.o" ) diff --git a/git/compile_git.sh b/git/compile_git.sh index 180921c3a2..29ad9abbe6 100755 --- a/git/compile_git.sh +++ b/git/compile_git.sh @@ -98,7 +98,6 @@ if [[ "$LIND_DYLINK" == "1" ]]; then fi DYLINK_CRT_OBJS=( - "$MERGED_SYSROOT/lib/wasm32-wasi/set_stack_pointer.o" "$MERGED_SYSROOT/lib/wasm32-wasi/crt1_shared.o" "$MERGED_SYSROOT/lib/wasm32-wasi/lind_utils.o" ) diff --git a/grep/compile_grep.sh b/grep/compile_grep.sh index 71c4d60a98..d82a38e0e2 100755 --- a/grep/compile_grep.sh +++ b/grep/compile_grep.sh @@ -82,7 +82,6 @@ if [[ "$LIND_DYLINK" == "1" ]]; then fi DYLINK_CRT_OBJS=( - "$MERGED_SYSROOT/lib/wasm32-wasi/set_stack_pointer.o" "$MERGED_SYSROOT/lib/wasm32-wasi/crt1_shared.o" "$MERGED_SYSROOT/lib/wasm32-wasi/lind_utils.o" ) diff --git a/lmbench/src/compile_lmbench.sh b/lmbench/src/compile_lmbench.sh index 4a4fed7d5e..f470a60530 100755 --- a/lmbench/src/compile_lmbench.sh +++ b/lmbench/src/compile_lmbench.sh @@ -209,7 +209,6 @@ if [[ "$LIND_DYLINK" == "1" ]]; then fi # Extra objects required for dynamic PIE executables DYLINK_CRT_OBJS=( - "$MERGED_SYSROOT/lib/wasm32-wasi/set_stack_pointer.o" "$MERGED_SYSROOT/lib/wasm32-wasi/crt1_shared.o" "$MERGED_SYSROOT/lib/wasm32-wasi/lind_utils.o" ) diff --git a/nginx/compile_nginx.sh b/nginx/compile_nginx.sh index c3bf0663a5..bac7c6eaed 100755 --- a/nginx/compile_nginx.sh +++ b/nginx/compile_nginx.sh @@ -126,7 +126,6 @@ if [[ "$LIND_DYLINK" == "1" ]]; then # Extra CRT objects required for dynamic PIE executables DYLINK_CRT_OBJS=( - "$MERGED_SYSROOT/lib/wasm32-wasi/set_stack_pointer.o" "$MERGED_SYSROOT/lib/wasm32-wasi/crt1_shared.o" "$MERGED_SYSROOT/lib/wasm32-wasi/lind_utils.o" ) diff --git a/postgres/compile_postgres.sh b/postgres/compile_postgres.sh index 35b67c6a07..42442f0786 100755 --- a/postgres/compile_postgres.sh +++ b/postgres/compile_postgres.sh @@ -121,7 +121,6 @@ if [[ "$LIND_DYLINK" == "1" ]]; then # Extra CRT objects required for dynamic PIE executables DYLINK_CRT_OBJS=( - "$MERGED_SYSROOT/lib/wasm32-wasi/set_stack_pointer.o" "$MERGED_SYSROOT/lib/wasm32-wasi/crt1_shared.o" "$MERGED_SYSROOT/lib/wasm32-wasi/lind_utils.o" )