fix catching exceptions

host/bin/prospero-clang++

@@ -22,7 +22,12 @@ SCRIPT_DIR="$(dirname "${SCRIPT_PATH}")"
 PS5_PAYLOAD_SDK="$(realpath "${SCRIPT_DIR}/..")"
 
 LIBS_C="-lSceLibcInternal -lScePosixForWebKit -lc"
-LIBS_CXX="-lc++ -lc++abi -lunwind"
+
+LIBS_CXX="-lc++"
+LIBS_CXX="$LIBS_CXX -Wl,--whole-archive"
+LIBS_CXX="$LIBS_CXX -lunwind -lc++abi"
+LIBS_CXX="$LIBS_CXX -Wl,--no-whole-archive"
+
 for ARG in "$@"; do
     if [[ "$ARG" == "-c" || "$ARG" == "-nostdlib" ]]; then
 	LIBS_C=""
@@ -35,6 +40,7 @@ done
 
 # ensure clang++ knows where prospero-lld is at
 export PATH=${SCRIPT_DIR}:$PATH
+
 exec -a "${SCRIPT_NAME}" "${SCRIPT_DIR}/clang++" \
      -target x86_64-sie-ps5 \
      -isysroot "${PS5_PAYLOAD_SDK}" \

host/bin/prospero-lld

@@ -34,7 +34,7 @@ done
 
 BIN_PATH="${LLVM_BINDIR}/ld.lld"
 exec "${BIN_PATH}" \
-     -pie \
+     -pie --eh-frame-hdr \
      -z max-page-size=0x4000 \
      -T "${PS5_PAYLOAD_SDK}/ldscripts/elf_x86_64.x" \
      -L "${PS5_PAYLOAD_SDK}/target/lib" \

libcxx.sh

@@ -41,12 +41,13 @@ ${CMAKE} -S $TEMPDIR/llvm-project-$LLVM_VER.src/runtimes \
 	 -DLIBCXX_ENABLE_STATIC=YES \
 	 -DLIBCXX_ENABLE_RTTI=YES \
 	 -DLIBCXX_ENABLE_EXCEPTIONS=YES \
+	 -DLIBCXX_ENABLE_THREADS=YES \
 	 -DLIBCXX_ENABLE_SHARED=NO \
 	 -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=NO \
 	 -DLIBCXX_CXX_ABI=libcxxabi \
 	 -DLIBCXXABI_ENABLE_STATIC=YES \
 	 -DLIBCXXABI_ENABLE_EXCEPTIONS=YES \
-	 -DLIBCXXABI_ENABLE_THREADS=YES \
+	 -DLIBCXXABI_ENABLE_THREADS=NO \
 	 -DLIBCXXABI_USE_LLVM_UNWINDER=YES \
 	 -DLIBCXXABI_ENABLE_SHARED=NO \
 	 -DLIBCXXABI_USE_COMPILER_RT=NO \

samples/hello_cxx/main.cpp

@@ -31,6 +31,12 @@ void task(string prefix) {
     cout << n << " ";
   }
   cout << endl;
+
+  try {
+    throw int(42);
+  } catch(int e) {
+    cout << "Caught exception: " << e << endl;
+  }
 }