[Lldb-commits] [lldb] r212076 - Fix Windows build after llgs upstream.

[Zachary Turner]

Author: zturner
Date: Mon Jun 30 19:18:46 2014
New Revision: 212076

URL: http://llvm.org/viewvc/llvm-project?rev=212076&view=rev
Log:
Fix Windows build after llgs upstream.

With _HAS_EXCEPTIONS=0, Windows' version of <thread> will fail to
compile because it calls __uncaught_exception(), which is compiled
out due to _HAS_EXCEPTIONS=0.  This just creates a stub version
of __uncaught_exception() which always fails.

Modified:
    lldb/trunk/include/lldb/Host/msvc/Config.h
    lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp

Modified: lldb/trunk/include/lldb/Host/msvc/Config.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Host/msvc/Config.h?rev=212076&r1=212075&r2=212076&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Host/msvc/Config.h (original)
+++ lldb/trunk/include/lldb/Host/msvc/Config.h Mon Jun 30 19:18:46 2014
@@ -27,4 +27,9 @@
 
 //#define LLDB_CONFIG_FCNTL_GETPATH_SUPPORTED 1
 
+#if _HAS_EXCEPTIONS == 0
+// Exceptions are disabled so this isn't defined, but concrt assumes it is.
+static void *__uncaught_exception() { return nullptr; }
+#endif
+
 #endif // #ifndef liblldb_Platform_Config_h_

Modified: lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp?rev=212076&r1=212075&r2=212076&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp (original)
+++ lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp Mon Jun 30 19:18:46 2014
@@ -9,6 +9,8 @@
 
 #include <errno.h>
 
+#include "lldb/Host/Config.h"
+
 #include "GDBRemoteCommunicationServer.h"
 #include "lldb/Core/StreamGDBRemote.h"