[Lldb-commits] [PATCH] D67858: [LLDB] Check for the GCC/MinGW compatible arch defines for windows, in addition to MSVC defines
This revision was automatically updated to reflect the committed changes. Closed by commit rL372483: [LLDB] Check for the GCC/MinGW compatible arch defines for windows, in addition… (authored by mstorsjo, committed by ). Herald added a project: LLVM. Herald added a subscriber: llvm-commits. Changed prior to commit: https://reviews.llvm.org/D67858?vs=221102=221193#toc Repository: rL LLVM CHANGES SINCE LAST ACTION https://reviews.llvm.org/D67858/new/ https://reviews.llvm.org/D67858 Files: lldb/trunk/source/Plugins/Process/Windows/Common/RegisterContextWindows.cpp lldb/trunk/source/Plugins/Process/Windows/Common/TargetThreadWindows.cpp Index: lldb/trunk/source/Plugins/Process/Windows/Common/RegisterContextWindows.cpp === --- lldb/trunk/source/Plugins/Process/Windows/Common/RegisterContextWindows.cpp +++ lldb/trunk/source/Plugins/Process/Windows/Common/RegisterContextWindows.cpp @@ -84,7 +84,7 @@ case 1: case 2: case 4: -#if defined(_M_AMD64) +#if defined(__x86_64__) || defined(_M_AMD64) case 8: #endif break; Index: lldb/trunk/source/Plugins/Process/Windows/Common/TargetThreadWindows.cpp === --- lldb/trunk/source/Plugins/Process/Windows/Common/TargetThreadWindows.cpp +++ lldb/trunk/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 @@ 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 @@ 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 Index: lldb/trunk/source/Plugins/Process/Windows/Common/RegisterContextWindows.cpp === --- lldb/trunk/source/Plugins/Process/Windows/Common/RegisterContextWindows.cpp +++ lldb/trunk/source/Plugins/Process/Windows/Common/RegisterContextWindows.cpp @@ -84,7 +84,7 @@ case 1: case 2: case 4: -#if defined(_M_AMD64) +#if defined(__x86_64__) || defined(_M_AMD64) case 8: #endif break; Index: lldb/trunk/source/Plugins/Process/Windows/Common/TargetThreadWindows.cpp === --- lldb/trunk/source/Plugins/Process/Windows/Common/TargetThreadWindows.cpp +++ lldb/trunk/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 @@ 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 @@ 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
[Lldb-commits] [PATCH] D67858: [LLDB] Check for the GCC/MinGW compatible arch defines for windows, in addition to MSVC defines
mstorsjo created this revision. mstorsjo added reviewers: compnerd, hhb, labath. Herald added subscribers: JDevlieghere, abidh. Herald added a project: LLDB. This matches how it is done in all other similar ifdefs throughout lldb (modulo inconsistencies between `_M_AMD64` and `_M_X64`); both MSVC and GCC style arch defines are checked together. Repository: rLLDB LLDB https://reviews.llvm.org/D67858 Files: lldb/source/Plugins/Process/Windows/Common/RegisterContextWindows.cpp lldb/source/Plugins/Process/Windows/Common/TargetThreadWindows.cpp Index: lldb/source/Plugins/Process/Windows/Common/TargetThreadWindows.cpp === --- lldb/source/Plugins/Process/Windows/Common/TargetThreadWindows.cpp +++ 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 @@ 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 @@ 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 Index: lldb/source/Plugins/Process/Windows/Common/RegisterContextWindows.cpp === --- lldb/source/Plugins/Process/Windows/Common/RegisterContextWindows.cpp +++ lldb/source/Plugins/Process/Windows/Common/RegisterContextWindows.cpp @@ -84,7 +84,7 @@ case 1: case 2: case 4: -#if defined(_M_AMD64) +#if defined(__x86_64__) || defined(_M_AMD64) case 8: #endif break; Index: lldb/source/Plugins/Process/Windows/Common/TargetThreadWindows.cpp === --- lldb/source/Plugins/Process/Windows/Common/TargetThreadWindows.cpp +++ 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 @@ 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 @@ 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 Index: lldb/source/Plugins/Process/Windows/Common/RegisterContextWindows.cpp === --- lldb/source/Plugins/Process/Windows/Common/RegisterContextWindows.cpp +++ lldb/source/Plugins/Process/Windows/Common/RegisterContextWindows.cpp @@ -84,7 +84,7 @@ case 1: case 2: case 4: -#if defined(_M_AMD64) +#if defined(__x86_64__) || defined(_M_AMD64) case 8: #endif break; ___ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
