Date: Sun, 8 Feb 2015 16:18:47 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r278386 - projects/clang360-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX Message-ID: <201502081618.t18GIlkj064854@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: emaste Date: Sun Feb 8 16:18:46 2015 New Revision: 278386 URL: https://svnweb.freebsd.org/changeset/base/278386 Log: 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. Modified: projects/clang360-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/POSIXThread.cpp projects/clang360-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.cpp projects/clang360-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_arm64.cpp projects/clang360-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_mips64.cpp Modified: projects/clang360-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/POSIXThread.cpp ============================================================================== --- projects/clang360-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/POSIXThread.cpp Sun Feb 8 16:01:12 2015 (r278385) +++ projects/clang360-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/POSIXThread.cpp Sun Feb 8 16:18:46 2015 (r278386) @@ -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" Modified: projects/clang360-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.cpp ============================================================================== --- projects/clang360-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.cpp Sun Feb 8 16:01:12 2015 (r278385) +++ projects/clang360-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.cpp Sun Feb 8 16:18:46 2015 (r278386) @@ -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; Modified: projects/clang360-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_arm64.cpp ============================================================================== --- projects/clang360-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_arm64.cpp Sun Feb 8 16:01:12 2015 (r278385) +++ projects/clang360-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_arm64.cpp Sun Feb 8 16:18:46 2015 (r278386) @@ -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()) Modified: projects/clang360-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_mips64.cpp ============================================================================== --- projects/clang360-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_mips64.cpp Sun Feb 8 16:01:12 2015 (r278385) +++ projects/clang360-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_mips64.cpp Sun Feb 8 16:18:46 2015 (r278386) @@ -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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502081618.t18GIlkj064854>