diff options
| -rw-r--r-- | lib/System/Makefile | 5 | ||||
| -rw-r--r-- | lib/System/Win32/Signals.inc | 7 |
2 files changed, 1 insertions, 11 deletions
diff --git a/lib/System/Makefile b/lib/System/Makefile index bb013b9f1f..5d4fda923f 100644 --- a/lib/System/Makefile +++ b/lib/System/Makefile @@ -11,11 +11,6 @@ LEVEL = ../.. LIBRARYNAME = LLVMSystem BUILD_ARCHIVE = 1 REQUIRES_RTTI = 1 -include $(LEVEL)/Makefile.config - -ifeq ($(HOST_OS),MingW) - REQUIRES_EH := 1 -endif EXTRA_DIST = Unix Win32 README.txt diff --git a/lib/System/Win32/Signals.inc b/lib/System/Win32/Signals.inc index 8f880f7fdf..3f33d89a03 100644 --- a/lib/System/Win32/Signals.inc +++ b/lib/System/Win32/Signals.inc @@ -208,8 +208,7 @@ void llvm::sys::RunInterruptHandlers() { } static LONG WINAPI LLVMUnhandledExceptionFilter(LPEXCEPTION_POINTERS ep) { - try { - Cleanup(); + Cleanup(); #ifdef _WIN64 // TODO: provide a x64 friendly version of the following @@ -291,10 +290,6 @@ static LONG WINAPI LLVMUnhandledExceptionFilter(LPEXCEPTION_POINTERS ep) { #endif - } catch (...) { - assert(0 && "Crashed in LLVMUnhandledExceptionFilter"); - } - if (ExitOnUnhandledExceptions) _exit(-3); |