Import LLDB as of upstream SVN r216948 (git 50f7fe44)

This corresponds with the branchpoint for the 3.5 release.
A number of files not required for the FreeBSD build have been removed.

Sponsored by:	DARPA, AFRL

1 files changed, 5 insertions, 10 deletions

diff --git a/source/Target/ThreadPlan.cpp b/source/Target/ThreadPlan.cpp
index 65d51bd..2c9b7fc 100644
--- a/source/Target/ThreadPlan.cpp
+++ b/source/Target/ThreadPlan.cpp
@@ -161,16 +161,11 @@ ThreadPlan::WillResume (StateType resume_state, bool current_plan)
             addr_t fp = reg_ctx->GetFP();
             log->Printf("%s Thread #%u (0x%p): tid = 0x%4.4" PRIx64 ", pc = 0x%8.8" PRIx64 ", sp = 0x%8.8" PRIx64 ", fp = 0x%8.8" PRIx64 ", "
                         "plan = '%s', state = %s, stop others = %d", 
-                        __FUNCTION__,
-                        m_thread.GetIndexID(),
-                        &m_thread,
-                        m_thread.GetID(),  
-                        (uint64_t)pc,
-                        (uint64_t)sp,
-                        (uint64_t)fp,
-                        m_name.c_str(), 
-                        StateAsCString(resume_state), 
-                        StopOthers());
+                        __FUNCTION__, m_thread.GetIndexID(),
+                        static_cast<void*>(&m_thread), m_thread.GetID(),
+                        static_cast<uint64_t>(pc), static_cast<uint64_t>(sp),
+                        static_cast<uint64_t>(fp), m_name.c_str(),
+                        StateAsCString(resume_state), StopOthers());
         }
     }
     return DoWillResume (resume_state, current_plan);