pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

lldb-netbsd: More s/linux/netbsd/ and basic compat fixes



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sat Dec 17 14:28:09 2016 +0100
Changeset:	43511d7320f1be16cbbbcf5dc01a34ce70547d62

Modified Files:
	lldb-netbsd/distinfo
	lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_CMakeLists.txt
	lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp
	lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h
	lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeRegisterContextNetBSD.cpp
	lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeRegisterContextNetBSD.h
	lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeRegisterContextNetBSD__x86__64.cpp
	lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeRegisterContextNetBSD__x86__64.h
	lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeThreadNetBSD.cpp
	lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeThreadNetBSD.h
	lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_ProcFileReader.cpp
	lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_ProcFileReader.h
	lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_Procfs.h
	lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_SingleStepCheck.cpp
	lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_SingleStepCheck.h
Added Files:
	lldb-netbsd/patches/patch-include_lldb_Host_netbsd_ProcessLauncherNetBSD.h
	lldb-netbsd/patches/patch-include_lldb_Host_netbsd_Ptrace.h

Log Message:
lldb-netbsd: More s/linux/netbsd/ and basic compat fixes

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=43511d7320f1be16cbbbcf5dc01a34ce70547d62

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 lldb-netbsd/distinfo                               | 30 ++++++++++++----------
 ...nclude_lldb_Host_netbsd_ProcessLauncherNetBSD.h | 30 ++++++++++++++++++++++
 .../patch-include_lldb_Host_netbsd_Ptrace.h        | 21 +++++++++++++++
 ...ch-source_Plugins_Process_NetBSD_CMakeLists.txt |  2 +-
 ..._Plugins_Process_NetBSD_NativeProcessNetBSD.cpp | 23 ++++++++---------
 ...ce_Plugins_Process_NetBSD_NativeProcessNetBSD.h |  6 ++---
 ..._Process_NetBSD_NativeRegisterContextNetBSD.cpp |  6 ++---
 ...ns_Process_NetBSD_NativeRegisterContextNetBSD.h |  6 ++---
 ...NetBSD_NativeRegisterContextNetBSD__x86__64.cpp |  9 +++----
 ...s_NetBSD_NativeRegisterContextNetBSD__x86__64.h |  6 ++---
 ...e_Plugins_Process_NetBSD_NativeThreadNetBSD.cpp |  6 ++---
 ...rce_Plugins_Process_NetBSD_NativeThreadNetBSD.h |  9 +++----
 ...ource_Plugins_Process_NetBSD_ProcFileReader.cpp |  4 +--
 ...-source_Plugins_Process_NetBSD_ProcFileReader.h |  6 ++---
 .../patch-source_Plugins_Process_NetBSD_Procfs.h   |  2 +-
 ...urce_Plugins_Process_NetBSD_SingleStepCheck.cpp |  6 ++---
 ...source_Plugins_Process_NetBSD_SingleStepCheck.h | 10 ++++----
 17 files changed, 115 insertions(+), 67 deletions(-)

diffs:
diff --git a/lldb-netbsd/distinfo b/lldb-netbsd/distinfo
index 9472177..0672997 100644
--- a/lldb-netbsd/distinfo
+++ b/lldb-netbsd/distinfo
@@ -13,22 +13,24 @@ 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-cmake_LLDBDependencies.cmake) = 81673d8624ca7a9ad60bcaf530587fbfbd695dca
+SHA1 (patch-include_lldb_Host_netbsd_ProcessLauncherNetBSD.h) = 5422ae06ff064f0b522148a576a7e8d3b4ea1974
+SHA1 (patch-include_lldb_Host_netbsd_Ptrace.h) = 3ef61ded004c2acb81e132dc0e46d0a764977f92
 SHA1 (patch-source_CMakeLists.txt) = 5dacabc3f39c23bdfd432b5a4895866157b97aa0
 SHA1 (patch-source_Plugins_Process_CMakeLists.txt) = c0168f81da56d9896eb414e6b8bb7262de04ac33
-SHA1 (patch-source_Plugins_Process_NetBSD_CMakeLists.txt) = 91366fe224db18c87d0f00d0b1617ad97b6523c6
-SHA1 (patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp) = b2b7f04a9287fda1b4208dbd669a3fdf76dce94a
-SHA1 (patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h) = 6cdb3ff974c63f8a22027e25e8a4991629948707
-SHA1 (patch-source_Plugins_Process_NetBSD_NativeRegisterContextNetBSD.cpp) = 39aa59226470589fdab5d2f62a7297f580328ebb
-SHA1 (patch-source_Plugins_Process_NetBSD_NativeRegisterContextNetBSD.h) = 9be389183d8dbb588f29a283811781d13c2f049c
-SHA1 (patch-source_Plugins_Process_NetBSD_NativeRegisterContextNetBSD__x86__64.cpp) = 765a54e7c31108297316f8b8ffb2c5f0fb243aac
-SHA1 (patch-source_Plugins_Process_NetBSD_NativeRegisterContextNetBSD__x86__64.h) = 5dc6da570d43f5c832ec13f6487305f1feda5e93
-SHA1 (patch-source_Plugins_Process_NetBSD_NativeThreadNetBSD.cpp) = dcc5a330c4fdfdd48d7ae1d317f11f24c287bd02
-SHA1 (patch-source_Plugins_Process_NetBSD_NativeThreadNetBSD.h) = d0536fd2d157e360cd4949fc1b1212a55833a5a9
-SHA1 (patch-source_Plugins_Process_NetBSD_ProcFileReader.cpp) = 10d9511387fe5be20d8a0560fbee8d49ad00b255
-SHA1 (patch-source_Plugins_Process_NetBSD_ProcFileReader.h) = 88dd0aa5b61344458f759346211541bf5f660525
-SHA1 (patch-source_Plugins_Process_NetBSD_Procfs.h) = 464221c6e839ecd3b06d612f3e815933f7f11789
-SHA1 (patch-source_Plugins_Process_NetBSD_SingleStepCheck.cpp) = 7abe72717518912256fc80d72c6102ead505b6ee
-SHA1 (patch-source_Plugins_Process_NetBSD_SingleStepCheck.h) = 79752a7a54b1aef5951b7dc92ab7df0396c1b412
+SHA1 (patch-source_Plugins_Process_NetBSD_CMakeLists.txt) = 8c1d8274523f6ef4bce90caa6c981160ef930cb9
+SHA1 (patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp) = 60538c27004c97dfb76a3952df7ee95712ec8e22
+SHA1 (patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h) = 3177f7a17f3ab1fa8c155f2bcab6cbf2033644e9
+SHA1 (patch-source_Plugins_Process_NetBSD_NativeRegisterContextNetBSD.cpp) = cf569f95362538af5a2709aab9ff61770744a78d
+SHA1 (patch-source_Plugins_Process_NetBSD_NativeRegisterContextNetBSD.h) = 558e8514b2a8f0595c0e375f308c53d8a9a6e9f1
+SHA1 (patch-source_Plugins_Process_NetBSD_NativeRegisterContextNetBSD__x86__64.cpp) = c6acba5a851a283a978b3988070dee45318005f5
+SHA1 (patch-source_Plugins_Process_NetBSD_NativeRegisterContextNetBSD__x86__64.h) = b92d756199555c2ba890afa383808ec094266cf1
+SHA1 (patch-source_Plugins_Process_NetBSD_NativeThreadNetBSD.cpp) = ef75b910fd7125ce5ed79b453ef5c304282e88a5
+SHA1 (patch-source_Plugins_Process_NetBSD_NativeThreadNetBSD.h) = 9ed9cd17600e661c7fc0e53a3ecb4db91fb62566
+SHA1 (patch-source_Plugins_Process_NetBSD_ProcFileReader.cpp) = dff1193e16aa79d8a577a3db4a9056521911d6f1
+SHA1 (patch-source_Plugins_Process_NetBSD_ProcFileReader.h) = c8393049c7303b466d3ce98ec5581a3155b71aff
+SHA1 (patch-source_Plugins_Process_NetBSD_Procfs.h) = 5994fa837260136b78cd0b4988dafc6f96ca1e3d
+SHA1 (patch-source_Plugins_Process_NetBSD_SingleStepCheck.cpp) = a3b64eca776c32e84dd8f4ee131b28551acab7a8
+SHA1 (patch-source_Plugins_Process_NetBSD_SingleStepCheck.h) = bc4196768184baca74068a48bb47413c7254d1ce
 SHA1 (patch-tools_lldb-mi_MICmnBase.cpp) = 851c82ac61e1241018755fbd7236af00379ac986
 SHA1 (patch-tools_lldb-mi_MICmnBase.h) = f550d5e10bcf02fb46472733acdbb820791f22e5
 SHA1 (patch-tools_lldb-mi_MIDriver.cpp) = bf1b5399e82bcfe54d6d852f64ed155328f2064d
diff --git a/lldb-netbsd/patches/patch-include_lldb_Host_netbsd_ProcessLauncherNetBSD.h b/lldb-netbsd/patches/patch-include_lldb_Host_netbsd_ProcessLauncherNetBSD.h
new file mode 100644
index 0000000..ab6d9a6
--- /dev/null
+++ b/lldb-netbsd/patches/patch-include_lldb_Host_netbsd_ProcessLauncherNetBSD.h
@@ -0,0 +1,30 @@
+$NetBSD$
+
+--- include/lldb/Host/netbsd/ProcessLauncherNetBSD.h.orig	2016-12-17 13:17:22.052552467 +0000
++++ include/lldb/Host/netbsd/ProcessLauncherNetBSD.h
+@@ -0,0 +1,25 @@
++//===-- ProcessLauncherAndroid.h --------------------------------*- C++ -*-===//
++//
++//                     The LLVM Compiler Infrastructure
++//
++// This file is distributed under the University of Illinois Open Source
++// License. See LICENSE.TXT for details.
++//
++//===----------------------------------------------------------------------===//
++
++#ifndef lldb_Host_android_ProcessLauncherAndroid_h_
++#define lldb_Host_android_ProcessLauncherAndroid_h_
++
++#include "lldb/Host/ProcessLauncher.h"
++
++namespace lldb_private {
++
++class ProcessLauncherNetBSD : public ProcessLauncher {
++public:
++  virtual HostProcess LaunchProcess(const ProcessLaunchInfo &launch_info,
++                                    Error &error);
++};
++
++} // end of namespace lldb_private
++
++#endif
diff --git a/lldb-netbsd/patches/patch-include_lldb_Host_netbsd_Ptrace.h b/lldb-netbsd/patches/patch-include_lldb_Host_netbsd_Ptrace.h
new file mode 100644
index 0000000..0010a08
--- /dev/null
+++ b/lldb-netbsd/patches/patch-include_lldb_Host_netbsd_Ptrace.h
@@ -0,0 +1,21 @@
+$NetBSD$
+
+--- include/lldb/Host/netbsd/Ptrace.h.orig	2016-12-17 13:20:19.546597274 +0000
++++ include/lldb/Host/netbsd/Ptrace.h
+@@ -9,8 +9,8 @@
+ 
+ // This file defines ptrace functions & structures
+ 
+-#ifndef liblldb_Host_linux_Ptrace_h_
+-#define liblldb_Host_linux_Ptrace_h_
++#ifndef liblldb_Host_netbsd_Ptrace_h_
++#define liblldb_Host_netbsd_Ptrace_h_
+ 
+ #include <sys/ptrace.h>
+ 
+@@ -54,4 +54,4 @@ typedef int __ptrace_request;
+ 
+ #define LLDB_PTRACE_NT_ARM_TLS 0x401 // ARM TLS register
+ 
+-#endif // liblldb_Host_linux_Ptrace_h_
++#endif // liblldb_Host_netbsd_Ptrace_h_
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_CMakeLists.txt b/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_CMakeLists.txt
index b862bd8..aca460d 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_CMakeLists.txt
+++ b/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_CMakeLists.txt
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- source/Plugins/Process/NetBSD/CMakeLists.txt.orig	2016-12-17 13:00:53.140016397 +0000
+--- source/Plugins/Process/NetBSD/CMakeLists.txt.orig	2016-12-17 13:23:23.781825229 +0000
 +++ source/Plugins/Process/NetBSD/CMakeLists.txt
 @@ -0,0 +1,12 @@
 +include_directories(.)
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp b/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp
index 508b7a9..e15fe2b 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp
+++ b/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- source/Plugins/Process/NetBSD/NativeProcessNetBSD.cpp.orig	2016-12-17 13:00:53.143603907 +0000
+--- source/Plugins/Process/NetBSD/NativeProcessNetBSD.cpp.orig	2016-12-17 13:23:23.782610208 +0000
 +++ source/Plugins/Process/NetBSD/NativeProcessNetBSD.cpp
-@@ -0,0 +1,2756 @@
+@@ -0,0 +1,2753 @@
 +//===-- NativeProcessNetBSD.cpp -------------------------------- -*- C++ -*-===//
 +//
 +//                     The LLVM Compiler Infrastructure
@@ -38,7 +38,7 @@ $NetBSD$
 +#include "lldb/Host/ThreadLauncher.h"
 +#include "lldb/Host/common/NativeBreakpoint.h"
 +#include "lldb/Host/common/NativeRegisterContext.h"
-+#include "lldb/Host/linux/ProcessLauncherNetBSD.h"
++#include "lldb/Host/netbsd/ProcessLauncherNetBSD.h"
 +#include "lldb/Symbol/ObjectFile.h"
 +#include "lldb/Target/Process.h"
 +#include "lldb/Target/ProcessLaunchInfo.h"
@@ -50,12 +50,10 @@ $NetBSD$
 +#include "NativeThreadNetBSD.h"
 +#include "Plugins/Process/POSIX/ProcessPOSIXLog.h"
 +#include "ProcFileReader.h"
-+#include "Procfs.h"
 +
 +// System includes - They have to be included after framework includes because
 +// they define some
 +// macros which collide with variable names in other modules
-+#include <linux/unistd.h>
 +#include <sys/socket.h>
 +
 +#include <sys/syscall.h>
@@ -63,8 +61,7 @@ $NetBSD$
 +#include <sys/user.h>
 +#include <sys/wait.h>
 +
-+#include "lldb/Host/linux/Ptrace.h"
-+#include "lldb/Host/linux/Uio.h"
++#include "lldb/Host/netbsd/Ptrace.h"
 +
 +// Support hardware breakpoints in case it has not been defined
 +#ifndef TRAP_HWBKPT
@@ -73,7 +70,7 @@ $NetBSD$
 +
 +using namespace lldb;
 +using namespace lldb_private;
-+using namespace lldb_private::process_linux;
++using namespace lldb_private::process_netbsd;
 +using namespace llvm;
 +
 +// Private bits we only need internally.
@@ -284,19 +281,19 @@ $NetBSD$
 +  if (!error.Success())
 +    return error;
 +
-+  std::shared_ptr<NativeProcessNetBSD> native_process_linux_sp(
++  std::shared_ptr<NativeProcessNetBSD> native_process_netbsd_sp(
 +      new NativeProcessNetBSD());
 +
-+  if (!native_process_linux_sp->RegisterNativeDelegate(native_delegate)) {
++  if (!native_process_netbsd_sp->RegisterNativeDelegate(native_delegate)) {
 +    error.SetErrorStringWithFormat("failed to register the native delegate");
 +    return error;
 +  }
 +
-+  native_process_linux_sp->AttachToInferior(mainloop, pid, error);
++  native_process_netbsd_sp->AttachToInferior(mainloop, pid, error);
 +  if (!error.Success())
 +    return error;
 +
-+  native_process_sp = native_process_linux_sp;
++  native_process_sp = native_process_netbsd_sp;
 +  return error;
 +}
 +
@@ -1927,7 +1924,7 @@ $NetBSD$
 +  // architecture.  Need MIPS support here.
 +  static const uint8_t g_aarch64_opcode[] = {0x00, 0x00, 0x20, 0xd4};
 +  // The ARM reference recommends the use of 0xe7fddefe and 0xdefe but the
-+  // linux kernel does otherwise.
++  // netbsd kernel does otherwise.
 +  static const uint8_t g_arm_breakpoint_opcode[] = {0xf0, 0x01, 0xf0, 0xe7};
 +  static const uint8_t g_i386_opcode[] = {0xCC};
 +  static const uint8_t g_mips64_opcode[] = {0x00, 0x00, 0x00, 0x0d};
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h b/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h
index 9e8d9e2..9a8534e 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h
+++ b/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- source/Plugins/Process/NetBSD/NativeProcessNetBSD.h.orig	2016-12-17 13:00:53.145447707 +0000
+--- source/Plugins/Process/NetBSD/NativeProcessNetBSD.h.orig	2016-12-17 13:23:23.783483302 +0000
 +++ source/Plugins/Process/NetBSD/NativeProcessNetBSD.h
 @@ -0,0 +1,225 @@
 +//===-- NativeProcessNetBSD.h ---------------------------------- -*- C++ -*-===//
@@ -33,7 +33,7 @@ $NetBSD$
 +class Error;
 +class Scalar;
 +
-+namespace process_linux {
++namespace process_netbsd {
 +/// @class NativeProcessNetBSD
 +/// @brief Manages communication with the inferior (debugee) process.
 +///
@@ -224,7 +224,7 @@ $NetBSD$
 +  void SigchldHandler();
 +};
 +
-+} // namespace process_linux
++} // namespace process_netbsd
 +} // namespace lldb_private
 +
 +#endif // #ifndef liblldb_NativeProcessNetBSD_H_
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeRegisterContextNetBSD.cpp b/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeRegisterContextNetBSD.cpp
index 95a6d03..db4368b 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeRegisterContextNetBSD.cpp
+++ b/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeRegisterContextNetBSD.cpp
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- source/Plugins/Process/NetBSD/NativeRegisterContextNetBSD.cpp.orig	2016-12-17 13:00:53.147290220 +0000
+--- source/Plugins/Process/NetBSD/NativeRegisterContextNetBSD.cpp.orig	2016-12-17 13:23:23.783623245 +0000
 +++ source/Plugins/Process/NetBSD/NativeRegisterContextNetBSD.cpp
 @@ -0,0 +1,213 @@
 +//===-- NativeRegisterContextNetBSD.cpp --------------------------*- C++ -*-===//
@@ -17,12 +17,12 @@ $NetBSD$
 +#include "lldb/Core/RegisterValue.h"
 +#include "lldb/Host/common/NativeProcessProtocol.h"
 +#include "lldb/Host/common/NativeThreadProtocol.h"
-+#include "lldb/Host/linux/Ptrace.h"
++#include "lldb/Host/netbsd/Ptrace.h"
 +
 +#include "Plugins/Process/POSIX/ProcessPOSIXLog.h"
 +
 +using namespace lldb_private;
-+using namespace lldb_private::process_linux;
++using namespace lldb_private::process_netbsd;
 +
 +NativeRegisterContextNetBSD::NativeRegisterContextNetBSD(
 +    NativeThreadProtocol &native_thread, uint32_t concrete_frame_idx,
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeRegisterContextNetBSD.h b/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeRegisterContextNetBSD.h
index aa0d15e..72abdbd 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeRegisterContextNetBSD.h
+++ b/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeRegisterContextNetBSD.h
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- source/Plugins/Process/NetBSD/NativeRegisterContextNetBSD.h.orig	2016-12-17 13:00:53.149085298 +0000
+--- source/Plugins/Process/NetBSD/NativeRegisterContextNetBSD.h.orig	2016-12-17 13:23:23.783738014 +0000
 +++ source/Plugins/Process/NetBSD/NativeRegisterContextNetBSD.h
 @@ -0,0 +1,92 @@
 +//===-- NativeRegisterContextNetBSD.h ----------------------------*- C++ -*-===//
@@ -21,7 +21,7 @@ $NetBSD$
 +#include "Plugins/Process/NetBSD/NativeProcessNetBSD.h"
 +
 +namespace lldb_private {
-+namespace process_linux {
++namespace process_netbsd {
 +
 +class NativeRegisterContextNetBSD : public NativeRegisterContextRegisterInfo {
 +public:
@@ -91,7 +91,7 @@ $NetBSD$
 +  virtual Error DoWriteFPR(void *buf, size_t buf_size);
 +};
 +
-+} // namespace process_linux
++} // namespace process_netbsd
 +} // namespace lldb_private
 +
 +#endif // #ifndef lldb_NativeRegisterContextNetBSD_h
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeRegisterContextNetBSD__x86__64.cpp b/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeRegisterContextNetBSD__x86__64.cpp
index 454ccc4..d043cfd 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeRegisterContextNetBSD__x86__64.cpp
+++ b/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeRegisterContextNetBSD__x86__64.cpp
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- source/Plugins/Process/NetBSD/NativeRegisterContextNetBSD_x86_64.cpp.orig	2016-12-17 13:00:53.151215810 +0000
+--- source/Plugins/Process/NetBSD/NativeRegisterContextNetBSD_x86_64.cpp.orig	2016-12-17 13:23:23.784160224 +0000
 +++ source/Plugins/Process/NetBSD/NativeRegisterContextNetBSD_x86_64.cpp
-@@ -0,0 +1,1221 @@
+@@ -0,0 +1,1220 @@
 +//===-- NativeRegisterContextNetBSD_x86_64.cpp ---------------*- C++ -*-===//
 +//
 +//                     The LLVM Compiler Infrastructure
@@ -22,13 +22,12 @@ $NetBSD$
 +#include "lldb/Core/RegisterValue.h"
 +#include "lldb/Host/HostInfo.h"
 +
-+#include "Plugins/Process/Utility/RegisterContextNetBSD_i386.h"
 +#include "Plugins/Process/Utility/RegisterContextNetBSD_x86_64.h"
 +
-+#include <linux/elf.h>
++#include <netbsd/elf.h>
 +
 +using namespace lldb_private;
-+using namespace lldb_private::process_linux;
++using namespace lldb_private::process_netbsd;
 +
 +// ----------------------------------------------------------------------------
 +// Private namespace.
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeRegisterContextNetBSD__x86__64.h b/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeRegisterContextNetBSD__x86__64.h
index 5ad98c2..21886df 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeRegisterContextNetBSD__x86__64.h
+++ b/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeRegisterContextNetBSD__x86__64.h
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- source/Plugins/Process/NetBSD/NativeRegisterContextNetBSD_x86_64.h.orig	2016-12-17 13:00:53.153013274 +0000
+--- source/Plugins/Process/NetBSD/NativeRegisterContextNetBSD_x86_64.h.orig	2016-12-17 13:23:23.784681789 +0000
 +++ source/Plugins/Process/NetBSD/NativeRegisterContextNetBSD_x86_64.h
 @@ -0,0 +1,146 @@
 +//===-- NativeRegisterContextNetBSD_x86_64.h ---------------------*- C++ -*-===//
@@ -22,7 +22,7 @@ $NetBSD$
 +#include "Plugins/Process/Utility/lldb-x86-register-enums.h"
 +
 +namespace lldb_private {
-+namespace process_linux {
++namespace process_netbsd {
 +
 +class NativeProcessNetBSD;
 +
@@ -143,7 +143,7 @@ $NetBSD$
 +  bool IsMPX(uint32_t reg_index) const;
 +};
 +
-+} // namespace process_linux
++} // namespace process_netbsd
 +} // namespace lldb_private
 +
 +#endif // #ifndef lldb_NativeRegisterContextNetBSD_x86_64_h
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeThreadNetBSD.cpp b/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeThreadNetBSD.cpp
index f3292ff..566cc32 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeThreadNetBSD.cpp
+++ b/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeThreadNetBSD.cpp
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- source/Plugins/Process/NetBSD/NativeThreadNetBSD.cpp.orig	2016-12-17 13:00:53.154921656 +0000
+--- source/Plugins/Process/NetBSD/NativeThreadNetBSD.cpp.orig	2016-12-17 13:23:23.784878149 +0000
 +++ source/Plugins/Process/NetBSD/NativeThreadNetBSD.cpp
 @@ -0,0 +1,481 @@
 +//===-- NativeThreadNetBSD.cpp --------------------------------- -*- C++ -*-===//
@@ -24,7 +24,7 @@ $NetBSD$
 +#include "lldb/Core/Log.h"
 +#include "lldb/Core/State.h"
 +#include "lldb/Host/HostNativeThread.h"
-+#include "lldb/Host/linux/Ptrace.h"
++#include "lldb/Host/netbsd/Ptrace.h"
 +#include "lldb/Utility/LLDBAssert.h"
 +#include "lldb/lldb-enumerations.h"
 +
@@ -40,7 +40,7 @@ $NetBSD$
 +
 +using namespace lldb;
 +using namespace lldb_private;
-+using namespace lldb_private::process_linux;
++using namespace lldb_private::process_netbsd;
 +
 +namespace {
 +void LogThreadStopInfo(Log &log, const ThreadStopInfo &stop_info,
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeThreadNetBSD.h b/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeThreadNetBSD.h
index 70795c5..d4aff5b 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeThreadNetBSD.h
+++ b/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeThreadNetBSD.h
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- source/Plugins/Process/NetBSD/NativeThreadNetBSD.h.orig	2016-12-17 13:00:53.156704200 +0000
+--- source/Plugins/Process/NetBSD/NativeThreadNetBSD.h.orig	2016-12-17 13:23:23.784994923 +0000
 +++ source/Plugins/Process/NetBSD/NativeThreadNetBSD.h
-@@ -0,0 +1,117 @@
+@@ -0,0 +1,116 @@
 +//===-- NativeThreadNetBSD.h ----------------------------------- -*- C++ -*-===//
 +//
 +//                     The LLVM Compiler Infrastructure
@@ -25,7 +25,7 @@ $NetBSD$
 +#include <string>
 +
 +namespace lldb_private {
-+namespace process_linux {
++namespace process_netbsd {
 +
 +class NativeProcessNetBSD;
 +
@@ -112,11 +112,10 @@ $NetBSD$
 +  std::string m_stop_description;
 +  using WatchpointIndexMap = std::map<lldb::addr_t, uint32_t>;
 +  WatchpointIndexMap m_watchpoint_index_map;
-+  cpu_set_t m_original_cpu_set; // For single-step workaround.
 +};
 +
 +typedef std::shared_ptr<NativeThreadNetBSD> NativeThreadNetBSDSP;
-+} // namespace process_linux
++} // namespace process_netbsd
 +} // namespace lldb_private
 +
 +#endif // #ifndef liblldb_NativeThreadNetBSD_H_
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_ProcFileReader.cpp b/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_ProcFileReader.cpp
index b42bf03..a532928 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_ProcFileReader.cpp
+++ b/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_ProcFileReader.cpp
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- source/Plugins/Process/NetBSD/ProcFileReader.cpp.orig	2016-12-17 13:00:53.158464035 +0000
+--- source/Plugins/Process/NetBSD/ProcFileReader.cpp.orig	2016-12-17 13:23:23.785197270 +0000
 +++ source/Plugins/Process/NetBSD/ProcFileReader.cpp
 @@ -0,0 +1,103 @@
 +//===-- ProcFileReader.cpp --------------------------------------*- C++ -*-===//
@@ -29,7 +29,7 @@ $NetBSD$
 +#include "lldb/Core/Error.h"
 +
 +using namespace lldb_private;
-+using namespace lldb_private::process_linux;
++using namespace lldb_private::process_netbsd;
 +
 +lldb::DataBufferSP ProcFileReader::ReadIntoDataBuffer(lldb::pid_t pid,
 +                                                      const char *name) {
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_ProcFileReader.h b/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_ProcFileReader.h
index 4392b97..9d0f966 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_ProcFileReader.h
+++ b/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_ProcFileReader.h
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- source/Plugins/Process/NetBSD/ProcFileReader.h.orig	2016-12-17 13:00:53.160209898 +0000
+--- source/Plugins/Process/NetBSD/ProcFileReader.h.orig	2016-12-17 13:23:23.785303988 +0000
 +++ source/Plugins/Process/NetBSD/ProcFileReader.h
 @@ -0,0 +1,37 @@
 +//===-- ProcFileReader.h ----------------------------------------*- C++ -*-===//
@@ -21,7 +21,7 @@ $NetBSD$
 +#include "lldb/lldb-types.h"
 +
 +namespace lldb_private {
-+namespace process_linux {
++namespace process_netbsd {
 +
 +class ProcFileReader {
 +public:
@@ -36,7 +36,7 @@ $NetBSD$
 +                    std::function<bool(const std::string &line)> line_parser);
 +};
 +
-+} // namespace process_linux
++} // namespace process_netbsd
 +} // namespace lldb_private
 +
 +#endif // #ifndef liblldb_ProcFileReader_h_
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_Procfs.h b/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_Procfs.h
index bbaf61a..1418fe6 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_Procfs.h
+++ b/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_Procfs.h
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- source/Plugins/Process/NetBSD/Procfs.h.orig	2016-12-17 13:00:53.161956039 +0000
+--- source/Plugins/Process/NetBSD/Procfs.h.orig	2016-12-17 13:23:23.785403906 +0000
 +++ source/Plugins/Process/NetBSD/Procfs.h
 @@ -0,0 +1,31 @@
 +//===-- Procfs.h ---------------------------------------------- -*- C++ -*-===//
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_SingleStepCheck.cpp b/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_SingleStepCheck.cpp
index ad34c79..5b21ff8 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_SingleStepCheck.cpp
+++ b/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_SingleStepCheck.cpp
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- source/Plugins/Process/NetBSD/SingleStepCheck.cpp.orig	2016-12-17 13:00:53.163732700 +0000
+--- source/Plugins/Process/NetBSD/SingleStepCheck.cpp.orig	2016-12-17 13:23:23.785537353 +0000
 +++ source/Plugins/Process/NetBSD/SingleStepCheck.cpp
 @@ -0,0 +1,166 @@
 +//===-- SingleStepCheck.cpp ----------------------------------- -*- C++ -*-===//
@@ -25,9 +25,9 @@ $NetBSD$
 +
 +#include "lldb/Core/Error.h"
 +#include "lldb/Core/Log.h"
-+#include "lldb/Host/linux/Ptrace.h"
++#include "lldb/Host/netbsd/Ptrace.h"
 +
-+using namespace lldb_private::process_linux;
++using namespace lldb_private::process_netbsd;
 +
 +#if defined(__arm64__) || defined(__aarch64__)
 +namespace {
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_SingleStepCheck.h b/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_SingleStepCheck.h
index 0d55507..d7b30d4 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_SingleStepCheck.h
+++ b/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_SingleStepCheck.h
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- source/Plugins/Process/NetBSD/SingleStepCheck.h.orig	2016-12-17 13:00:53.165484448 +0000
+--- source/Plugins/Process/NetBSD/SingleStepCheck.h.orig	2016-12-17 13:23:23.785649014 +0000
 +++ source/Plugins/Process/NetBSD/SingleStepCheck.h
 @@ -0,0 +1,40 @@
 +//===-- SingleStepCheck.h ------------------------------------- -*- C++ -*-===//
@@ -16,13 +16,13 @@ $NetBSD$
 +#define liblldb_SingleStepCheck_H_
 +
 +namespace lldb_private {
-+namespace process_linux {
++namespace process_netbsd {
 +
 +namespace impl {
 +extern bool SingleStepWorkaroundNeeded();
 +}
 +
-+// arm64 linux had a bug which prevented single-stepping and watchpoints from
++// arm64 netbsd had a bug which prevented single-stepping and watchpoints from
 +// working on non-boot
 +// cpus, due to them being incorrectly initialized after coming out of suspend.
 +// This issue is
@@ -32,14 +32,14 @@ $NetBSD$
 +// step operations on
 +// the boot cpu.
 +//
-+// The underlying issue has been fixed in android N and linux 4.4. This code can
++// The underlying issue has been fixed in android N and netbsd 4.4. This code can
 +// be removed once
 +// these systems become obsolete.
 +inline bool SingleStepWorkaroundNeeded() {
 +  static bool value = impl::SingleStepWorkaroundNeeded();
 +  return value;
 +}
-+} // end namespace process_linux
++} // end namespace process_netbsd
 +} // end namespace lldb_private
 +
 +#endif // #ifndef liblldb_SingleStepCheck_H_


Home | Main Index | Thread Index | Old Index