From a8bbe707dc0c397d4020e7348fda64b3cb2a0e21 Mon Sep 17 00:00:00 2001 From: NAKAMURA Takumi Date: Wed, 6 Oct 2010 02:15:22 +0000 Subject: [PATCH] lib/System/Win32/Signals.inc: Enable LLVM_DISABLE_CRT_DEBUG also on mingw. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@115731 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/System/Win32/Signals.inc | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/System/Win32/Signals.inc b/lib/System/Win32/Signals.inc index 2498a26ea99..616bb29a6ec 100644 --- a/lib/System/Win32/Signals.inc +++ b/lib/System/Win32/Signals.inc @@ -43,9 +43,7 @@ static std::vector *FilesToRemove = NULL; static std::vector > *CallBacksToRun = 0; static bool RegisteredUnhandledExceptionFilter = false; static bool CleanupExecuted = false; -#ifdef _MSC_VER static bool ExitOnUnhandledExceptions = false; -#endif static PTOP_LEVEL_EXCEPTION_FILTER OldFilter = NULL; // Windows creates a new thread to execute the console handler when an event @@ -110,12 +108,12 @@ static void RegisterHandler() { SetConsoleCtrlHandler(LLVMConsoleCtrlHandler, TRUE); // Environment variable to disable any kind of crash dialog. -#ifdef _MSC_VER if (getenv("LLVM_DISABLE_CRT_DEBUG")) { +#ifdef _MSC_VER _CrtSetReportHook(CRTReportHook); +#endif ExitOnUnhandledExceptions = true; } -#endif // IMPORTANT NOTE: Caller must call LeaveCriticalSection(&CriticalSection) or // else multi-threading problems will ensue. @@ -295,10 +293,8 @@ static LONG WINAPI LLVMUnhandledExceptionFilter(LPEXCEPTION_POINTERS ep) { assert(0 && "Crashed in LLVMUnhandledExceptionFilter"); } -#ifdef _MSC_VER if (ExitOnUnhandledExceptions) _exit(-3); -#endif // Allow dialog box to pop up allowing choice to start debugger. if (OldFilter)