diff options
| author | Martin Storsjo <martin@martin.st> | 2019-09-21 19:09:49 +0000 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2019-09-21 19:09:49 +0000 |
| commit | 2e25c44dc3fa97defe03e4b5d813344577d6b5fb (patch) | |
| tree | 2e5d1bdef5ac62d4d97ecb8a5877a896c548689c | |
| parent | f4deacf995c73045a2172f35cbaf289fa97e7abc (diff) | |
| download | bcm5719-llvm-2e25c44dc3fa97defe03e4b5d813344577d6b5fb.tar.gz bcm5719-llvm-2e25c44dc3fa97defe03e4b5d813344577d6b5fb.zip | |
[LLDB] Check for the GCC/MinGW compatible arch defines for windows, in addition to MSVC defines
This matches how it is done in all other similar ifdefs throughout
lldb.
Differential Revision: https://reviews.llvm.org/D67858
llvm-svn: 372483
| -rw-r--r-- | lldb/source/Plugins/Process/Windows/Common/RegisterContextWindows.cpp | 2 | ||||
| -rw-r--r-- | lldb/source/Plugins/Process/Windows/Common/TargetThreadWindows.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lldb/source/Plugins/Process/Windows/Common/RegisterContextWindows.cpp b/lldb/source/Plugins/Process/Windows/Common/RegisterContextWindows.cpp index 597673b8522..51137fecce3 100644 --- a/lldb/source/Plugins/Process/Windows/Common/RegisterContextWindows.cpp +++ b/lldb/source/Plugins/Process/Windows/Common/RegisterContextWindows.cpp @@ -84,7 +84,7 @@ bool RegisterContextWindows::AddHardwareBreakpoint(uint32_t slot, case 1: case 2: case 4: -#if defined(_M_AMD64) +#if defined(__x86_64__) || defined(_M_AMD64) case 8: #endif break; diff --git a/lldb/source/Plugins/Process/Windows/Common/TargetThreadWindows.cpp b/lldb/source/Plugins/Process/Windows/Common/TargetThreadWindows.cpp index 0af0b56925b..8fca982da14 100644 --- a/lldb/source/Plugins/Process/Windows/Common/TargetThreadWindows.cpp +++ b/lldb/source/Plugins/Process/Windows/Common/TargetThreadWindows.cpp @@ -21,9 +21,9 @@ #include "TargetThreadWindows.h" // TODO support _M_ARM and _M_ARM64 -#if defined(_M_AMD64) +#if defined(__x86_64__) || defined(_M_AMD64) #include "x64/RegisterContextWindows_x64.h" -#elif defined(_M_IX86) +#elif defined(__i386__) || defined(_M_IX86) #include "x86/RegisterContextWindows_x86.h" #endif @@ -77,7 +77,7 @@ TargetThreadWindows::CreateRegisterContextForFrame(StackFrame *frame) { break; case llvm::Triple::x86: -#if defined(_M_IX86) +#if defined(__i386__) || defined(_M_IX86) m_thread_reg_ctx_sp.reset( new RegisterContextWindows_x86(*this, concrete_frame_idx)); #else @@ -86,7 +86,7 @@ TargetThreadWindows::CreateRegisterContextForFrame(StackFrame *frame) { break; case llvm::Triple::x86_64: -#if defined(_M_AMD64) +#if defined(__x86_64__) || defined(_M_AMD64) m_thread_reg_ctx_sp.reset( new RegisterContextWindows_x64(*this, concrete_frame_idx)); #else |
