From 6bff543bd9ba0dfc0aa9b27375583975fe38e98e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Fri, 10 Aug 2018 22:09:35 +0300 Subject: [PATCH] Use libunwind's built-in SEH support instead of libgcc --- .dockerignore | 1 - .gitignore | 1 - build-libcxx.sh | 21 --------------------- 3 files changed, 23 deletions(-) diff --git a/.dockerignore b/.dockerignore index 0f60159..78b6a0f 100644 --- a/.dockerignore +++ b/.dockerignore @@ -5,7 +5,6 @@ libunwind libcxxabi libcxx libssp -libgcc *.exe *.dll *.lib diff --git a/.gitignore b/.gitignore index e9eca62..32b0a4b 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,3 @@ libunwind libcxxabi libcxx libssp -libgcc diff --git a/build-libcxx.sh b/build-libcxx.sh index ffb24a4..9a300ce 100755 --- a/build-libcxx.sh +++ b/build-libcxx.sh @@ -24,9 +24,6 @@ if [ ! -d libcxx ]; then git clone -b master https://github.com/llvm-mirror/libcxx.git CHECKOUT_LIBCXX=1 fi -if [ ! -d libgcc ]; then - svn checkout -q svn://gcc.gnu.org/svn/gcc/tags/gcc_7_3_0_release/libgcc -fi if [ -n "$SYNC" ] || [ -n "$CHECKOUT_LIBUNWIND" ]; then cd libunwind [ -z "$SYNC" ] || git fetch @@ -51,24 +48,6 @@ MERGE_ARCHIVES=$(pwd)/merge-archives.sh cd libunwind for arch in $ARCHS; do - if $arch-w64-mingw32-clang -E -dM - < /dev/null 2>/dev/null | grep -q __SEH__; then - cd ../libgcc - mkdir -p build-$arch - cd build-$arch - rm -f *.h - cp ../unwind-seh.c . - cp ../unwind-generic.h unwind.h - touch tconfig.h - touch tsystem.h - touch coretypes.h - touch tm.h - echo "#define ATTRIBUTE_UNUSED __attribute__ ((__unused__))" >> tconfig.h - $arch-w64-mingw32-clang -O2 -Wall -c unwind-seh.c -o unwind-seh.o - llvm-ar rcs libunwind.a unwind-seh.o - cp libunwind.a $PREFIX/$arch-w64-mingw32/lib - cd ../../libunwind - continue - fi mkdir -p build-$arch cd build-$arch # If llvm-config and the llvm cmake files are available, -w gets added