pkgsrc-WIP-changes archive

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

lldb-netbsd: Rediff patches to make it buildable



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Thu May 25 21:33:25 2017 +0200
Changeset:	fc0a83621c13480dd0311ea1f18340ab1b9d4bd9

Modified Files:
	lldb-netbsd/distinfo
	lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp
	lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h

Log Message:
lldb-netbsd: Rediff patches to make it buildable

Too many noise with local and pending upstream patches.

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=fc0a83621c13480dd0311ea1f18340ab1b9d4bd9

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

diffstat:
 lldb-netbsd/distinfo                               |   4 +-
 ..._Plugins_Process_NetBSD_NativeProcessNetBSD.cpp | 467 +++------------------
 ...ce_Plugins_Process_NetBSD_NativeProcessNetBSD.h |  20 -
 3 files changed, 52 insertions(+), 439 deletions(-)

diffs:
diff --git a/lldb-netbsd/distinfo b/lldb-netbsd/distinfo
index 8c747f6e9a..1b541dd7aa 100644
--- a/lldb-netbsd/distinfo
+++ b/lldb-netbsd/distinfo
@@ -13,7 +13,7 @@ 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-source_Plugins_ObjectFile_ELF_ObjectFileELF.cpp) = 76d47d654951d36dc493611dfa636c1dcff0c3af
-SHA1 (patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp) = b0bf56a6229a014601f17f4042f498b7eeeb2a5c
-SHA1 (patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h) = da6c430a4932f0c3feee389082fad4ef34360b9e
+SHA1 (patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp) = 776e0826e3c780a4a5d28009ec772a00bcece87b
+SHA1 (patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h) = adc83b19e793491b1c6ea0fd8b46cd9f32e592fc
 SHA1 (patch-source_Plugins_Process_elf-core_ProcessElfCore.cpp) = cdfb65a14116c3bd3d3ad977328e2b0c4ae4f9aa
 SHA1 (patch-source_Plugins_Process_elf-core_ProcessElfCore.h) = 510ab7ce38a7ec88375333eb1483d07d6be743b6
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 9213a36ac0..00447a5865 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp
+++ b/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp
@@ -2,429 +2,62 @@ $NetBSD$
 
 --- source/Plugins/Process/NetBSD/NativeProcessNetBSD.cpp.orig	2017-05-24 01:55:02.000000000 +0000
 +++ source/Plugins/Process/NetBSD/NativeProcessNetBSD.cpp
-@@ -207,7 +207,8 @@ void NativeProcessNetBSD::MonitorSIGSTOP
-     // Handle SIGSTOP from LLGS (LLDB GDB Server)
-     if (info.psi_siginfo.si_code == SI_USER &&
-         info.psi_siginfo.si_pid == ::getpid()) {
--      /* Stop Tracking All Threads attached to Process */
-+      // Stop Tracking All Threads attached to Process
-+      // SIGSTOP is always passed to all LWPs
-       for (const auto &thread_sp : m_threads) {
-         static_pointer_cast<NativeThreadNetBSD>(thread_sp)->SetStoppedBySignal(
-             SIGSTOP, &info.psi_siginfo);
-@@ -229,21 +230,32 @@ void NativeProcessNetBSD::MonitorSIGTRAP
-   }
+@@ -167,8 +167,6 @@ NativeProcessNetBSD::NativeProcessNetBSD
  
-   switch (info.psi_siginfo.si_code) {
--  case TRAP_BRKPT:
--    for (const auto &thread_sp : m_threads) {
--      static_pointer_cast<NativeThreadNetBSD>(thread_sp)
--          ->SetStoppedByBreakpoint();
--      FixupBreakpointPCAsNeeded(
--          *static_pointer_cast<NativeThreadNetBSD>(thread_sp));
-+  case TRAP_BRKPT: {
-+    size_t index;
-+    Status error = GetThreadIndexByTid(info.psi_lwpid, index);
-+    if (error.Fail()) {
-+      LLDB_LOG(log, "failed to find thread by tid: {0}", error);
-+      SetState(StateType::eStateInvalid);
-+      return;
-     }
-+    static_pointer_cast<NativeThreadNetBSD>(m_threads[index])
-+        ->SetStoppedByBreakpoint();
-+    FixupBreakpointPCAsNeeded(
-+        *static_pointer_cast<NativeThreadNetBSD>(m_threads[index]));
-     SetState(StateType::eStateStopped, true);
--    break;
--  case TRAP_TRACE:
--    for (const auto &thread_sp : m_threads) {
--      static_pointer_cast<NativeThreadNetBSD>(thread_sp)->SetStoppedByTrace();
-+  } break;
-+  case TRAP_TRACE: {
-+    size_t index;
-+    Status error = GetThreadIndexByTid(info.psi_lwpid, index);
-+    if (error.Fail()) {
-+      LLDB_LOG(log, "failed to find thread by tid: {0}", error);
-+      SetState(StateType::eStateInvalid);
-+      return;
-     }
-+    static_pointer_cast<NativeThreadNetBSD>(m_threads[index])
-+        ->SetStoppedByTrace();
-     SetState(StateType::eStateStopped, true);
--    break;
-+  } break;
-   case TRAP_EXEC: {
-     Status error = ReinitializeThreads();
-     if (error.Fail()) {
-@@ -254,11 +266,59 @@ void NativeProcessNetBSD::MonitorSIGTRAP
-     // Let our delegate know we have just exec'd.
-     NotifyDidExec();
- 
--    for (const auto &thread_sp : m_threads) {
--      static_pointer_cast<NativeThreadNetBSD>(thread_sp)->SetStoppedByExec();
--    }
-+    // There is only one thread
-+    static_pointer_cast<NativeThreadNetBSD>(m_threads[0])->SetStoppedByExec();
-     SetState(StateType::eStateStopped, true);
-   } break;
-+  case TRAP_LWP: {
-+    ptrace_state_t state;
-+    Status error =
-+        PtraceWrapper(PT_GET_PROCESS_STATE, GetID(), &state, sizeof(state));
-+    if (error.Fail()) {
-+      LLDB_LOG(log,
-+               "received error while checking process state, "
-+               " pid = {0}, LWP = {1}, error = {2}",
-+               GetID(), info.psi_lwpid, error);
-+    }
-+    switch (state.pe_report_event) {
-+    case PTRACE_LWP_CREATE: {
-+      auto thread = AddThread(state.pe_lwp);
-+      switch (GetState()) {
-+      case eStateRunning:
-+        thread->SetRunning();
-+        break;
-+      case eStateStepping:
-+        thread->SetStepping();
-+        break;
-+      default:
-+        llvm_unreachable("Unexpected state");
-+      }
-+    } break;
-+    case PTRACE_LWP_EXIT:
-+      error = RemoveThread(state.pe_lwp);
-+      if (error.Fail()) {
-+        LLDB_LOG(log, "received error while remioving thread: {0} ", error);
-+      }
-+      break;
-+    default:
-+      llvm_unreachable("Unexpected state");
-+    };
-+    switch (GetState()) {
-+    case eStateRunning:
-+      error = NativeProcessNetBSD::PtraceWrapper(PT_CONTINUE, GetID(),
-+                                                 (void *)1, 0);
-+      break;
-+    case eStateStepping:
-+      error =
-+          NativeProcessNetBSD::PtraceWrapper(PT_STEP, GetID(), (void *)1, 0);
-+      break;
-+    default:
-+      llvm_unreachable("Unexpected state");
-+    }
-+    if (error.Fail()) {
-+      LLDB_LOG(log, "received error while resuming process: {0} ", error);
-+    }
-+  } break;
-   case TRAP_DBREG: {
-     // If a watchpoint was hit, report it
-     uint32_t wp_index;
-@@ -267,16 +327,25 @@ void NativeProcessNetBSD::MonitorSIGTRAP
-             ->GetRegisterContext()
-             ->GetWatchpointHitIndex(wp_index,
-                                     (uintptr_t)info.psi_siginfo.si_addr);
--    if (error.Fail())
-+    if (error.Fail()) {
-       LLDB_LOG(log,
-                "received error while checking for watchpoint hits, pid = "
-                "{0}, LWP = {1}, error = {2}",
-                GetID(), info.psi_lwpid, error);
-+      SetState(StateType::eStateInvalid);
-+      return;
-+    }
-     if (wp_index != LLDB_INVALID_INDEX32) {
--      for (const auto &thread_sp : m_threads) {
--        static_pointer_cast<NativeThreadNetBSD>(thread_sp)
--            ->SetStoppedByWatchpoint(wp_index);
-+      size_t index;
-+      Status error = GetThreadIndexByTid(info.psi_lwpid, index);
-+      if (error.Fail()) {
-+        LLDB_LOG(log, "failed to find thread by tid: {0}", error);
-+        SetState(StateType::eStateInvalid);
-+        return;
-       }
-+      static_pointer_cast<NativeThreadNetBSD>(m_threads[index])
-+          ->SetStoppedByWatchpoint(wp_index);
-+
-       SetState(StateType::eStateStopped, true);
-       break;
-     }
-@@ -287,19 +356,33 @@ void NativeProcessNetBSD::MonitorSIGTRAP
-                 ->GetRegisterContext()
-                 ->GetHardwareBreakHitIndex(bp_index,
-                                            (uintptr_t)info.psi_siginfo.si_addr);
--    if (error.Fail())
-+    if (error.Fail()) {
-       LLDB_LOG(log,
-                "received error while checking for hardware "
-                "breakpoint hits, pid = {0}, LWP = {1}, error = {2}",
-                GetID(), info.psi_lwpid, error);
-+      SetState(StateType::eStateInvalid);
-+      return;
-+    }
-     if (bp_index != LLDB_INVALID_INDEX32) {
--      for (const auto &thread_sp : m_threads) {
--        static_pointer_cast<NativeThreadNetBSD>(thread_sp)
--            ->SetStoppedByBreakpoint();
-+      size_t index;
-+      Status error = GetThreadIndexByTid(info.psi_lwpid, index);
-+      if (error.Fail()) {
-+        LLDB_LOG(log, "failed to find thread by tid: {0}", error);
-+        SetState(StateType::eStateInvalid);
-+        return;
-       }
-+      static_pointer_cast<NativeThreadNetBSD>(m_threads[index])
-+          ->SetStoppedByBreakpoint();
-       SetState(StateType::eStateStopped, true);
-       break;
-     }
-+
-+    LLDB_LOG(log,
-+             "received unknown hardware debug register trap, "
-+             "pid = {0}, LWP = {1}",
-+             GetID(), info.psi_lwpid);
-+    SetState(StateType::eStateInvalid);
-   } break;
-   }
- }
-@@ -311,10 +394,23 @@ void NativeProcessNetBSD::MonitorSignal(
-   const auto siginfo_err =
-       PtraceWrapper(PT_GET_SIGINFO, pid, &info, sizeof(info));
- 
--  for (const auto &thread_sp : m_threads) {
--    static_pointer_cast<NativeThreadNetBSD>(thread_sp)->SetStoppedBySignal(
--        info.psi_siginfo.si_signo, &info.psi_siginfo);
-+  if (info.psi_lwpid == 0) {
-+    for (const auto &thread_sp : m_threads) {
-+      static_pointer_cast<NativeThreadNetBSD>(thread_sp)->SetStoppedBySignal(
-+          info.psi_siginfo.si_signo, &info.psi_siginfo);
-+    }
-+  } else {
-+    size_t index;
-+    Status error = GetThreadIndexByTid(info.psi_lwpid, index);
-+    if (error.Fail()) {
-+      LLDB_LOG(log, "failed to find thread by tid: {0}", error);
-+      SetState(StateType::eStateInvalid);
-+      return;
-+    }
-+    static_pointer_cast<NativeThreadNetBSD>(m_threads[index])
-+        ->SetStoppedBySignal(info.psi_siginfo.si_signo, &info.psi_siginfo);
-   }
-+
-   SetState(StateType::eStateStopped, true);
- }
- 
-@@ -448,51 +544,73 @@ Status NativeProcessNetBSD::Resume(const
-   const ResumeAction *const action =
-       resume_actions.GetActionForThread(thread_sp->GetID(), true);
- 
--  if (action == nullptr) {
--    LLDB_LOG(log, "no action specified for pid {0} tid {1}", GetID(),
--             thread_sp->GetID());
--    return Status();
--  }
-+  int sig = 0;
-+  bool step = false;
- 
--  Status error;
-+  for (auto thread_sp : m_threads) {
-+    assert(thread_sp && "thread list should not contain NULL threads");
- 
--  switch (action->state) {
--  case eStateRunning: {
--    // Run the thread, possibly feeding it the signal.
--    error = NativeProcessNetBSD::PtraceWrapper(PT_CONTINUE, GetID(), (void *)1,
--                                               action->signal);
--    if (!error.Success())
--      return error;
--    for (const auto &thread_sp : m_threads) {
-+
-+    const ResumeAction *const action =
-+        resume_actions.GetActionForThread(thread_sp->GetID(), true);
-+
-+    if (action == nullptr) {
-+      LLDB_LOG(log, "no action specified for pid {0} tid {1}", GetID(),
-+               thread_sp->GetID());
-+      continue;
-+    }
-+
-+    LLDB_LOG(log, "processing resume action state {0} for pid {1} tid {2}",
-+             action->state, GetID(), thread_sp->GetID());
-+
-+    sig = action->signal; // No support for several signals per LWP
-+
-+    switch (action->state) {
-+    case eStateRunning: {
-+      // Run the thread, possibly feeding it the signal.
-+      Status error = NativeProcessNetBSD::PtraceWrapper(PT_CLEARSTEP, GetID(), 0,
-+                                                       action->tid);
-+      if (!error.Success())
-+        return error;
-       static_pointer_cast<NativeThreadNetBSD>(thread_sp)->SetRunning();
-+    } break;
-+    case eStateStepping: {
-+      // Run the thread, possibly feeding it the signal.
-+      Status error = NativeProcessNetBSD::PtraceWrapper(PT_SETSTEP, GetID(), 0,
-+                                                       action->tid);
-+      if (!error.Success())
-+        return error;
-+      static_pointer_cast<NativeThreadNetBSD>(thread_sp)->SetStepping();
-+      step = true;
-+    } break;
-+
-+    case eStateSuspended:
-+    case eStateStopped:
-+      llvm_unreachable("Unexpected state");
-+
-+    default:
-+      return Status("NativeProcessNetBSD::%s (): unexpected state %s specified "
-+                   "for pid %" PRIu64 ", tid %" PRIu64,
-+                   __FUNCTION__, StateAsCString(action->state), GetID(),
-+                   thread_sp->GetID());
-     }
--    SetState(eStateRunning, true);
--    break;
--  }
--  case eStateStepping:
--    // Run the thread, possibly feeding it the signal.
--    error = NativeProcessNetBSD::PtraceWrapper(PT_STEP, GetID(), (void *)1,
--                                               action->signal);
--    if (!error.Success())
-+
-+    Status error;
-+
-+    error = NativeProcessNetBSD::PtraceWrapper(PT_CONTINUE, GetID(), (void *)1,
-+                                               sig);
-+    if (error.Fail()) {
-       return error;
--    for (const auto &thread_sp : m_threads) {
--      static_pointer_cast<NativeThreadNetBSD>(thread_sp)->SetStepping();
-+
-     }
--    SetState(eStateStepping, true);
--    break;
-+    if (step)
-+      SetState(eStateStepping, true);
-+    else
-+      SetState(eStateRunning, true);
- 
--  case eStateSuspended:
--  case eStateStopped:
--    llvm_unreachable("Unexpected state");
- 
--  default:
--    return Status("NativeProcessNetBSD::%s (): unexpected state %s specified "
--                  "for pid %" PRIu64 ", tid %" PRIu64,
--                  __FUNCTION__, StateAsCString(action->state), GetID(),
--                  thread_sp->GetID());
-+    return Status();
-   }
+ // Handles all waitpid events from the inferior process.
+ void NativeProcessNetBSD::MonitorCallback(lldb::pid_t pid, int signal) {
+-  Log *log(ProcessPOSIXLog::GetLogIfAllCategoriesSet(POSIX_LOG_PROCESS));
 -
--  return Status();
- }
- 
- Status NativeProcessNetBSD::Halt() {
-@@ -812,6 +930,18 @@ Status NativeProcessNetBSD::LaunchInferi
-     return error;
-   }
- 
-+  error = SetDefaultPtraceOpts();
-+  if (error.Fail()) {
-+    LLDB_LOG(log, "failed to set default ptrace options: {0}", error);
-+
-+    // Mark the inferior as invalid.
-+    // FIXME this could really use a new state - eStateLaunchFailure.  For
-+    // now, using eStateInvalid.
-+    SetState(StateType::eStateInvalid);
-+
-+    return error;
-+  }
-+
-   for (const auto &thread_sp : m_threads) {
-     static_pointer_cast<NativeThreadNetBSD>(thread_sp)->SetStoppedBySignal(
-         SIGSTOP);
-@@ -898,6 +1028,42 @@ void NativeProcessNetBSD::SigchldHandler
-     MonitorCallback(wait_pid, signal);
+   switch (signal) {
+   case SIGTRAP:
+     return MonitorSIGTRAP(pid);
+@@ -196,7 +194,6 @@ void NativeProcessNetBSD::MonitorExited(
  }
  
-+Status NativeProcessNetBSD::GetThreadIndexByTid(lldb::tid_t thread_id,
-+                                               size_t &index) {
-+
-+  assert(thread_id > 0);
-+
-+  bool removed = false;
-+  for (decltype(m_threads.size()) i = 0; i < m_threads.size(); i++) {
-+    auto thread = static_pointer_cast<NativeThreadNetBSD>(m_threads[i]);
-+
-+    if (thread->GetID() == thread_id) {
-+      index = i;
-+      return Status();
-+    }
-+  }
-+
-+  return Status("Thread not registered");
-+}
-+
-+Status NativeProcessNetBSD::RemoveThread(lldb::tid_t thread_id) {
-+
-+  Log *log(ProcessPOSIXLog::GetLogIfAllCategoriesSet(POSIX_LOG_THREAD));
-+  LLDB_LOG(log, "pid {0} removing thread with tid {1}", GetID(), thread_id);
-+
-+  size_t index;
-+  Status error = GetThreadIndexByTid(thread_id, index);
-+
-+  if (error.Fail()) {
-+    LLDB_LOG(log, "failed to find thread by tid: {0}", error);
-+    return error;
-+  }
-+
-+  m_threads.erase(m_threads.begin() + index);
-+
-+  return Status();
-+}
-+
- NativeThreadNetBSDSP NativeProcessNetBSD::AddThread(lldb::tid_t thread_id) {
+ void NativeProcessNetBSD::MonitorSIGSTOP(lldb::pid_t pid) {
+-  Log *log(ProcessPOSIXLog::GetLogIfAllCategoriesSet(POSIX_LOG_PROCESS));
+   ptrace_siginfo_t info;
  
-   Log *log(ProcessPOSIXLog::GetLogIfAllCategoriesSet(POSIX_LOG_THREAD));
-@@ -912,6 +1078,7 @@ NativeThreadNetBSDSP NativeProcessNetBSD
+   const auto siginfo_err =
+@@ -306,7 +303,6 @@ void NativeProcessNetBSD::MonitorSIGTRAP
  
-   auto thread_sp = std::make_shared<NativeThreadNetBSD>(this, thread_id);
-   m_threads.push_back(thread_sp);
-+  printf("Added thread thread_id=%" PRIu64 "\n", thread_id);
-   return thread_sp;
+ void NativeProcessNetBSD::MonitorSignal(lldb::pid_t pid, int signal) {
+   Log *log(ProcessPOSIXLog::GetLogIfAllCategoriesSet(POSIX_LOG_PROCESS));
+-
+   ptrace_siginfo_t info;
+   const auto siginfo_err =
+       PtraceWrapper(PT_GET_SIGINFO, pid, &info, sizeof(info));
+@@ -916,8 +912,6 @@ NativeThreadNetBSDSP NativeProcessNetBSD
  }
  
-@@ -945,6 +1112,10 @@ NativeThreadNetBSDSP NativeProcessNetBSD
-     return -1;
-   }
- 
-+  error = SetDefaultPtraceOpts();
-+  if (error.Fail())
-+    return -1;
-+
-   for (const auto &thread_sp : m_threads) {
-     static_pointer_cast<NativeThreadNetBSD>(thread_sp)->SetStoppedBySignal(
-         SIGSTOP);
-@@ -1062,7 +1233,7 @@ Status NativeProcessNetBSD::Reinitialize
-   }
-   // Reinitialize from scratch threads and register them in process
-   while (info.pl_lwpid != 0) {
--    NativeThreadNetBSDSP thread_sp = AddThread(info.pl_lwpid);
-+    AddThread(info.pl_lwpid);
-     error = PtraceWrapper(PT_LWPINFO, GetID(), &info, sizeof(info));
-     if (error.Fail()) {
-       return error;
-@@ -1071,3 +1242,13 @@ Status NativeProcessNetBSD::Reinitialize
+ ::pid_t NativeProcessNetBSD::Attach(lldb::pid_t pid, Status &error) {
+-  Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_PROCESS));
+-
+   if (pid <= 1) {
+     error.SetErrorToGenericError();
+     error.SetErrorString("Attaching to process 1 is not allowed.");
+@@ -1006,7 +1000,7 @@ Status NativeProcessNetBSD::WriteMemory(
+   io.piod_len = size;
+ 
+   do {
+-    io.piod_addr = (void *)(src + bytes_written);
++    io.piod_addr = const_cast<void *>(static_cast<const void *>(src + bytes_written));
+     io.piod_offs = (void *)(addr + bytes_written);
+ 
+     Status error = NativeProcessNetBSD::PtraceWrapper(PT_IO, GetID(), &io);
+@@ -1034,10 +1028,11 @@ NativeProcessNetBSD::GetAuxvData() const
+   ErrorOr<std::unique_ptr<MemoryBuffer>> buf =
+       llvm::MemoryBuffer::getNewMemBuffer(auxv_size);
+ 
+-  struct ptrace_io_desc io = {.piod_op = PIOD_READ_AUXV,
+-                              .piod_offs = 0,
+-                              .piod_addr = (void *)buf.get()->getBufferStart(),
+-                              .piod_len = auxv_size};
++  struct ptrace_io_desc io;
++  io.piod_op = PIOD_READ_AUXV;
++  io.piod_offs = 0;
++  io.piod_addr = const_cast<void *>(static_cast<const void *>(buf.get()->getBufferStart()));
++  io.piod_len = auxv_size;
+ 
+   Status error = NativeProcessNetBSD::PtraceWrapper(PT_IO, GetID(), &io);
  
-   return error;
- }
-+
-+Status NativeProcessNetBSD::SetDefaultPtraceOpts() {
-+  ptrace_event_t event;
-+
-+  // Trace thread (LWP) creation and termination
-+  // These events will trigger SIGTRAP with si_code TRAP_LWP
-+  event.pe_set_event = PTRACE_LWP_CREATE | PTRACE_LWP_EXIT;
-+
-+  return PtraceWrapper(PT_SET_EVENT_MASK, GetID(), &event, sizeof(event));
-+}
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 88a7687786..afc76512f4 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h
+++ b/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h
@@ -1,22 +1,2 @@
 $NetBSD$
 
---- source/Plugins/Process/NetBSD/NativeProcessNetBSD.h.orig	2017-03-30 22:14:30.000000000 +0000
-+++ source/Plugins/Process/NetBSD/NativeProcessNetBSD.h
-@@ -114,6 +114,8 @@ private:
-   // ---------------------------------------------------------------------
-   NativeProcessNetBSD();
- 
-+  Status GetThreadIndexByTid(lldb::tid_t thread_id, size_t &index);
-+  Status RemoveThread(lldb::tid_t thread_id);
-   NativeThreadNetBSDSP AddThread(lldb::tid_t thread_id);
- 
-   Status LaunchInferior(MainLoop &mainloop, ProcessLaunchInfo &launch_info);
-@@ -133,6 +135,8 @@ private:
-   ::pid_t Attach(lldb::pid_t pid, Status &error);
- 
-   Status ReinitializeThreads();
-+
-+  Status SetDefaultPtraceOpts();
- };
- 
- } // namespace process_netbsd


Home | Main Index | Thread Index | Old Index