Author: mstorsjo Date: Sat Sep 21 12:09:49 2019 New Revision: 372483 URL: http://llvm.org/viewvc/llvm-project?rev=372483&view=rev Log: [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 Modified: lldb/trunk/source/Plugins/Process/Windows/Common/RegisterContextWindows.cpp lldb/trunk/source/Plugins/Process/Windows/Common/TargetThreadWindows.cpp Modified: lldb/trunk/source/Plugins/Process/Windows/Common/RegisterContextWindows.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Windows/Common/RegisterContextWindows.cpp?rev=372483&r1=372482&r2=372483&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/Windows/Common/RegisterContextWindows.cpp (original) +++ lldb/trunk/source/Plugins/Process/Windows/Common/RegisterContextWindows.cpp Sat Sep 21 12:09:49 2019 @@ -84,7 +84,7 @@ bool RegisterContextWindows::AddHardware case 1: case 2: case 4: -#if defined(_M_AMD64) +#if defined(__x86_64__) || defined(_M_AMD64) case 8: #endif break; Modified: lldb/trunk/source/Plugins/Process/Windows/Common/TargetThreadWindows.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Windows/Common/TargetThreadWindows.cpp?rev=372483&r1=372482&r2=372483&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/Windows/Common/TargetThreadWindows.cpp (original) +++ lldb/trunk/source/Plugins/Process/Windows/Common/TargetThreadWindows.cpp Sat Sep 21 12:09:49 2019 @@ -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::CreateRegisterConte 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::CreateRegisterConte 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 _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
