Modify make sysroot script

Add debug patch.

Author: 123R3N321

.github/workflows/libcpp.yml

@@ -14,7 +14,7 @@ jobs:
     env:
       OUTPUT_LOCAL_DIR: libcpp-output
       STATUS_FILE: libcpp_status
-      WASM_FILE_NAME: hello.wasm
+      WASM_FILE_NAME: hello.cpp.wasm
 
     steps:
       - name: Set up Docker Buildx

scripts/make_glibc_and_sysroot.sh

@@ -7,7 +7,7 @@
 # - expects `clang` and other llvm binaries on $PATH
 # - expects GLIBC source in $PWD/src/glibc
 #
-set -x
+set -euxo pipefail
 
 CC="clang"
 GLIBC="$PWD/src/glibc"
@@ -61,91 +61,80 @@ INCLUDE_PATHS="
     -I.
 "
 
-
 RESOURCE_DIR="$(clang --target=wasm32-unknown-wasi -print-resource-dir)"
 SYS_INCLUDE="-nostdinc -isystem ${RESOURCE_DIR}/include -isystem /usr/i686-linux-gnu/include"
 
-#SYS_INCLUDE="-nostdinc -isystem $CLANG/lib/clang/18/include -isystem /usr/i686-linux-gnu/include"
 DEFINES="-D_LIBC_REENTRANT -include $BUILD/libc-modules.h -DMODULE_NAME=libc"
 EXTRA_DEFINES="-include ../include/libc-symbols.h -DPIC -DTOP_NAMESPACE=glibc"
 
-# Check if LIND_DEBUG is defined (set by build.rs when `lind_debug` is enabled)
-if [ "$LIND_DEBUG" ]; then
+if [ "${LIND_DEBUG:-}" ]; then
   DEFINES="$DEFINES -DLIND_DEBUG"
 fi
 
-# Build glibc
-rm -rf $BUILD
-mkdir -p $BUILD
-cd $BUILD
+rm -rf "$BUILD"
+mkdir -p "$BUILD"
+cd "$BUILD"
 
 ../configure \
   --disable-werror \
   --disable-hidden-plt \
   --disable-profile \
   --disable-nscd \
   --with-headers=/usr/i686-linux-gnu/include \
-  --prefix=$GLIBC/target \
+  --prefix="$GLIBC/target" \
   --host=i686-linux-gnu \
   --build=i686-linux-gnu \
   libc_cv_complocaledir='/usr/lib/locale' \
   CFLAGS=" -matomics -mbulk-memory -O2 -g" \
   CC="clang --target=wasm32-unknown-wasi -v -Wno-int-conversion"
 
-make -j$(($(nproc) * 2)) --keep-going 2>&1 THREAD_MODEL=posix | tee check.log
+make -j1 THREAD_MODEL=posix 2>&1 | tee check.log
+
+[ -f "$BUILD/libc-modules.h" ] || { echo "ERROR: $BUILD/libc-modules.h missing after glibc build"; exit 1; }
 
-# Build extra
 cd ../nptl
 $CC $CFLAGS $WARNINGS $EXTRA_FLAGS \
     $INCLUDE_PATHS $SYS_INCLUDE $DEFINES $EXTRA_DEFINES \
     -o $BUILD/nptl/pthread_create.o \
     -c pthread_create.c -MD -MP -MF $BUILD/nptl/pthread_create.o.dt \
     -MT $BUILD/nptl/pthread_create.o
 
-# Compile lind_syscall.c, which contains the make_threei, register_handler, 
-# and copy_data_between_cages functions
 $CC $CFLAGS $WARNINGS $EXTRA_FLAGS \
     $INCLUDE_PATHS $SYS_INCLUDE $DEFINES $EXTRA_DEFINES \
     -o $BUILD/lind_syscall.o \
     -c $GLIBC/lind_syscall/lind_syscall.c
 
-# Compile address translation module
 $CC $CFLAGS $WARNINGS $EXTRA_FLAGS \
     $INCLUDE_PATHS $SYS_INCLUDE $DEFINES $EXTRA_DEFINES \
     -o $BUILD/addr_translation.o \
     -c $GLIBC/lind_syscall/addr_translation.c
-    
-# Compile lind debug module
+
 $CC $CFLAGS $WARNINGS $EXTRA_FLAGS \
     $INCLUDE_PATHS $SYS_INCLUDE $DEFINES $EXTRA_DEFINES \
     -o $BUILD/lind_debug.o \
     -c $GLIBC/lind_syscall/lind_debug.c
 
-# Compile crt1.c
 $CC $CFLAGS $WARNINGS $EXTRA_FLAGS \
     $INCLUDE_PATHS $SYS_INCLUDE $DEFINES $EXTRA_DEFINES \
     -o $GLIBC/lind_syscall/crt1.o \
-    -c $GLIBC/lind_syscall/crt1/crt1.c \
- || { echo "ERROR: clang failed compiling crt1.c"; exit 1; }
- [ -f "$GLIBC/lind_syscall/crt1.o" ] || { echo "ERROR: $GLIBC/lind_syscall/crt1.o not produced"; exit 1; }
+    -c $GLIBC/lind_syscall/crt1/crt1.c
+
+[ -f "$GLIBC/lind_syscall/crt1.o" ] || { echo "ERROR: $GLIBC/lind_syscall/crt1.o not produced"; exit 1; }
 
-# Compile elision-lock.c
 $CC $CFLAGS $WARNINGS $EXTRA_FLAGS \
     $INCLUDE_PATHS $SYS_INCLUDE $DEFINES $EXTRA_DEFINES \
     -o $GLIBC/build/nptl/elision-lock.o \
     -c $GLIBC/sysdeps/unix/sysv/linux/x86/elision-lock.c \
     -MD -MP -MF $GLIBC/build/nptl/elision-lock.o.dt \
     -MT $GLIBC/build/nptl/elision-lock.o
 
-# Compile elision-unlock.c
 $CC $CFLAGS $WARNINGS $EXTRA_FLAGS \
     $INCLUDE_PATHS $SYS_INCLUDE $DEFINES $EXTRA_DEFINES \
     -o $GLIBC/build/nptl/elision-unlock.o \
     -c $GLIBC/sysdeps/unix/sysv/linux/x86/elision-unlock.c \
     -MD -MP -MF $GLIBC/build/nptl/elision-unlock.o.dt \
     -MT $GLIBC/build/nptl/elision-unlock.o
 
-# Compile assembly files
 cd ../
 $CC --target=wasm32-wasi-threads -matomics \
     -o $BUILD/csu/wasi_thread_start.o \
@@ -155,19 +144,11 @@ $CC --target=wasm32-wasi-threads -matomics \
     -o $BUILD/csu/set_stack_pointer.o \
     -c $GLIBC/csu/wasm32/set_stack_pointer.s
 
-# Generate sysroot
-# First, remove the existing sysroot directory to start cleanly
 rm -rf "$SYSROOT"
-
-
-# Create the sysroot directory structure
 mkdir -p "$SYSROOT/include/wasm32-wasi" "$SYSROOT/lib/wasm32-wasi"
 
 "$SCRIPT_DIR/make_archive.sh"
 
-# Copy all files from the external include directory to the new sysroot include directory
 cp -r "$GLIBC/target/include/"* "$SYSROOT/include/wasm32-wasi/"
-
-# Copy the crt1.o file into the new sysroot lib directory
 cp "$GLIBC/lind_syscall/crt1.o" "$SYSROOT/lib/wasm32-wasi/"
-cp "$GLIBC/lind_syscall/lind_syscall.h" "$SYSROOT/include/wasm32-wasi/"
+cp "$GLIBC/lind_syscall/lind_syscall.h" "$SYSROOT/include/wasm32-wasi/"