From d0b639aedf54d9c22d4bad7c263d01fa08e262cf Mon Sep 17 00:00:00 2001 From: emaste Date: Sun, 8 Feb 2015 16:18:46 +0000 Subject: Use FreeBSD ProcessMonitor.h on FreeBSD There's an unfortunate layering issue between LLDB's Process/POSIX and Process/{FreeBSD,Linux}, exposed by a refactoring in upstream revision 218568. Work around it by adding explicit #if defined(__FreeBSD__) guards to include the correct header. --- contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/POSIXThread.cpp | 4 ++++ contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.cpp | 4 ++++ .../Process/POSIX/RegisterContextPOSIXProcessMonitor_arm64.cpp | 4 ++++ .../Process/POSIX/RegisterContextPOSIXProcessMonitor_mips64.cpp | 4 ++++ 4 files changed, 16 insertions(+) (limited to 'contrib/llvm/tools/lldb/source/Plugins/Process') diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/POSIXThread.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/POSIXThread.cpp index 1057585..e31f9fe 100644 --- a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/POSIXThread.cpp +++ b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/POSIXThread.cpp @@ -31,7 +31,11 @@ #include "POSIXThread.h" #include "ProcessPOSIX.h" #include "ProcessPOSIXLog.h" +#if defined(__FreeBSD__) +#include "Plugins/Process/FreeBSD/ProcessMonitor.h" +#else #include "Plugins/Process/Linux/ProcessMonitor.h" +#endif #include "RegisterContextPOSIXProcessMonitor_arm64.h" #include "RegisterContextPOSIXProcessMonitor_mips64.h" #include "RegisterContextPOSIXProcessMonitor_powerpc.h" diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.cpp index 0e5ab5a..94c318c 100644 --- a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.cpp +++ b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.cpp @@ -29,7 +29,11 @@ #include "ProcessPOSIX.h" #include "ProcessPOSIXLog.h" #include "Plugins/Process/Utility/InferiorCallPOSIX.h" +#if defined(__FreeBSD__) +#include "Plugins/Process/FreeBSD/ProcessMonitor.h" +#else #include "Plugins/Process/Linux/ProcessMonitor.h" +#endif #include "POSIXThread.h" using namespace lldb; diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_arm64.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_arm64.cpp index ec34d9e..06f2bd2 100644 --- a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_arm64.cpp +++ b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_arm64.cpp @@ -13,7 +13,11 @@ #include "Plugins/Process/Utility/RegisterContextPOSIX_arm64.h" #include "ProcessPOSIX.h" #include "RegisterContextPOSIXProcessMonitor_arm64.h" +#if defined(__FreeBSD__) +#include "Plugins/Process/FreeBSD/ProcessMonitor.h" +#else #include "Plugins/Process/Linux/ProcessMonitor.h" +#endif #define REG_CONTEXT_SIZE (GetGPRSize()) diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_mips64.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_mips64.cpp index 6717d20..f5be9ab 100644 --- a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_mips64.cpp +++ b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_mips64.cpp @@ -13,7 +13,11 @@ #include "Plugins/Process/Utility/RegisterContextPOSIX_mips64.h" #include "ProcessPOSIX.h" #include "RegisterContextPOSIXProcessMonitor_mips64.h" +#if defined(__FreeBSD__) +#include "Plugins/Process/FreeBSD/ProcessMonitor.h" +#else #include "Plugins/Process/Linux/ProcessMonitor.h" +#endif using namespace lldb_private; using namespace lldb; -- cgit v1.1