summaryrefslogtreecommitdiffstats
path: root/lldb/source/Target
diff options
context:
space:
mode:
Diffstat (limited to 'lldb/source/Target')
-rw-r--r--lldb/source/Target/FileAction.cpp5
-rw-r--r--lldb/source/Target/PathMappingList.cpp1
-rw-r--r--lldb/source/Target/Platform.cpp6
-rw-r--r--lldb/source/Target/ProcessInfo.cpp5
-rw-r--r--lldb/source/Target/Target.cpp2
-rw-r--r--lldb/source/Target/TargetList.cpp2
-rw-r--r--lldb/source/Target/ThreadPlan.cpp24
-rw-r--r--lldb/source/Target/ThreadPlanPython.cpp12
8 files changed, 28 insertions, 29 deletions
diff --git a/lldb/source/Target/FileAction.cpp b/lldb/source/Target/FileAction.cpp
index 21c37e8e6f8..06d0529fe3e 100644
--- a/lldb/source/Target/FileAction.cpp
+++ b/lldb/source/Target/FileAction.cpp
@@ -9,11 +9,8 @@
#include <fcntl.h>
-#if defined(_WIN32)
-#include "lldb/Host/Windows/win32.h" // For O_NOCTTY
-#endif
-
#include "lldb/Core/Stream.h"
+#include "lldb/Host/PosixApi.h"
#include "lldb/Target/FileAction.h"
using namespace lldb_private;
diff --git a/lldb/source/Target/PathMappingList.cpp b/lldb/source/Target/PathMappingList.cpp
index 2372c2f9dd9..7bb86d9d895 100644
--- a/lldb/source/Target/PathMappingList.cpp
+++ b/lldb/source/Target/PathMappingList.cpp
@@ -17,6 +17,7 @@
#include "lldb/Core/Error.h"
#include "lldb/Core/Stream.h"
#include "lldb/Host/FileSpec.h"
+#include "lldb/Host/PosixApi.h"
#include "lldb/Target/PathMappingList.h"
using namespace lldb;
diff --git a/lldb/source/Target/Platform.cpp b/lldb/source/Target/Platform.cpp
index f537f70452f..8236a66691c 100644
--- a/lldb/source/Target/Platform.cpp
+++ b/lldb/source/Target/Platform.cpp
@@ -914,7 +914,7 @@ Platform::MakeDirectory(const FileSpec &file_spec, uint32_t permissions)
else
{
Error error;
- error.SetErrorStringWithFormat("remote platform %s doesn't support %s", GetPluginName().GetCString(), __PRETTY_FUNCTION__);
+ error.SetErrorStringWithFormat("remote platform %s doesn't support %s", GetPluginName().GetCString(), LLVM_PRETTY_FUNCTION);
return error;
}
}
@@ -927,7 +927,7 @@ Platform::GetFilePermissions(const FileSpec &file_spec, uint32_t &file_permissio
else
{
Error error;
- error.SetErrorStringWithFormat("remote platform %s doesn't support %s", GetPluginName().GetCString(), __PRETTY_FUNCTION__);
+ error.SetErrorStringWithFormat("remote platform %s doesn't support %s", GetPluginName().GetCString(), LLVM_PRETTY_FUNCTION);
return error;
}
}
@@ -940,7 +940,7 @@ Platform::SetFilePermissions(const FileSpec &file_spec, uint32_t file_permission
else
{
Error error;
- error.SetErrorStringWithFormat("remote platform %s doesn't support %s", GetPluginName().GetCString(), __PRETTY_FUNCTION__);
+ error.SetErrorStringWithFormat("remote platform %s doesn't support %s", GetPluginName().GetCString(), LLVM_PRETTY_FUNCTION);
return error;
}
}
diff --git a/lldb/source/Target/ProcessInfo.cpp b/lldb/source/Target/ProcessInfo.cpp
index 214db9ed3d4..b57fd23ea2e 100644
--- a/lldb/source/Target/ProcessInfo.cpp
+++ b/lldb/source/Target/ProcessInfo.cpp
@@ -7,15 +7,16 @@
//
//===----------------------------------------------------------------------===//
+#include "lldb/Target/ProcessInfo.h"
+
// C Includes
// C++ Includes
#include <climits>
// Other libraries and framework includes
// Project includes
-#include "lldb/Target/ProcessInfo.h"
-
#include "lldb/Core/Stream.h"
+#include "lldb/Host/PosixApi.h"
using namespace lldb;
using namespace lldb_private;
diff --git a/lldb/source/Target/Target.cpp b/lldb/source/Target/Target.cpp
index f53e66a7ea0..ead555a757e 100644
--- a/lldb/source/Target/Target.cpp
+++ b/lldb/source/Target/Target.cpp
@@ -1239,7 +1239,7 @@ Target::SetExecutableModule (ModuleSP& executable_sp, bool get_dependent_files)
if (executable_sp)
{
- Timer scoped_timer (__PRETTY_FUNCTION__,
+ Timer scoped_timer (LLVM_PRETTY_FUNCTION,
"Target::SetExecutableModule (executable = '%s')",
executable_sp->GetFileSpec().GetPath().c_str());
diff --git a/lldb/source/Target/TargetList.cpp b/lldb/source/Target/TargetList.cpp
index 34954467691..6e7577206af 100644
--- a/lldb/source/Target/TargetList.cpp
+++ b/lldb/source/Target/TargetList.cpp
@@ -386,7 +386,7 @@ TargetList::CreateTargetInternal (Debugger &debugger,
lldb::TargetSP &target_sp,
bool is_dummy_target)
{
- Timer scoped_timer (__PRETTY_FUNCTION__,
+ Timer scoped_timer (LLVM_PRETTY_FUNCTION,
"TargetList::CreateTarget (file = '%s', arch = '%s')",
user_exe_path,
specified_arch.GetArchitectureName());
diff --git a/lldb/source/Target/ThreadPlan.cpp b/lldb/source/Target/ThreadPlan.cpp
index bf9a05497c7..f86d10dca34 100644
--- a/lldb/source/Target/ThreadPlan.cpp
+++ b/lldb/source/Target/ThreadPlan.cpp
@@ -241,14 +241,14 @@ ThreadPlanNull::ValidatePlan (Stream *error)
{
#ifdef LLDB_CONFIGURATION_DEBUG
fprintf(stderr, "error: %s called on thread that has been destroyed (tid = 0x%" PRIx64 ", ptid = 0x%" PRIx64 ")",
- __PRETTY_FUNCTION__,
+ LLVM_PRETTY_FUNCTION,
m_thread.GetID(),
m_thread.GetProtocolID());
#else
Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_THREAD));
if (log)
log->Error("%s called on thread that has been destroyed (tid = 0x%" PRIx64 ", ptid = 0x%" PRIx64 ")",
- __PRETTY_FUNCTION__,
+ LLVM_PRETTY_FUNCTION,
m_thread.GetID(),
m_thread.GetProtocolID());
#endif
@@ -260,14 +260,14 @@ ThreadPlanNull::ShouldStop (Event *event_ptr)
{
#ifdef LLDB_CONFIGURATION_DEBUG
fprintf(stderr, "error: %s called on thread that has been destroyed (tid = 0x%" PRIx64 ", ptid = 0x%" PRIx64 ")",
- __PRETTY_FUNCTION__,
+ LLVM_PRETTY_FUNCTION,
m_thread.GetID(),
m_thread.GetProtocolID());
#else
Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_THREAD));
if (log)
log->Error("%s called on thread that has been destroyed (tid = 0x%" PRIx64 ", ptid = 0x%" PRIx64 ")",
- __PRETTY_FUNCTION__,
+ LLVM_PRETTY_FUNCTION,
m_thread.GetID(),
m_thread.GetProtocolID());
#endif
@@ -279,14 +279,14 @@ ThreadPlanNull::WillStop ()
{
#ifdef LLDB_CONFIGURATION_DEBUG
fprintf(stderr, "error: %s called on thread that has been destroyed (tid = 0x%" PRIx64 ", ptid = 0x%" PRIx64 ")",
- __PRETTY_FUNCTION__,
+ LLVM_PRETTY_FUNCTION,
m_thread.GetID(),
m_thread.GetProtocolID());
#else
Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_THREAD));
if (log)
log->Error("%s called on thread that has been destroyed (tid = 0x%" PRIx64 ", ptid = 0x%" PRIx64 ")",
- __PRETTY_FUNCTION__,
+ LLVM_PRETTY_FUNCTION,
m_thread.GetID(),
m_thread.GetProtocolID());
#endif
@@ -298,14 +298,14 @@ ThreadPlanNull::DoPlanExplainsStop (Event *event_ptr)
{
#ifdef LLDB_CONFIGURATION_DEBUG
fprintf(stderr, "error: %s called on thread that has been destroyed (tid = 0x%" PRIx64 ", ptid = 0x%" PRIx64 ")",
- __PRETTY_FUNCTION__,
+ LLVM_PRETTY_FUNCTION,
m_thread.GetID(),
m_thread.GetProtocolID());
#else
Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_THREAD));
if (log)
log->Error("%s called on thread that has been destroyed (tid = 0x%" PRIx64 ", ptid = 0x%" PRIx64 ")",
- __PRETTY_FUNCTION__,
+ LLVM_PRETTY_FUNCTION,
m_thread.GetID(),
m_thread.GetProtocolID());
#endif
@@ -319,14 +319,14 @@ ThreadPlanNull::MischiefManaged ()
// The null plan is never done.
#ifdef LLDB_CONFIGURATION_DEBUG
fprintf(stderr, "error: %s called on thread that has been destroyed (tid = 0x%" PRIx64 ", ptid = 0x%" PRIx64 ")",
- __PRETTY_FUNCTION__,
+ LLVM_PRETTY_FUNCTION,
m_thread.GetID(),
m_thread.GetProtocolID());
#else
Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_THREAD));
if (log)
log->Error("%s called on thread that has been destroyed (tid = 0x%" PRIx64 ", ptid = 0x%" PRIx64 ")",
- __PRETTY_FUNCTION__,
+ LLVM_PRETTY_FUNCTION,
m_thread.GetID(),
m_thread.GetProtocolID());
#endif
@@ -339,14 +339,14 @@ ThreadPlanNull::GetPlanRunState ()
// Not sure what to return here. This is a dead thread.
#ifdef LLDB_CONFIGURATION_DEBUG
fprintf(stderr, "error: %s called on thread that has been destroyed (tid = 0x%" PRIx64 ", ptid = 0x%" PRIx64 ")",
- __PRETTY_FUNCTION__,
+ LLVM_PRETTY_FUNCTION,
m_thread.GetID(),
m_thread.GetProtocolID());
#else
Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_THREAD));
if (log)
log->Error("%s called on thread that has been destroyed (tid = 0x%" PRIx64 ", ptid = 0x%" PRIx64 ")",
- __PRETTY_FUNCTION__,
+ LLVM_PRETTY_FUNCTION,
m_thread.GetID(),
m_thread.GetProtocolID());
#endif
diff --git a/lldb/source/Target/ThreadPlanPython.cpp b/lldb/source/Target/ThreadPlanPython.cpp
index 470e7f6b1cb..39a8d77d43a 100644
--- a/lldb/source/Target/ThreadPlanPython.cpp
+++ b/lldb/source/Target/ThreadPlanPython.cpp
@@ -83,7 +83,7 @@ ThreadPlanPython::ShouldStop (Event *event_ptr)
Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_THREAD));
if (log)
log->Printf ("%s called on Python Thread Plan: %s )",
- __PRETTY_FUNCTION__, m_class_name.c_str());
+ LLVM_PRETTY_FUNCTION, m_class_name.c_str());
bool should_stop = true;
if (m_implementation_sp)
@@ -106,7 +106,7 @@ ThreadPlanPython::IsPlanStale()
Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_THREAD));
if (log)
log->Printf ("%s called on Python Thread Plan: %s )",
- __PRETTY_FUNCTION__, m_class_name.c_str());
+ LLVM_PRETTY_FUNCTION, m_class_name.c_str());
bool is_stale = true;
if (m_implementation_sp)
@@ -129,7 +129,7 @@ ThreadPlanPython::DoPlanExplainsStop (Event *event_ptr)
Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_THREAD));
if (log)
log->Printf ("%s called on Python Thread Plan: %s )",
- __PRETTY_FUNCTION__, m_class_name.c_str());
+ LLVM_PRETTY_FUNCTION, m_class_name.c_str());
bool explains_stop = true;
if (m_implementation_sp)
@@ -152,7 +152,7 @@ ThreadPlanPython::MischiefManaged ()
Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_THREAD));
if (log)
log->Printf ("%s called on Python Thread Plan: %s )",
- __PRETTY_FUNCTION__, m_class_name.c_str());
+ LLVM_PRETTY_FUNCTION, m_class_name.c_str());
bool mischief_managed = true;
if (m_implementation_sp)
{
@@ -170,7 +170,7 @@ ThreadPlanPython::GetPlanRunState ()
Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_THREAD));
if (log)
log->Printf ("%s called on Python Thread Plan: %s )",
- __PRETTY_FUNCTION__,
+ LLVM_PRETTY_FUNCTION,
m_class_name.c_str());
lldb::StateType run_state = eStateRunning;
if (m_implementation_sp)
@@ -207,6 +207,6 @@ ThreadPlanPython::WillStop ()
Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_THREAD));
if (log)
log->Printf ("%s called on Python Thread Plan: %s )",
- __PRETTY_FUNCTION__, m_class_name.c_str());
+ LLVM_PRETTY_FUNCTION, m_class_name.c_str());
return true;
}
OpenPOWER on IntegriCloud