pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
lldb-git: Catch up after recent review notes
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Mon Jan 30 23:33:21 2017 +0100
Changeset: 8531424945731ab3d4665da86cdb9910075fb861
Modified Files:
lldb-git/distinfo
lldb-git/patches/patch-source_Commands_CommandObjectPlatform.cpp
lldb-git/patches/patch-source_Core_ConstString.cpp
lldb-git/patches/patch-source_Core_ModuleList.cpp
lldb-git/patches/patch-source_Host_common_HostInfoBase.cpp
lldb-git/patches/patch-source_Host_linux_HostInfoLinux.cpp
lldb-git/patches/patch-source_Host_windows_HostInfoWindows.cpp
lldb-git/patches/patch-source_Plugins_ExpressionParser_Clang_ClangModulesDeclVendor.cpp
lldb-git/patches/patch-source_Plugins_Language_CPlusPlus_CPlusPlusLanguage.cpp
lldb-git/patches/patch-source_Plugins_Language_Go_GoLanguage.cpp
lldb-git/patches/patch-source_Plugins_Language_Java_JavaLanguage.cpp
lldb-git/patches/patch-source_Plugins_Language_ObjC_ObjCLanguage.cpp
lldb-git/patches/patch-source_Plugins_Platform_MacOSX_PlatformDarwin.cpp
lldb-git/patches/patch-source_Plugins_Process_FreeBSD_ProcessFreeBSD.cpp
lldb-git/patches/patch-source_Plugins_Process_MacOSX-Kernel_ProcessKDP.cpp
lldb-git/patches/patch-source_Plugins_Process_POSIX_ProcessPOSIXLog.cpp
lldb-git/patches/patch-source_Plugins_Process_Windows_Common_ProcessWindows.cpp
lldb-git/patches/patch-source_Plugins_Process_Windows_Common_ProcessWindowsLog.cpp
lldb-git/patches/patch-source_Plugins_Process_elf-core_ProcessElfCore.cpp
lldb-git/patches/patch-source_Plugins_Process_gdb-remote_GDBRemoteCommunicationServerPlatform.cpp
lldb-git/patches/patch-source_Plugins_Process_gdb-remote_ProcessGDBRemote.cpp
lldb-git/patches/patch-source_Plugins_Process_gdb-remote_ProcessGDBRemoteLog.cpp
lldb-git/patches/patch-source_Plugins_Process_mach-core_ProcessMachCore.cpp
lldb-git/patches/patch-source_Plugins_Process_minidump_ProcessMinidump.cpp
lldb-git/patches/patch-source_Plugins_ScriptInterpreter_None_ScriptInterpreterNone.cpp
lldb-git/patches/patch-source_Plugins_ScriptInterpreter_Python_ScriptInterpreterPython.cpp
lldb-git/patches/patch-source_Plugins_SymbolFile_DWARF_SymbolFileDWARF.cpp
lldb-git/patches/patch-source_Symbol_GoASTContext.cpp
lldb-git/patches/patch-source_Target_Language.cpp
Log Message:
lldb-git: Catch up after recent review notes
Sponsored by <The NetBSD Foundation>
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8531424945731ab3d4665da86cdb9910075fb861
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
lldb-git/distinfo | 56 +++++++++++-----------
...patch-source_Commands_CommandObjectPlatform.cpp | 8 +---
lldb-git/patches/patch-source_Core_ConstString.cpp | 14 ++----
lldb-git/patches/patch-source_Core_ModuleList.cpp | 7 +--
.../patch-source_Host_common_HostInfoBase.cpp | 36 ++++++--------
.../patch-source_Host_linux_HostInfoLinux.cpp | 12 +----
.../patch-source_Host_windows_HostInfoWindows.cpp | 10 +---
...pressionParser_Clang_ClangModulesDeclVendor.cpp | 10 +---
...lugins_Language_CPlusPlus_CPlusPlusLanguage.cpp | 14 ++----
...patch-source_Plugins_Language_Go_GoLanguage.cpp | 12 +----
...h-source_Plugins_Language_Java_JavaLanguage.cpp | 10 +---
...h-source_Plugins_Language_ObjC_ObjCLanguage.cpp | 10 +---
...urce_Plugins_Platform_MacOSX_PlatformDarwin.cpp | 12 +----
...urce_Plugins_Process_FreeBSD_ProcessFreeBSD.cpp | 10 +---
...ce_Plugins_Process_MacOSX-Kernel_ProcessKDP.cpp | 10 +---
...ource_Plugins_Process_POSIX_ProcessPOSIXLog.cpp | 9 +---
...ugins_Process_Windows_Common_ProcessWindows.cpp | 10 +---
...ns_Process_Windows_Common_ProcessWindowsLog.cpp | 10 +---
...rce_Plugins_Process_elf-core_ProcessElfCore.cpp | 10 +---
...remote_GDBRemoteCommunicationServerPlatform.cpp | 10 +---
...Plugins_Process_gdb-remote_ProcessGDBRemote.cpp | 10 +---
...gins_Process_gdb-remote_ProcessGDBRemoteLog.cpp | 10 +---
...e_Plugins_Process_mach-core_ProcessMachCore.cpp | 11 +----
...ce_Plugins_Process_minidump_ProcessMinidump.cpp | 10 +---
...criptInterpreter_None_ScriptInterpreterNone.cpp | 9 +---
...tInterpreter_Python_ScriptInterpreterPython.cpp | 8 +---
...ce_Plugins_SymbolFile_DWARF_SymbolFileDWARF.cpp | 26 +---------
.../patches/patch-source_Symbol_GoASTContext.cpp | 9 +---
lldb-git/patches/patch-source_Target_Language.cpp | 9 ++--
29 files changed, 89 insertions(+), 293 deletions(-)
diffs:
diff --git a/lldb-git/distinfo b/lldb-git/distinfo
index babf044..9fa704a 100644
--- a/lldb-git/distinfo
+++ b/lldb-git/distinfo
@@ -13,38 +13,38 @@ SHA1 (llvm-3.6.2.src.tar.xz) = 7a00257eb2bc9431e4c77c3a36b033072c54bc7e
RMD160 (llvm-3.6.2.src.tar.xz) = 521cbc5fe2925ea3c6e90c7a31f752a04045c972
Size (llvm-3.6.2.src.tar.xz) = 12802380 bytes
SHA1 (patch-include_lldb_Core_Debugger.h) = 6b1f7e7c3d24a5f5c63e5c99374289e48612c0fd
-SHA1 (patch-source_Commands_CommandObjectPlatform.cpp) = 7a2ccd9ea9077ff04fa29dac134d9f702a8675e3
-SHA1 (patch-source_Core_ConstString.cpp) = d93d58c967d3dfd1b514e995aa4eb7e426381b3b
+SHA1 (patch-source_Commands_CommandObjectPlatform.cpp) = b1a96f4e6e9a9f896d0b77b8c067584d85ec6835
+SHA1 (patch-source_Core_ConstString.cpp) = e9ba124104c8fdfb9a64d51a53a1a4702746ef06
SHA1 (patch-source_Core_Debugger.cpp) = 9f445f15298b553fdd78221f1c4cdacf66b857f9
-SHA1 (patch-source_Core_ModuleList.cpp) = 78540703746846670435e8fbfc7e87f044c8d0f8
+SHA1 (patch-source_Core_ModuleList.cpp) = 1dc5f5d9309646f5ca0119bbbd30e8d9c3146c4d
SHA1 (patch-source_Host_common_Editline.cpp) = f0d179ac0f29325ba852578ebfa98c53cc6c02a8
-SHA1 (patch-source_Host_common_HostInfoBase.cpp) = 8c6c2e7b660e03a44270f1da43f04056da2f3315
-SHA1 (patch-source_Host_linux_HostInfoLinux.cpp) = 07c9d4bdb7f956a4c1972e730d63e2136d0fe4d7
-SHA1 (patch-source_Host_windows_HostInfoWindows.cpp) = 0fc7e7d1d22ca2b16ecfccad0b4077e9357bde92
-SHA1 (patch-source_Plugins_ExpressionParser_Clang_ClangModulesDeclVendor.cpp) = 0d750b2783a26900ebaceb6beef68e89cc87e8e9
-SHA1 (patch-source_Plugins_Language_CPlusPlus_CPlusPlusLanguage.cpp) = 486c15f604d0b8e92e93dfdbb3e9dbf432002f8f
-SHA1 (patch-source_Plugins_Language_Go_GoLanguage.cpp) = af8d9b0e3511f071dc9b62c5dbdb521b923e73da
-SHA1 (patch-source_Plugins_Language_Java_JavaLanguage.cpp) = 946545144fc5826a41ca8aaa2fefff9adcba29bd
-SHA1 (patch-source_Plugins_Language_ObjC_ObjCLanguage.cpp) = 18d19b9cd398249c17a17b5abb4c5bc51abbdcd6
+SHA1 (patch-source_Host_common_HostInfoBase.cpp) = 425b35aa4444cf204c46cc60e0be589faec4fb37
+SHA1 (patch-source_Host_linux_HostInfoLinux.cpp) = 98b21e116762d41cb211bd36036f2631bbe7923e
+SHA1 (patch-source_Host_windows_HostInfoWindows.cpp) = 81480be68f9892b749766f646dd93be4d31b786f
+SHA1 (patch-source_Plugins_ExpressionParser_Clang_ClangModulesDeclVendor.cpp) = 06c35238d7821929feb6678b14efe913d3d707fe
+SHA1 (patch-source_Plugins_Language_CPlusPlus_CPlusPlusLanguage.cpp) = 16ff918313d4ee9eb96054a5fc0084cbfc11d691
+SHA1 (patch-source_Plugins_Language_Go_GoLanguage.cpp) = 245baea64af167e0b445f8c19a59a266d9776e32
+SHA1 (patch-source_Plugins_Language_Java_JavaLanguage.cpp) = dce7f55988a656d0c551f7e0224e512e2d25dde2
+SHA1 (patch-source_Plugins_Language_ObjC_ObjCLanguage.cpp) = f43906debdf874b87a816df627b7ead18152242b
SHA1 (patch-source_Plugins_Platform_MacOSX_PlatformAppleSimulator.cpp) = e68a3e5fb8f7d827913c7bcfabb1d082fad59b06
-SHA1 (patch-source_Plugins_Platform_MacOSX_PlatformDarwin.cpp) = 6ca2c1db26ac0b15569c2d3f49e4208c00d48a91
-SHA1 (patch-source_Plugins_Process_FreeBSD_ProcessFreeBSD.cpp) = c5e02878fd7d8f5f3c5b28dda245ad2b748f9d9b
+SHA1 (patch-source_Plugins_Platform_MacOSX_PlatformDarwin.cpp) = 3c2aaf7b7f1900f5a74925d75b740ce11784b421
+SHA1 (patch-source_Plugins_Process_FreeBSD_ProcessFreeBSD.cpp) = c577a5533340f4863f4e44b655cba593f7e6a88c
SHA1 (patch-source_Plugins_Process_Linux_NativeProcessLinux.cpp) = d46ee3f4af0f2c16bc83e42fb8a9bb3bfa05a580
-SHA1 (patch-source_Plugins_Process_MacOSX-Kernel_ProcessKDP.cpp) = d06162209d997aaca757f893bf828fdbde3da621
-SHA1 (patch-source_Plugins_Process_POSIX_ProcessPOSIXLog.cpp) = 387cfb6c9cf9049336db1e639a3b2baf8c945bf1
-SHA1 (patch-source_Plugins_Process_Windows_Common_ProcessWindows.cpp) = 19773fa604a7fadd5645fa8da7880b135f8506b7
-SHA1 (patch-source_Plugins_Process_Windows_Common_ProcessWindowsLog.cpp) = 1ac82481e38ef6e9a00d54b20a9c293da7c71699
-SHA1 (patch-source_Plugins_Process_elf-core_ProcessElfCore.cpp) = 86b4fec1d11d8977b110ae109f33e6167d1b15e0
-SHA1 (patch-source_Plugins_Process_gdb-remote_GDBRemoteCommunicationServerPlatform.cpp) = 3a66b823ca12540be76338f13bd4e52f0af022a5
-SHA1 (patch-source_Plugins_Process_gdb-remote_ProcessGDBRemote.cpp) = 5814513e4180b4473209fb2456d3cf6231794296
-SHA1 (patch-source_Plugins_Process_gdb-remote_ProcessGDBRemoteLog.cpp) = cd657c11a717c97a3d24344e5996de676c9b6468
-SHA1 (patch-source_Plugins_Process_mach-core_ProcessMachCore.cpp) = 6a77fa5f1b0b99cfc50d73d343a892b36ae4018d
-SHA1 (patch-source_Plugins_Process_minidump_ProcessMinidump.cpp) = d277611578b8f990c8bf306805a5f21fa043a64f
-SHA1 (patch-source_Plugins_ScriptInterpreter_None_ScriptInterpreterNone.cpp) = 3b80822049658b4afb624da85832ff731e2de8de
-SHA1 (patch-source_Plugins_ScriptInterpreter_Python_ScriptInterpreterPython.cpp) = 62b4bdaa1058471cea30cbdb891f03963b656b1c
-SHA1 (patch-source_Plugins_SymbolFile_DWARF_SymbolFileDWARF.cpp) = d577c4819d22d1d537558612cbd86250da7de426
+SHA1 (patch-source_Plugins_Process_MacOSX-Kernel_ProcessKDP.cpp) = b91ef5b7117d15f600f54d27897e400305cdcd26
+SHA1 (patch-source_Plugins_Process_POSIX_ProcessPOSIXLog.cpp) = 9b2c481c12a6a2289af26e933fc7ed6a9286c078
+SHA1 (patch-source_Plugins_Process_Windows_Common_ProcessWindows.cpp) = a4211a39196993ac1ee65ee91f68f4532183e3e3
+SHA1 (patch-source_Plugins_Process_Windows_Common_ProcessWindowsLog.cpp) = b63a2c600bd24fe86e2ea44976f737bd15910ab7
+SHA1 (patch-source_Plugins_Process_elf-core_ProcessElfCore.cpp) = 4671a1b79477dcaca69ca09e85cc53fffb64a1f7
+SHA1 (patch-source_Plugins_Process_gdb-remote_GDBRemoteCommunicationServerPlatform.cpp) = 91749bcf21c8174c58d7c2a5df957146aeabc946
+SHA1 (patch-source_Plugins_Process_gdb-remote_ProcessGDBRemote.cpp) = 6cadbc2db07ef7f11a5ed1bbdf157a5b40b35d2f
+SHA1 (patch-source_Plugins_Process_gdb-remote_ProcessGDBRemoteLog.cpp) = 98952ab28a057b2e3f77904b97795d6f40d55b6a
+SHA1 (patch-source_Plugins_Process_mach-core_ProcessMachCore.cpp) = bdee565f4cf3c76b6a267ad9dc5d78a758744caa
+SHA1 (patch-source_Plugins_Process_minidump_ProcessMinidump.cpp) = 5bb3d20526a09a7d22dff4611ca25f79df1fbfc5
+SHA1 (patch-source_Plugins_ScriptInterpreter_None_ScriptInterpreterNone.cpp) = f13ba3835f987867f1acd10275aa790743d75656
+SHA1 (patch-source_Plugins_ScriptInterpreter_Python_ScriptInterpreterPython.cpp) = b6a59e4ae33e29d2a8d48bf96841ff3709b8ace3
+SHA1 (patch-source_Plugins_SymbolFile_DWARF_SymbolFileDWARF.cpp) = ca0ec9619809f595b061fb65b7f8b1a4c34d0188
SHA1 (patch-source_Plugins_SymbolFile_DWARF_SymbolFileDWARF.h) = f9c0ca5b65adff958e63696121668cb415880e6a
SHA1 (patch-source_Symbol_ClangASTContext.cpp) = b82b171651e2e508485d23d892a89bceac71b808
-SHA1 (patch-source_Symbol_GoASTContext.cpp) = 0f6f9a00c69c9a131b778727e478a9054440e325
-SHA1 (patch-source_Target_Language.cpp) = 5c45db96d84b68dcd6088ef30f7b3b7ef1b2dd18
+SHA1 (patch-source_Symbol_GoASTContext.cpp) = b7d407ae128f00655a032b42629a6ca8bdcf5941
+SHA1 (patch-source_Target_Language.cpp) = 9c4281ae37e5e76d9e354a689ba324bd44f3c460
SHA1 (patch-tools_debugserver_source_MacOSX_DarwinLog_DarwinLogCollector.cpp) = 4f6f70ab211d852b0e521ad9e0a8233734707351
diff --git a/lldb-git/patches/patch-source_Commands_CommandObjectPlatform.cpp b/lldb-git/patches/patch-source_Commands_CommandObjectPlatform.cpp
index ce811b5..43f013c 100644
--- a/lldb-git/patches/patch-source_Commands_CommandObjectPlatform.cpp
+++ b/lldb-git/patches/patch-source_Commands_CommandObjectPlatform.cpp
@@ -2,7 +2,7 @@ $NetBSD$
--- source/Commands/CommandObjectPlatform.cpp.orig 2016-12-14 14:10:24.000000000 +0000
+++ source/Commands/CommandObjectPlatform.cpp
-@@ -30,9 +30,11 @@
+@@ -30,6 +30,7 @@
#include "lldb/Utility/Utils.h"
#include "llvm/ADT/SmallString.h"
@@ -10,11 +10,7 @@ $NetBSD$
using namespace lldb;
using namespace lldb_private;
-+using namespace llvm;
-
- static mode_t ParsePermissionString(const char *) = delete;
-
-@@ -1249,8 +1251,8 @@ protected:
+@@ -1249,8 +1250,8 @@ protected:
public:
CommandOptions()
: Options(), match_info(), show_args(false), verbose(false) {
diff --git a/lldb-git/patches/patch-source_Core_ConstString.cpp b/lldb-git/patches/patch-source_Core_ConstString.cpp
index 2e4e12e..94763b8 100644
--- a/lldb-git/patches/patch-source_Core_ConstString.cpp
+++ b/lldb-git/patches/patch-source_Core_ConstString.cpp
@@ -2,21 +2,15 @@ $NetBSD$
--- source/Core/ConstString.cpp.orig 2016-09-10 17:36:23.000000000 +0000
+++ source/Core/ConstString.cpp
-@@ -19,10 +19,13 @@
+@@ -18,6 +18,7 @@
+ #include "llvm/ADT/StringExtras.h"
#include "llvm/ADT/StringMap.h"
#include "llvm/Support/RWMutex.h"
++#include "llvm/Support/Threading.h"
-+#include "llvm/Support/Atomic.h"
-+
// Project includes
#include "lldb/Core/Stream.h"
-
- using namespace lldb_private;
-+using namespace llvm;
-
- class Pool {
- public:
-@@ -191,10 +194,10 @@ protected:
+@@ -191,10 +192,10 @@ protected:
// touch ConstStrings is difficult. So we leak the pool instead.
//----------------------------------------------------------------------
static Pool &StringPool() {
diff --git a/lldb-git/patches/patch-source_Core_ModuleList.cpp b/lldb-git/patches/patch-source_Core_ModuleList.cpp
index efc437a..5bd0c7f 100644
--- a/lldb-git/patches/patch-source_Core_ModuleList.cpp
+++ b/lldb-git/patches/patch-source_Core_ModuleList.cpp
@@ -2,7 +2,7 @@ $NetBSD$
--- source/Core/ModuleList.cpp.orig 2016-12-14 14:10:24.000000000 +0000
+++ source/Core/ModuleList.cpp
-@@ -26,8 +26,11 @@
+@@ -26,6 +26,8 @@
#include "lldb/Symbol/SymbolFile.h"
#include "lldb/Symbol/VariableList.h"
@@ -10,11 +10,8 @@ $NetBSD$
+
using namespace lldb;
using namespace lldb_private;
-+using namespace llvm;
- ModuleList::ModuleList()
- : m_modules(), m_modules_mutex(), m_notifier(nullptr) {}
-@@ -644,8 +647,8 @@ size_t ModuleList::GetIndexForModule(con
+@@ -644,8 +646,8 @@ size_t ModuleList::GetIndexForModule(con
static ModuleList &GetSharedModuleList() {
static ModuleList *g_shared_module_list = nullptr;
diff --git a/lldb-git/patches/patch-source_Host_common_HostInfoBase.cpp b/lldb-git/patches/patch-source_Host_common_HostInfoBase.cpp
index 451b9f1..1b2c60c 100644
--- a/lldb-git/patches/patch-source_Host_common_HostInfoBase.cpp
+++ b/lldb-git/patches/patch-source_Host_common_HostInfoBase.cpp
@@ -10,15 +10,7 @@ $NetBSD$
#include "llvm/Support/raw_ostream.h"
#include <mutex> // std::once
-@@ -29,6 +30,7 @@
-
- using namespace lldb;
- using namespace lldb_private;
-+using namespace llvm;
-
- namespace {
- //----------------------------------------------------------------------
-@@ -79,8 +81,8 @@ void HostInfoBase::Terminate() {
+@@ -79,8 +80,8 @@ void HostInfoBase::Terminate() {
}
uint32_t HostInfoBase::GetNumberCPUS() {
@@ -29,7 +21,7 @@ $NetBSD$
g_fields->m_number_cpus = std::thread::hardware_concurrency();
});
return g_fields->m_number_cpus;
-@@ -89,8 +91,8 @@ uint32_t HostInfoBase::GetNumberCPUS() {
+@@ -89,8 +90,8 @@ uint32_t HostInfoBase::GetNumberCPUS() {
uint32_t HostInfoBase::GetMaxThreadNameLength() { return 0; }
llvm::StringRef HostInfoBase::GetVendorString() {
@@ -40,7 +32,7 @@ $NetBSD$
g_fields->m_vendor_string =
HostInfo::GetArchitecture().GetTriple().getVendorName().str();
});
-@@ -98,8 +100,8 @@ llvm::StringRef HostInfoBase::GetVendorS
+@@ -98,8 +99,8 @@ llvm::StringRef HostInfoBase::GetVendorS
}
llvm::StringRef HostInfoBase::GetOSString() {
@@ -51,7 +43,7 @@ $NetBSD$
g_fields->m_os_string =
std::move(HostInfo::GetArchitecture().GetTriple().getOSName());
});
-@@ -107,8 +109,8 @@ llvm::StringRef HostInfoBase::GetOSStrin
+@@ -107,8 +108,8 @@ llvm::StringRef HostInfoBase::GetOSStrin
}
llvm::StringRef HostInfoBase::GetTargetTriple() {
@@ -62,7 +54,7 @@ $NetBSD$
g_fields->m_host_triple =
HostInfo::GetArchitecture().GetTriple().getTriple();
});
-@@ -116,8 +118,8 @@ llvm::StringRef HostInfoBase::GetTargetT
+@@ -116,8 +117,8 @@ llvm::StringRef HostInfoBase::GetTargetT
}
const ArchSpec &HostInfoBase::GetArchitecture(ArchitectureKind arch_kind) {
@@ -73,7 +65,7 @@ $NetBSD$
HostInfo::ComputeHostArchitectureSupport(g_fields->m_host_arch_32,
g_fields->m_host_arch_64);
});
-@@ -144,9 +146,9 @@ bool HostInfoBase::GetLLDBPath(lldb::Pat
+@@ -144,9 +145,9 @@ bool HostInfoBase::GetLLDBPath(lldb::Pat
FileSpec *result = nullptr;
switch (type) {
case lldb::ePathTypeLLDBShlibDir: {
@@ -85,7 +77,7 @@ $NetBSD$
success =
HostInfo::ComputeSharedLibraryDirectory(g_fields->m_lldb_so_dir);
Log *log = lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_HOST);
-@@ -158,9 +160,9 @@ bool HostInfoBase::GetLLDBPath(lldb::Pat
+@@ -158,9 +159,9 @@ bool HostInfoBase::GetLLDBPath(lldb::Pat
result = &g_fields->m_lldb_so_dir;
} break;
case lldb::ePathTypeSupportExecutableDir: {
@@ -97,7 +89,7 @@ $NetBSD$
success = HostInfo::ComputeSupportExeDirectory(
g_fields->m_lldb_support_exe_dir);
Log *log = lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_HOST);
-@@ -173,9 +175,9 @@ bool HostInfoBase::GetLLDBPath(lldb::Pat
+@@ -173,9 +174,9 @@ bool HostInfoBase::GetLLDBPath(lldb::Pat
result = &g_fields->m_lldb_support_exe_dir;
} break;
case lldb::ePathTypeHeaderDir: {
@@ -109,7 +101,7 @@ $NetBSD$
success = HostInfo::ComputeHeaderDirectory(g_fields->m_lldb_headers_dir);
Log *log = lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_HOST);
if (log)
-@@ -186,9 +188,9 @@ bool HostInfoBase::GetLLDBPath(lldb::Pat
+@@ -186,9 +187,9 @@ bool HostInfoBase::GetLLDBPath(lldb::Pat
result = &g_fields->m_lldb_headers_dir;
} break;
case lldb::ePathTypePythonDir: {
@@ -121,7 +113,7 @@ $NetBSD$
success = HostInfo::ComputePythonDirectory(g_fields->m_lldb_python_dir);
Log *log = lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_HOST);
if (log)
-@@ -199,9 +201,9 @@ bool HostInfoBase::GetLLDBPath(lldb::Pat
+@@ -199,9 +200,9 @@ bool HostInfoBase::GetLLDBPath(lldb::Pat
result = &g_fields->m_lldb_python_dir;
} break;
case lldb::ePathTypeClangDir: {
@@ -133,7 +125,7 @@ $NetBSD$
success =
HostInfo::ComputeClangDirectory(g_fields->m_lldb_clang_resource_dir);
Log *log = lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_HOST);
-@@ -214,9 +216,9 @@ bool HostInfoBase::GetLLDBPath(lldb::Pat
+@@ -214,9 +215,9 @@ bool HostInfoBase::GetLLDBPath(lldb::Pat
result = &g_fields->m_lldb_clang_resource_dir;
} break;
case lldb::ePathTypeLLDBSystemPlugins: {
@@ -145,7 +137,7 @@ $NetBSD$
success = HostInfo::ComputeSystemPluginsDirectory(
g_fields->m_lldb_system_plugin_dir);
Log *log = lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_HOST);
-@@ -229,9 +231,9 @@ bool HostInfoBase::GetLLDBPath(lldb::Pat
+@@ -229,9 +230,9 @@ bool HostInfoBase::GetLLDBPath(lldb::Pat
result = &g_fields->m_lldb_system_plugin_dir;
} break;
case lldb::ePathTypeLLDBUserPlugins: {
@@ -157,7 +149,7 @@ $NetBSD$
success = HostInfo::ComputeUserPluginsDirectory(
g_fields->m_lldb_user_plugin_dir);
Log *log = lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_HOST);
-@@ -244,9 +246,9 @@ bool HostInfoBase::GetLLDBPath(lldb::Pat
+@@ -244,9 +245,9 @@ bool HostInfoBase::GetLLDBPath(lldb::Pat
result = &g_fields->m_lldb_user_plugin_dir;
} break;
case lldb::ePathTypeLLDBTempSystemDir: {
@@ -169,7 +161,7 @@ $NetBSD$
success = HostInfo::ComputeProcessTempFileDirectory(
g_fields->m_lldb_process_tmp_dir);
Log *log = lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_HOST);
-@@ -259,9 +261,9 @@ bool HostInfoBase::GetLLDBPath(lldb::Pat
+@@ -259,9 +260,9 @@ bool HostInfoBase::GetLLDBPath(lldb::Pat
result = &g_fields->m_lldb_process_tmp_dir;
} break;
case lldb::ePathTypeGlobalLLDBTempSystemDir: {
diff --git a/lldb-git/patches/patch-source_Host_linux_HostInfoLinux.cpp b/lldb-git/patches/patch-source_Host_linux_HostInfoLinux.cpp
index fdcd5b2..220f234 100644
--- a/lldb-git/patches/patch-source_Host_linux_HostInfoLinux.cpp
+++ b/lldb-git/patches/patch-source_Host_linux_HostInfoLinux.cpp
@@ -2,15 +2,7 @@ $NetBSD$
--- source/Host/linux/HostInfoLinux.cpp.orig 2016-12-14 14:10:24.000000000 +0000
+++ source/Host/linux/HostInfoLinux.cpp
-@@ -19,6 +19,7 @@
- #include <mutex> // std::once
-
- using namespace lldb_private;
-+using namespace llvm;
-
- namespace {
- struct HostInfoLinuxFields {
-@@ -44,8 +45,8 @@ uint32_t HostInfoLinux::GetMaxThreadName
+@@ -44,8 +44,8 @@ uint32_t HostInfoLinux::GetMaxThreadName
bool HostInfoLinux::GetOSVersion(uint32_t &major, uint32_t &minor,
uint32_t &update) {
static bool success = false;
@@ -21,7 +13,7 @@ $NetBSD$
struct utsname un;
if (uname(&un) == 0) {
-@@ -100,8 +101,8 @@ bool HostInfoLinux::GetOSKernelDescripti
+@@ -100,8 +100,8 @@ bool HostInfoLinux::GetOSKernelDescripti
llvm::StringRef HostInfoLinux::GetDistributionId() {
// Try to run 'lbs_release -i', and use that response
// for the distribution id.
diff --git a/lldb-git/patches/patch-source_Host_windows_HostInfoWindows.cpp b/lldb-git/patches/patch-source_Host_windows_HostInfoWindows.cpp
index 63d62a5..6e5b43b 100644
--- a/lldb-git/patches/patch-source_Host_windows_HostInfoWindows.cpp
+++ b/lldb-git/patches/patch-source_Host_windows_HostInfoWindows.cpp
@@ -2,15 +2,7 @@ $NetBSD$
--- source/Host/windows/HostInfoWindows.cpp.orig 2016-09-10 17:36:23.000000000 +0000
+++ source/Host/windows/HostInfoWindows.cpp
-@@ -21,6 +21,7 @@
- #include "llvm/Support/raw_ostream.h"
-
- using namespace lldb_private;
-+using namespace llvm;
-
- FileSpec HostInfoWindows::m_program_filespec;
-
-@@ -90,8 +91,8 @@ bool HostInfoWindows::GetHostname(std::s
+@@ -90,8 +90,8 @@ bool HostInfoWindows::GetHostname(std::s
}
FileSpec HostInfoWindows::GetProgramFileSpec() {
diff --git a/lldb-git/patches/patch-source_Plugins_ExpressionParser_Clang_ClangModulesDeclVendor.cpp b/lldb-git/patches/patch-source_Plugins_ExpressionParser_Clang_ClangModulesDeclVendor.cpp
index 113a3f7..a936d8c 100644
--- a/lldb-git/patches/patch-source_Plugins_ExpressionParser_Clang_ClangModulesDeclVendor.cpp
+++ b/lldb-git/patches/patch-source_Plugins_ExpressionParser_Clang_ClangModulesDeclVendor.cpp
@@ -2,15 +2,7 @@ $NetBSD$
--- source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp.orig 2017-01-28 19:35:15.000000000 +0000
+++ source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp
-@@ -35,6 +35,7 @@
- #include "lldb/Utility/LLDBAssert.h"
-
- using namespace lldb_private;
-+using namespace llvm;
-
- namespace {
- // Any Clang compiler requires a consumer for diagnostics. This one stores them
-@@ -143,9 +144,9 @@ void StoringDiagnosticConsumer::DumpDiag
+@@ -143,9 +143,9 @@ void StoringDiagnosticConsumer::DumpDiag
static FileSpec GetResourceDir() {
static FileSpec g_cached_resource_dir;
diff --git a/lldb-git/patches/patch-source_Plugins_Language_CPlusPlus_CPlusPlusLanguage.cpp b/lldb-git/patches/patch-source_Plugins_Language_CPlusPlus_CPlusPlusLanguage.cpp
index a1bb044..52bb49d 100644
--- a/lldb-git/patches/patch-source_Plugins_Language_CPlusPlus_CPlusPlusLanguage.cpp
+++ b/lldb-git/patches/patch-source_Plugins_Language_CPlusPlus_CPlusPlusLanguage.cpp
@@ -10,15 +10,7 @@ $NetBSD$
#include "BlockPointer.h"
#include "CxxStringTypes.h"
-@@ -43,6 +44,7 @@
- using namespace lldb;
- using namespace lldb_private;
- using namespace lldb_private::formatters;
-+using namespace llvm;
-
- void CPlusPlusLanguage::Initialize() {
- PluginManager::RegisterPlugin(GetPluginNameStatic(), "C++ Language",
-@@ -1036,10 +1038,10 @@ std::unique_ptr<Language::TypeScavenger>
+@@ -1036,10 +1037,10 @@ std::unique_ptr<Language::TypeScavenger>
}
lldb::TypeCategoryImplSP CPlusPlusLanguage::GetFormatters() {
@@ -31,7 +23,7 @@ $NetBSD$
DataVisualization::Categories::GetCategory(GetPluginName(), g_category);
if (g_category) {
LoadLibCxxFormatters(g_category);
-@@ -1052,11 +1054,11 @@ lldb::TypeCategoryImplSP CPlusPlusLangua
+@@ -1052,11 +1053,11 @@ lldb::TypeCategoryImplSP CPlusPlusLangua
HardcodedFormatters::HardcodedSummaryFinder
CPlusPlusLanguage::GetHardcodedSummaries() {
@@ -45,7 +37,7 @@ $NetBSD$
g_formatters.push_back(
[](lldb_private::ValueObject &valobj, lldb::DynamicValueType,
FormatManager &) -> TypeSummaryImpl::SharedPointer {
-@@ -1116,11 +1118,11 @@ CPlusPlusLanguage::GetHardcodedSummaries
+@@ -1116,11 +1117,11 @@ CPlusPlusLanguage::GetHardcodedSummaries
HardcodedFormatters::HardcodedSyntheticFinder
CPlusPlusLanguage::GetHardcodedSynthetics() {
diff --git a/lldb-git/patches/patch-source_Plugins_Language_Go_GoLanguage.cpp b/lldb-git/patches/patch-source_Plugins_Language_Go_GoLanguage.cpp
index 5cc60be..561b5c2 100644
--- a/lldb-git/patches/patch-source_Plugins_Language_Go_GoLanguage.cpp
+++ b/lldb-git/patches/patch-source_Plugins_Language_Go_GoLanguage.cpp
@@ -2,15 +2,7 @@ $NetBSD$
--- source/Plugins/Language/Go/GoLanguage.cpp.orig 2016-09-10 17:36:23.000000000 +0000
+++ source/Plugins/Language/Go/GoLanguage.cpp
-@@ -27,6 +27,7 @@
- using namespace lldb;
- using namespace lldb_private;
- using namespace lldb_private::formatters;
-+using namespace llvm;
-
- void GoLanguage::Initialize() {
- PluginManager::RegisterPlugin(GetPluginNameStatic(), "Go Language",
-@@ -62,10 +63,10 @@ Language *GoLanguage::CreateInstance(lld
+@@ -62,10 +62,10 @@ Language *GoLanguage::CreateInstance(lld
HardcodedFormatters::HardcodedSummaryFinder
GoLanguage::GetHardcodedSummaries() {
@@ -23,7 +15,7 @@ $NetBSD$
g_formatters.push_back(
[](lldb_private::ValueObject &valobj, lldb::DynamicValueType,
FormatManager &) -> TypeSummaryImpl::SharedPointer {
-@@ -104,10 +105,10 @@ GoLanguage::GetHardcodedSummaries() {
+@@ -104,10 +104,10 @@ GoLanguage::GetHardcodedSummaries() {
HardcodedFormatters::HardcodedSyntheticFinder
GoLanguage::GetHardcodedSynthetics() {
diff --git a/lldb-git/patches/patch-source_Plugins_Language_Java_JavaLanguage.cpp b/lldb-git/patches/patch-source_Plugins_Language_Java_JavaLanguage.cpp
index 91e6512..fed473a 100644
--- a/lldb-git/patches/patch-source_Plugins_Language_Java_JavaLanguage.cpp
+++ b/lldb-git/patches/patch-source_Plugins_Language_Java_JavaLanguage.cpp
@@ -10,15 +10,7 @@ $NetBSD$
// Project includes
#include "JavaFormatterFunctions.h"
-@@ -28,6 +29,7 @@
- using namespace lldb;
- using namespace lldb_private;
- using namespace lldb_private::formatters;
-+using namespace llvm;
-
- void JavaLanguage::Initialize() {
- PluginManager::RegisterPlugin(GetPluginNameStatic(), "Java Language",
-@@ -64,10 +66,10 @@ bool JavaLanguage::IsNilReference(ValueO
+@@ -64,10 +65,10 @@ bool JavaLanguage::IsNilReference(ValueO
}
lldb::TypeCategoryImplSP JavaLanguage::GetFormatters() {
diff --git a/lldb-git/patches/patch-source_Plugins_Language_ObjC_ObjCLanguage.cpp b/lldb-git/patches/patch-source_Plugins_Language_ObjC_ObjCLanguage.cpp
index 8511ebe..0d712ed 100644
--- a/lldb-git/patches/patch-source_Plugins_Language_ObjC_ObjCLanguage.cpp
+++ b/lldb-git/patches/patch-source_Plugins_Language_ObjC_ObjCLanguage.cpp
@@ -2,15 +2,7 @@ $NetBSD$
--- source/Plugins/Language/ObjC/ObjCLanguage.cpp.orig 2016-12-14 14:10:24.000000000 +0000
+++ source/Plugins/Language/ObjC/ObjCLanguage.cpp
-@@ -36,6 +36,7 @@
- using namespace lldb;
- using namespace lldb_private;
- using namespace lldb_private::formatters;
-+using namespace llvm;
-
- void ObjCLanguage::Initialize() {
- PluginManager::RegisterPlugin(GetPluginNameStatic(), "Objective-C Language",
-@@ -857,10 +858,10 @@ static void LoadCoreMediaFormatters(Type
+@@ -857,10 +857,10 @@ static void LoadCoreMediaFormatters(Type
}
lldb::TypeCategoryImplSP ObjCLanguage::GetFormatters() {
diff --git a/lldb-git/patches/patch-source_Plugins_Platform_MacOSX_PlatformDarwin.cpp b/lldb-git/patches/patch-source_Plugins_Platform_MacOSX_PlatformDarwin.cpp
index 0a5fad2..99757ac 100644
--- a/lldb-git/patches/patch-source_Plugins_Platform_MacOSX_PlatformDarwin.cpp
+++ b/lldb-git/patches/patch-source_Plugins_Platform_MacOSX_PlatformDarwin.cpp
@@ -10,15 +10,7 @@ $NetBSD$
#if defined(__APPLE__)
#include <TargetConditionals.h> // for TARGET_OS_TV, TARGET_OS_WATCH
-@@ -47,6 +48,7 @@
-
- using namespace lldb;
- using namespace lldb_private;
-+using namespace llvm;
-
- //------------------------------------------------------------------
- /// Default Constructor
-@@ -1452,8 +1454,8 @@ static FileSpec CheckPathForXcode(const
+@@ -1452,8 +1453,8 @@ static FileSpec CheckPathForXcode(const
static FileSpec GetXcodeContentsPath() {
static FileSpec g_xcode_filespec;
@@ -29,7 +21,7 @@ $NetBSD$
FileSpec fspec;
-@@ -1835,8 +1837,8 @@ lldb_private::FileSpec PlatformDarwin::L
+@@ -1835,8 +1836,8 @@ lldb_private::FileSpec PlatformDarwin::L
// Find the global list of directories that we will search for
// executables once so we don't keep doing the work over and over.
diff --git a/lldb-git/patches/patch-source_Plugins_Process_FreeBSD_ProcessFreeBSD.cpp b/lldb-git/patches/patch-source_Plugins_Process_FreeBSD_ProcessFreeBSD.cpp
index 361b72a..31a9b40 100644
--- a/lldb-git/patches/patch-source_Plugins_Process_FreeBSD_ProcessFreeBSD.cpp
+++ b/lldb-git/patches/patch-source_Plugins_Process_FreeBSD_ProcessFreeBSD.cpp
@@ -2,15 +2,7 @@ $NetBSD$
--- source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp.orig 2017-01-28 19:35:15.000000000 +0000
+++ source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp
-@@ -48,6 +48,7 @@
-
- using namespace lldb;
- using namespace lldb_private;
-+using namespace llvm;
-
- namespace {
- UnixSignalsSP &GetFreeBSDSignals() {
-@@ -71,9 +72,9 @@ ProcessFreeBSD::CreateInstance(lldb::Tar
+@@ -71,9 +71,9 @@ ProcessFreeBSD::CreateInstance(lldb::Tar
}
void ProcessFreeBSD::Initialize() {
diff --git a/lldb-git/patches/patch-source_Plugins_Process_MacOSX-Kernel_ProcessKDP.cpp b/lldb-git/patches/patch-source_Plugins_Process_MacOSX-Kernel_ProcessKDP.cpp
index e769208..8ad647b 100644
--- a/lldb-git/patches/patch-source_Plugins_Process_MacOSX-Kernel_ProcessKDP.cpp
+++ b/lldb-git/patches/patch-source_Plugins_Process_MacOSX-Kernel_ProcessKDP.cpp
@@ -2,15 +2,7 @@ $NetBSD$
--- source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp.orig 2017-01-28 19:35:15.000000000 +0000
+++ source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp
-@@ -50,6 +50,7 @@
-
- using namespace lldb;
- using namespace lldb_private;
-+using namespace llvm;
-
- namespace {
-
-@@ -718,9 +719,9 @@ Error ProcessKDP::DoSignal(int signo) {
+@@ -718,9 +718,9 @@ Error ProcessKDP::DoSignal(int signo) {
}
void ProcessKDP::Initialize() {
diff --git a/lldb-git/patches/patch-source_Plugins_Process_POSIX_ProcessPOSIXLog.cpp b/lldb-git/patches/patch-source_Plugins_Process_POSIX_ProcessPOSIXLog.cpp
index d6faf52..2d46b59 100644
--- a/lldb-git/patches/patch-source_Plugins_Process_POSIX_ProcessPOSIXLog.cpp
+++ b/lldb-git/patches/patch-source_Plugins_Process_POSIX_ProcessPOSIXLog.cpp
@@ -2,7 +2,7 @@ $NetBSD$
--- source/Plugins/Process/POSIX/ProcessPOSIXLog.cpp.orig 2016-12-14 14:10:24.000000000 +0000
+++ source/Plugins/Process/POSIX/ProcessPOSIXLog.cpp
-@@ -15,10 +15,13 @@
+@@ -15,6 +15,8 @@
#include "lldb/Core/StreamFile.h"
#include "lldb/Interpreter/Args.h"
@@ -11,12 +11,7 @@ $NetBSD$
#include "ProcessPOSIXLog.h"
using namespace lldb;
- using namespace lldb_private;
-+using namespace llvm;
-
- // We want to avoid global constructors where code needs to be run so here we
- // control access to our static g_log_sp by hiding it in a singleton function
-@@ -33,9 +36,9 @@ static Log *GetLog() {
+@@ -33,9 +35,9 @@ static Log *GetLog() {
}
void ProcessPOSIXLog::Initialize(ConstString name) {
diff --git a/lldb-git/patches/patch-source_Plugins_Process_Windows_Common_ProcessWindows.cpp b/lldb-git/patches/patch-source_Plugins_Process_Windows_Common_ProcessWindows.cpp
index 4a607d7..168ff2d 100644
--- a/lldb-git/patches/patch-source_Plugins_Process_Windows_Common_ProcessWindows.cpp
+++ b/lldb-git/patches/patch-source_Plugins_Process_Windows_Common_ProcessWindows.cpp
@@ -2,15 +2,7 @@ $NetBSD$
--- source/Plugins/Process/Windows/Common/ProcessWindows.cpp.orig 2016-12-14 14:10:24.000000000 +0000
+++ source/Plugins/Process/Windows/Common/ProcessWindows.cpp
-@@ -41,6 +41,7 @@
-
- using namespace lldb;
- using namespace lldb_private;
-+using namespace llvm;
-
- namespace {
- std::string GetProcessExecutableName(HANDLE process_handle) {
-@@ -102,9 +103,9 @@ ProcessSP ProcessWindows::CreateInstance
+@@ -102,9 +102,9 @@ ProcessSP ProcessWindows::CreateInstance
}
void ProcessWindows::Initialize() {
diff --git a/lldb-git/patches/patch-source_Plugins_Process_Windows_Common_ProcessWindowsLog.cpp b/lldb-git/patches/patch-source_Plugins_Process_Windows_Common_ProcessWindowsLog.cpp
index bfe1c40..9fd7998 100644
--- a/lldb-git/patches/patch-source_Plugins_Process_Windows_Common_ProcessWindowsLog.cpp
+++ b/lldb-git/patches/patch-source_Plugins_Process_Windows_Common_ProcessWindowsLog.cpp
@@ -2,15 +2,7 @@ $NetBSD$
--- source/Plugins/Process/Windows/Common/ProcessWindowsLog.cpp.orig 2016-09-10 17:36:23.000000000 +0000
+++ source/Plugins/Process/Windows/Common/ProcessWindowsLog.cpp
-@@ -17,6 +17,7 @@
-
- using namespace lldb;
- using namespace lldb_private;
-+using namespace llvm;
-
- // We want to avoid global constructors where code needs to be run so here we
- // control access to our static g_log_sp by hiding it in a singleton function
-@@ -25,12 +26,12 @@ using namespace lldb_private;
+@@ -25,12 +25,12 @@ using namespace lldb_private;
static bool g_log_enabled = false;
static Log *g_log = nullptr;
diff --git a/lldb-git/patches/patch-source_Plugins_Process_elf-core_ProcessElfCore.cpp b/lldb-git/patches/patch-source_Plugins_Process_elf-core_ProcessElfCore.cpp
index ff785d9..99ecc2c 100644
--- a/lldb-git/patches/patch-source_Plugins_Process_elf-core_ProcessElfCore.cpp
+++ b/lldb-git/patches/patch-source_Plugins_Process_elf-core_ProcessElfCore.cpp
@@ -10,15 +10,7 @@ $NetBSD$
#include "Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h"
#include "Plugins/ObjectFile/ELF/ObjectFileELF.h"
-@@ -36,6 +37,7 @@
- #include "ThreadElfCore.h"
-
- using namespace lldb_private;
-+using namespace llvm;
-
- ConstString ProcessElfCore::GetPluginNameStatic() {
- static ConstString g_name("elf-core");
-@@ -398,9 +400,9 @@ void ProcessElfCore::Clear() {
+@@ -398,9 +399,9 @@ void ProcessElfCore::Clear() {
}
void ProcessElfCore::Initialize() {
diff --git a/lldb-git/patches/patch-source_Plugins_Process_gdb-remote_GDBRemoteCommunicationServerPlatform.cpp b/lldb-git/patches/patch-source_Plugins_Process_gdb-remote_GDBRemoteCommunicationServerPlatform.cpp
index 2f927cf..e774a74 100644
--- a/lldb-git/patches/patch-source_Plugins_Process_gdb-remote_GDBRemoteCommunicationServerPlatform.cpp
+++ b/lldb-git/patches/patch-source_Plugins_Process_gdb-remote_GDBRemoteCommunicationServerPlatform.cpp
@@ -11,15 +11,7 @@ $NetBSD$
// Project includes
#include "Utility/StringExtractorGDBRemote.h"
#include "Utility/UriParser.h"
-@@ -43,6 +45,7 @@
- using namespace lldb;
- using namespace lldb_private;
- using namespace lldb_private::process_gdb_remote;
-+using namespace llvm;
-
- //----------------------------------------------------------------------
- // GDBRemoteCommunicationServerPlatform constructor
-@@ -528,9 +531,9 @@ bool GDBRemoteCommunicationServerPlatfor
+@@ -528,9 +530,9 @@ bool GDBRemoteCommunicationServerPlatfor
const FileSpec &GDBRemoteCommunicationServerPlatform::GetDomainSocketDir() {
static FileSpec g_domainsocket_dir;
diff --git a/lldb-git/patches/patch-source_Plugins_Process_gdb-remote_ProcessGDBRemote.cpp b/lldb-git/patches/patch-source_Plugins_Process_gdb-remote_ProcessGDBRemote.cpp
index f196b10..38bcc65 100644
--- a/lldb-git/patches/patch-source_Plugins_Process_gdb-remote_ProcessGDBRemote.cpp
+++ b/lldb-git/patches/patch-source_Plugins_Process_gdb-remote_ProcessGDBRemote.cpp
@@ -2,7 +2,7 @@ $NetBSD$
--- source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp.orig 2017-01-28 19:35:15.000000000 +0000
+++ source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
-@@ -81,11 +81,13 @@
+@@ -81,6 +81,7 @@
#include "llvm/ADT/StringSwitch.h"
#include "llvm/Support/raw_ostream.h"
@@ -10,13 +10,7 @@ $NetBSD$
#define DEBUGSERVER_BASENAME "debugserver"
using namespace lldb;
- using namespace lldb_private;
- using namespace lldb_private::process_gdb_remote;
-+using namespace llvm;
-
- namespace lldb {
- // Provide a function that can easily dump the packet history if we know a
-@@ -3434,9 +3436,9 @@ void ProcessGDBRemote::KillDebugserverPr
+@@ -3434,9 +3435,9 @@ void ProcessGDBRemote::KillDebugserverPr
}
void ProcessGDBRemote::Initialize() {
diff --git a/lldb-git/patches/patch-source_Plugins_Process_gdb-remote_ProcessGDBRemoteLog.cpp b/lldb-git/patches/patch-source_Plugins_Process_gdb-remote_ProcessGDBRemoteLog.cpp
index 2d6d3de..8f7c33e 100644
--- a/lldb-git/patches/patch-source_Plugins_Process_gdb-remote_ProcessGDBRemoteLog.cpp
+++ b/lldb-git/patches/patch-source_Plugins_Process_gdb-remote_ProcessGDBRemoteLog.cpp
@@ -2,7 +2,7 @@ $NetBSD$
--- source/Plugins/Process/gdb-remote/ProcessGDBRemoteLog.cpp.orig 2016-10-19 22:25:12.000000000 +0000
+++ source/Plugins/Process/gdb-remote/ProcessGDBRemoteLog.cpp
-@@ -14,11 +14,14 @@
+@@ -14,6 +14,8 @@
#include "lldb/Core/StreamFile.h"
#include "lldb/Interpreter/Args.h"
@@ -11,13 +11,7 @@ $NetBSD$
#include "ProcessGDBRemote.h"
using namespace lldb;
- using namespace lldb_private;
- using namespace lldb_private::process_gdb_remote;
-+using namespace llvm;
-
- // We want to avoid global constructors where code needs to be run so here we
- // control access to our static g_log_sp by hiding it in a singleton function
-@@ -34,9 +37,9 @@ static Log *GetLog() {
+@@ -34,9 +36,9 @@ static Log *GetLog() {
void ProcessGDBRemoteLog::Initialize() {
static ConstString g_name("gdb-remote");
diff --git a/lldb-git/patches/patch-source_Plugins_Process_mach-core_ProcessMachCore.cpp b/lldb-git/patches/patch-source_Plugins_Process_mach-core_ProcessMachCore.cpp
index 85adbae..f5270d2 100644
--- a/lldb-git/patches/patch-source_Plugins_Process_mach-core_ProcessMachCore.cpp
+++ b/lldb-git/patches/patch-source_Plugins_Process_mach-core_ProcessMachCore.cpp
@@ -2,7 +2,7 @@ $NetBSD$
--- source/Plugins/Process/mach-core/ProcessMachCore.cpp.orig 2016-09-10 17:36:23.000000000 +0000
+++ source/Plugins/Process/mach-core/ProcessMachCore.cpp
-@@ -39,12 +39,15 @@
+@@ -39,6 +39,8 @@
// Needed for the plug-in names for the dynamic loaders.
#include "lldb/Utility/SafeMachO.h"
@@ -11,14 +11,7 @@ $NetBSD$
#include "Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.h"
#include "Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.h"
#include "Plugins/ObjectFile/Mach-O/ObjectFileMachO.h"
-
- using namespace lldb;
- using namespace lldb_private;
-+using namespace llvm;
-
- ConstString ProcessMachCore::GetPluginNameStatic() {
- static ConstString g_name("mach-o-core");
-@@ -579,9 +582,9 @@ Error ProcessMachCore::GetMemoryRegionIn
+@@ -579,9 +581,9 @@ Error ProcessMachCore::GetMemoryRegionIn
void ProcessMachCore::Clear() { m_thread_list.Clear(); }
void ProcessMachCore::Initialize() {
diff --git a/lldb-git/patches/patch-source_Plugins_Process_minidump_ProcessMinidump.cpp b/lldb-git/patches/patch-source_Plugins_Process_minidump_ProcessMinidump.cpp
index 50b45ef..2ed067f 100644
--- a/lldb-git/patches/patch-source_Plugins_Process_minidump_ProcessMinidump.cpp
+++ b/lldb-git/patches/patch-source_Plugins_Process_minidump_ProcessMinidump.cpp
@@ -2,7 +2,7 @@ $NetBSD$
--- source/Plugins/Process/minidump/ProcessMinidump.cpp.orig 2016-12-14 14:10:24.000000000 +0000
+++ source/Plugins/Process/minidump/ProcessMinidump.cpp
-@@ -25,11 +25,14 @@
+@@ -25,6 +25,8 @@
#include "lldb/Target/UnixSignals.h"
#include "lldb/Utility/LLDBAssert.h"
@@ -11,13 +11,7 @@ $NetBSD$
// C includes
// C++ includes
- using namespace lldb_private;
- using namespace minidump;
-+using namespace llvm;
-
- ConstString ProcessMinidump::GetPluginNameStatic() {
- static ConstString g_name("minidump");
-@@ -92,9 +95,9 @@ ProcessMinidump::~ProcessMinidump() {
+@@ -92,9 +94,9 @@ ProcessMinidump::~ProcessMinidump() {
}
void ProcessMinidump::Initialize() {
diff --git a/lldb-git/patches/patch-source_Plugins_ScriptInterpreter_None_ScriptInterpreterNone.cpp b/lldb-git/patches/patch-source_Plugins_ScriptInterpreter_None_ScriptInterpreterNone.cpp
index 0551ae6..af63876 100644
--- a/lldb-git/patches/patch-source_Plugins_ScriptInterpreter_None_ScriptInterpreterNone.cpp
+++ b/lldb-git/patches/patch-source_Plugins_ScriptInterpreter_None_ScriptInterpreterNone.cpp
@@ -2,7 +2,7 @@ $NetBSD$
--- source/Plugins/ScriptInterpreter/None/ScriptInterpreterNone.cpp.orig 2016-09-10 17:36:23.000000000 +0000
+++ source/Plugins/ScriptInterpreter/None/ScriptInterpreterNone.cpp
-@@ -15,10 +15,13 @@
+@@ -15,6 +15,8 @@
#include "lldb/Core/StringList.h"
#include "lldb/Interpreter/CommandInterpreter.h"
@@ -11,12 +11,7 @@ $NetBSD$
#include <mutex>
using namespace lldb;
- using namespace lldb_private;
-+using namespace llvm;
-
- ScriptInterpreterNone::ScriptInterpreterNone(CommandInterpreter &interpreter)
- : ScriptInterpreter(interpreter, eScriptLanguageNone) {}
-@@ -39,9 +42,9 @@ void ScriptInterpreterNone::ExecuteInter
+@@ -39,9 +41,9 @@ void ScriptInterpreterNone::ExecuteInter
}
void ScriptInterpreterNone::Initialize() {
diff --git a/lldb-git/patches/patch-source_Plugins_ScriptInterpreter_Python_ScriptInterpreterPython.cpp b/lldb-git/patches/patch-source_Plugins_ScriptInterpreter_Python_ScriptInterpreterPython.cpp
index 96d9a11..4bf158a 100644
--- a/lldb-git/patches/patch-source_Plugins_ScriptInterpreter_Python_ScriptInterpreterPython.cpp
+++ b/lldb-git/patches/patch-source_Plugins_ScriptInterpreter_Python_ScriptInterpreterPython.cpp
@@ -2,7 +2,7 @@ $NetBSD$
--- source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp.orig 2017-01-28 19:35:15.000000000 +0000
+++ source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
-@@ -51,9 +51,11 @@
+@@ -51,6 +51,7 @@
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/StringRef.h"
@@ -10,11 +10,7 @@ $NetBSD$
using namespace lldb;
using namespace lldb_private;
-+using namespace llvm;
-
- static ScriptInterpreterPython::SWIGInitCallback g_swig_init_callback = nullptr;
- static ScriptInterpreterPython::SWIGBreakpointCallbackFunction
-@@ -338,9 +340,9 @@ ScriptInterpreterPython::~ScriptInterpre
+@@ -338,9 +339,9 @@ ScriptInterpreterPython::~ScriptInterpre
}
void ScriptInterpreterPython::Initialize() {
diff --git a/lldb-git/patches/patch-source_Plugins_SymbolFile_DWARF_SymbolFileDWARF.cpp b/lldb-git/patches/patch-source_Plugins_SymbolFile_DWARF_SymbolFileDWARF.cpp
index a295022..47787b7 100644
--- a/lldb-git/patches/patch-source_Plugins_SymbolFile_DWARF_SymbolFileDWARF.cpp
+++ b/lldb-git/patches/patch-source_Plugins_SymbolFile_DWARF_SymbolFileDWARF.cpp
@@ -10,15 +10,7 @@ $NetBSD$
#include "lldb/Core/ArchSpec.h"
#include "lldb/Core/Module.h"
-@@ -87,6 +88,7 @@
-
- using namespace lldb;
- using namespace lldb_private;
-+using namespace llvm;
-
- // static inline bool
- // child_requires_parent_class_union_or_struct_to_be_completed (dw_tag_t tag)
-@@ -553,8 +555,8 @@ uint32_t SymbolFileDWARF::CalculateAbili
+@@ -553,8 +554,8 @@ uint32_t SymbolFileDWARF::CalculateAbili
const DWARFDataExtractor &
SymbolFileDWARF::GetCachedSectionData(lldb::SectionType sect_type,
DWARFDataSegment &data_segment) {
@@ -29,19 +21,3 @@ $NetBSD$
return data_segment.m_data;
}
-@@ -1630,13 +1632,13 @@ SymbolFileDWARF::GlobalVariableMap &Symb
- VariableSP var_sp = globals_sp->GetVariableAtIndex(g);
- if (var_sp && !var_sp->GetLocationIsConstantValueData()) {
- const DWARFExpression &location = var_sp->LocationExpression();
-- Value location_result;
-+ lldb_private::Value location_result;
- Error error;
- if (location.Evaluate(nullptr, nullptr, nullptr,
- LLDB_INVALID_ADDRESS, nullptr, nullptr,
- location_result, &error)) {
- if (location_result.GetValueType() ==
-- Value::eValueTypeFileAddress) {
-+ lldb_private::Value::eValueTypeFileAddress) {
- lldb::addr_t file_addr =
- location_result.GetScalar().ULongLong();
- lldb::addr_t byte_size = 1;
diff --git a/lldb-git/patches/patch-source_Symbol_GoASTContext.cpp b/lldb-git/patches/patch-source_Symbol_GoASTContext.cpp
index 7c5eed6..f723d4e 100644
--- a/lldb-git/patches/patch-source_Symbol_GoASTContext.cpp
+++ b/lldb-git/patches/patch-source_Symbol_GoASTContext.cpp
@@ -2,7 +2,7 @@ $NetBSD$
--- source/Symbol/GoASTContext.cpp.orig 2016-12-14 14:10:24.000000000 +0000
+++ source/Symbol/GoASTContext.cpp
-@@ -25,10 +25,13 @@
+@@ -25,6 +25,8 @@
#include "lldb/Target/ExecutionContext.h"
#include "lldb/Target/Target.h"
@@ -11,12 +11,7 @@ $NetBSD$
#include "Plugins/ExpressionParser/Go/GoUserExpression.h"
#include "Plugins/SymbolFile/DWARF/DWARFASTParserGo.h"
- using namespace lldb;
-+using namespace llvm;
-
- namespace lldb_private {
- class GoArray;
-@@ -593,8 +596,8 @@ GoASTContext::GetBasicTypeEnumeration(ll
+@@ -593,8 +595,8 @@ GoASTContext::GetBasicTypeEnumeration(ll
if (name) {
typedef UniqueCStringMap<lldb::BasicType> TypeNameToBasicTypeMap;
static TypeNameToBasicTypeMap g_type_map;
diff --git a/lldb-git/patches/patch-source_Target_Language.cpp b/lldb-git/patches/patch-source_Target_Language.cpp
index 1ab7537..5c1a6e7 100644
--- a/lldb-git/patches/patch-source_Target_Language.cpp
+++ b/lldb-git/patches/patch-source_Target_Language.cpp
@@ -2,7 +2,7 @@ $NetBSD$
--- source/Target/Language.cpp.orig 2016-12-14 14:10:24.000000000 +0000
+++ source/Target/Language.cpp
-@@ -20,18 +20,21 @@
+@@ -20,6 +20,8 @@
#include "lldb/Symbol/TypeList.h"
#include "lldb/Target/Target.h"
@@ -11,10 +11,7 @@ $NetBSD$
using namespace lldb;
using namespace lldb_private;
using namespace lldb_private::formatters;
-+using namespace llvm;
-
- typedef std::unique_ptr<Language> LanguageUP;
- typedef std::map<lldb::LanguageType, LanguageUP> LanguagesMap;
+@@ -29,9 +31,9 @@ typedef std::map<lldb::LanguageType, Lan
static LanguagesMap &GetLanguagesMap() {
static LanguagesMap *g_map = nullptr;
@@ -26,7 +23,7 @@ $NetBSD$
g_map = new LanguagesMap(); // NOTE: INTENTIONAL LEAK due to global
// destructor chain
});
-@@ -40,9 +43,9 @@ static LanguagesMap &GetLanguagesMap() {
+@@ -40,9 +42,9 @@ static LanguagesMap &GetLanguagesMap() {
}
static std::mutex &GetLanguagesMutex() {
static std::mutex *g_mutex = nullptr;
Home |
Main Index |
Thread Index |
Old Index