diff options
| author | Zachary Turner <zturner@google.com> | 2014-07-01 00:18:46 +0000 |
|---|---|---|
| committer | Zachary Turner <zturner@google.com> | 2014-07-01 00:18:46 +0000 |
| commit | 0ec7baa9f40eb48b9c74fcb3c2194306e3a82c54 (patch) | |
| tree | c7dd882ae6b2fdc70f6ec74d412d51c67de85e0f | |
| parent | 4f5e9f8207e6110472df5a378be99e5cd21ba1b4 (diff) | |
| download | bcm5719-llvm-0ec7baa9f40eb48b9c74fcb3c2194306e3a82c54.tar.gz bcm5719-llvm-0ec7baa9f40eb48b9c74fcb3c2194306e3a82c54.zip | |
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.
llvm-svn: 212076
| -rw-r--r-- | lldb/include/lldb/Host/msvc/Config.h | 5 | ||||
| -rw-r--r-- | lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/lldb/include/lldb/Host/msvc/Config.h b/lldb/include/lldb/Host/msvc/Config.h index cdf6f21e098..bdf404c4f46 100644 --- a/lldb/include/lldb/Host/msvc/Config.h +++ b/lldb/include/lldb/Host/msvc/Config.h @@ -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_ diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp index e59cf34f8e3..9275ddcda1b 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp @@ -9,6 +9,8 @@ #include <errno.h> +#include "lldb/Host/Config.h" + #include "GDBRemoteCommunicationServer.h" #include "lldb/Core/StreamGDBRemote.h" |
