lldb-netbsd: Upgrade to r.298111

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: lldb-netbsd: Upgrade to r.298111
From: Kamil Rytarowski <n54%gmx.com@localhost>
Date: Sat, 18 Mar 2017 01:36:15 +0000
Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sat Mar 18 02:36:15 2017 +0100
Changeset:	e297e130724257807d836c561e76fbd070e0d5ca

Modified Files:
	lldb-netbsd/Makefile
	lldb-netbsd/distinfo
	lldb-netbsd/patches/patch-source_Host_netbsd_Host.cpp
	lldb-netbsd/patches/patch-source_Plugins_Process_gdb-remote_GDBRemoteCommunicationServerLLGS.cpp
Removed Files:
	lldb-netbsd/patches/patch-include_lldb_Host_netbsd_HostThreadNetBSD.h
	lldb-netbsd/patches/patch-source_Host_CMakeLists.txt
	lldb-netbsd/patches/patch-source_Host_netbsd_HostThreadNetBSD.cpp
	lldb-netbsd/patches/patch-source_Host_netbsd_ThisThread.cpp

Log Message:
lldb-netbsd: Upgrade to r.298111

The 1st round of rebasing 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=e297e130724257807d836c561e76fbd070e0d5ca

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

diffstat:
 lldb-netbsd/Makefile                               |  2 +-
 lldb-netbsd/distinfo                               |  8 +---
 ...tch-include_lldb_Host_netbsd_HostThreadNetBSD.h | 14 -------
 .../patches/patch-source_Host_CMakeLists.txt       | 12 ------
 .../patches/patch-source_Host_netbsd_Host.cpp      | 43 +---------------------
 .../patch-source_Host_netbsd_HostThreadNetBSD.cpp  | 21 -----------
 .../patch-source_Host_netbsd_ThisThread.cpp        | 23 ------------
 ...gdb-remote_GDBRemoteCommunicationServerLLGS.cpp | 13 +------
 8 files changed, 6 insertions(+), 130 deletions(-)

diffs:
diff --git a/lldb-netbsd/Makefile b/lldb-netbsd/Makefile
index 75e8f01e44..a161b786ee 100644
--- a/lldb-netbsd/Makefile
+++ b/lldb-netbsd/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	lang devel
 
 SVN_REPOSITORIES=	lldb
 SVN_REPO.lldb=		http://llvm.org/svn/llvm-project/lldb/trunk
-SVN_REVISION.lldb=	296360
+SVN_REVISION.lldb=	298111
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://lldb.org/
diff --git a/lldb-netbsd/distinfo b/lldb-netbsd/distinfo
index 7cac777b92..7075ba039a 100644
--- a/lldb-netbsd/distinfo
+++ b/lldb-netbsd/distinfo
@@ -12,15 +12,11 @@ Size (libcxx-3.6.2.src.tar.xz) = 944020 bytes
 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_Host_netbsd_HostThreadNetBSD.h) = 79f207cdb9da2ef57d39eeb307ec6d10cf828925
 SHA1 (patch-source_CMakeLists.txt) = 5dacabc3f39c23bdfd432b5a4895866157b97aa0
 SHA1 (patch-source_Core_FormatEntity.cpp) = d0ccec75b69864f4b6c4e56587bd272f8b0beb01
-SHA1 (patch-source_Host_CMakeLists.txt) = 28c31759dd684ff44d2f3c5a53c97edf8abb3a17
 SHA1 (patch-source_Host_common_Host.cpp) = 7d48b8bb1e4350ba6d3ddc6357b9b8dc82d6b32d
 SHA1 (patch-source_Host_common_NativeProcessProtocol.cpp) = 23cc7da280b2123cf0206f3d5660d2647935edbc
-SHA1 (patch-source_Host_netbsd_Host.cpp) = f18a87c0ac3b1549045a4d9bda964dfc2baa4855
-SHA1 (patch-source_Host_netbsd_HostThreadNetBSD.cpp) = a1b0fbdad062309a845cfefe4469614fbbe9d20e
-SHA1 (patch-source_Host_netbsd_ThisThread.cpp) = f0d32c81bc1b8fe9aeb86519ea46ba2cb16571c2
+SHA1 (patch-source_Host_netbsd_Host.cpp) = 92ea9aa9c21d11126e7532a860e59f408175d8d4
 SHA1 (patch-source_Initialization_SystemInitializerCommon.cpp) = dc270227e68c655753ef5f5168e3fa9a8dab3696
 SHA1 (patch-source_Plugins_DynamicLoader_POSIX-DYLD_DYLDRendezvous.cpp) = 32d683eb388ded96e7f9aedec827202b5b056392
 SHA1 (patch-source_Plugins_DynamicLoader_POSIX-DYLD_DynamicLoaderPOSIXDYLD.cpp) = ed8077e029281f6d1a9f043edc5a3b16d126eea2
@@ -36,6 +32,6 @@ SHA1 (patch-source_Plugins_Process_NetBSD_NativeThreadNetBSD.cpp) = cb8757705327
 SHA1 (patch-source_Plugins_Process_NetBSD_NativeThreadNetBSD.h) = c675af8495a75f99bb60cb4ab3fa36223f1cb6f4
 SHA1 (patch-source_Plugins_Process_elf-core_ThreadElfCore.cpp) = 3427bd2e2de3cd2947123c2f20ed8d5082a16ace
 SHA1 (patch-source_Plugins_Process_gdb-remote_GDBRemoteCommunicationServerCommon.cpp) = 76e3f6a3e0a24a28a2f5a30e8812906f8a2b2649
-SHA1 (patch-source_Plugins_Process_gdb-remote_GDBRemoteCommunicationServerLLGS.cpp) = 150f5564b91eb4e39165e24cd68bda4182be8a7a
+SHA1 (patch-source_Plugins_Process_gdb-remote_GDBRemoteCommunicationServerLLGS.cpp) = 4e3de4e471d81d2d64e9483fb63ccf97841fdf61
 SHA1 (patch-source_Plugins_Process_minidump_ProcessMinidump.cpp) = a71464df2ef56b8b2c8905e8169a85a05cfd27ba
 SHA1 (patch-tools_lldb-server_CMakeLists.txt) = 9804b083a1aa0cb7fa06b840a71c28424ad8e01d
diff --git a/lldb-netbsd/patches/patch-include_lldb_Host_netbsd_HostThreadNetBSD.h b/lldb-netbsd/patches/patch-include_lldb_Host_netbsd_HostThreadNetBSD.h
deleted file mode 100644
index e278507fbf..0000000000
--- a/lldb-netbsd/patches/patch-include_lldb_Host_netbsd_HostThreadNetBSD.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
---- include/lldb/Host/netbsd/HostThreadNetBSD.h.orig	2016-12-17 10:34:14.000000000 +0000
-+++ include/lldb/Host/netbsd/HostThreadNetBSD.h
-@@ -22,8 +22,7 @@ public:
-   HostThreadNetBSD();
-   HostThreadNetBSD(lldb::thread_t thread);
- 
--  static void SetName(lldb::thread_t tid, llvm::StringRef &name);
--  static void GetName(lldb::thread_t tid, llvm::SmallVectorImpl<char> &name);
-+  static void GetName(lldb::tid_t tid, llvm::SmallVectorImpl<char> &name);
- };
- }
- 
diff --git a/lldb-netbsd/patches/patch-source_Host_CMakeLists.txt b/lldb-netbsd/patches/patch-source_Host_CMakeLists.txt
deleted file mode 100644
index f2891f54d5..0000000000
--- a/lldb-netbsd/patches/patch-source_Host_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
---- source/Host/CMakeLists.txt.orig	2017-02-01 14:45:44.000000000 +0000
-+++ source/Host/CMakeLists.txt
-@@ -147,6 +147,7 @@ else()
-       netbsd/HostThreadNetBSD.cpp
-       netbsd/ThisThread.cpp
-       )
-+    list(APPEND LLDB_PLUGINS lldbPluginProcessNetBSD)
-   endif()
- endif()
- 
diff --git a/lldb-netbsd/patches/patch-source_Host_netbsd_Host.cpp b/lldb-netbsd/patches/patch-source_Host_netbsd_Host.cpp
index bfe729b6e5..0e3d835e0c 100644
--- a/lldb-netbsd/patches/patch-source_Host_netbsd_Host.cpp
+++ b/lldb-netbsd/patches/patch-source_Host_netbsd_Host.cpp
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- source/Host/netbsd/Host.cpp.orig	2017-02-27 20:47:53.000000000 +0000
+--- source/Host/netbsd/Host.cpp.orig	2017-03-18 01:35:30.787728386 +0000
 +++ source/Host/netbsd/Host.cpp
 @@ -1,5 +1,4 @@
 -//===-- source/Host/netbsd/Host.cpp ------------------------------*- C++
@@ -9,44 +9,3 @@ $NetBSD$
  //
  //                     The LLVM Compiler Infrastructure
  //
-@@ -260,7 +259,39 @@ bool Host::GetProcessInfo(lldb::pid_t pi
- }
- 
- lldb::DataBufferSP Host::GetAuxvData(lldb_private::Process *process) {
--  return lldb::DataBufferSP();
-+  return GetAuxvData(process->GetID());
-+}
-+
-+lldb::DataBufferSP Host::GetAuxvData(lldb::pid_t pid) {
-+  /*
-+   * ELF_AUX_ENTRIES is currently restricted to kernel
-+   * (<sys/exec_elf.h> r. 1.155 specifies 15)
-+   *
-+   * ptrace(2) returns the whole AUXV including extra fiels after AT_NULL this
-+   * information isn't needed.
-+   */
-+  size_t auxv_size = 100 * sizeof(AuxInfo);
-+  DataBufferSP buf_sp;
-+
-+  std::unique_ptr<DataBufferHeap> buf_ap(new DataBufferHeap(auxv_size, 0));
-+
-+  struct ptrace_io_desc io = {
-+    .piod_op = PIOD_READ_AUXV,
-+    .piod_offs = 0,
-+    .piod_addr = buf_ap->GetBytes(),
-+    .piod_len = auxv_size
-+  };
-+
-+  if (ptrace(PT_IO, pid, &io, 0) == -1) {
-+    perror("ptrace failed on auxv");
-+  } else if (io.piod_len < 1) {
-+    perror("empty result for auxv");
-+  } else {
-+    /* Everything fine */
-+    buf_sp.reset(buf_ap.release());
-+  }
-+
-+  return buf_sp;
- }
- 
- Error Host::ShellExpandArguments(ProcessLaunchInfo &launch_info) {
diff --git a/lldb-netbsd/patches/patch-source_Host_netbsd_HostThreadNetBSD.cpp b/lldb-netbsd/patches/patch-source_Host_netbsd_HostThreadNetBSD.cpp
deleted file mode 100644
index 36041852bc..0000000000
--- a/lldb-netbsd/patches/patch-source_Host_netbsd_HostThreadNetBSD.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
---- source/Host/netbsd/HostThreadNetBSD.cpp.orig	2016-12-17 10:30:35.000000000 +0000
-+++ source/Host/netbsd/HostThreadNetBSD.cpp
-@@ -29,15 +29,7 @@ HostThreadNetBSD::HostThreadNetBSD() {}
- HostThreadNetBSD::HostThreadNetBSD(lldb::thread_t thread)
-     : HostThreadPosix(thread) {}
- 
--void HostThreadNetBSD::SetName(lldb::thread_t thread, llvm::StringRef &name) {
--  ::pthread_setname_np(thread, "%s", const_cast<char *>(name.data()));
--}
--
--void HostThreadNetBSD::GetName(lldb::thread_t thread,
-+void HostThreadNetBSD::GetName(lldb::tid_t thread,
-                                llvm::SmallVectorImpl<char> &name) {
--  char buf[PTHREAD_MAX_NAMELEN_NP];
--  ::pthread_getname_np(thread, buf, PTHREAD_MAX_NAMELEN_NP);
--
-   name.clear();
--  name.append(buf, buf + strlen(buf));
- }
diff --git a/lldb-netbsd/patches/patch-source_Host_netbsd_ThisThread.cpp b/lldb-netbsd/patches/patch-source_Host_netbsd_ThisThread.cpp
deleted file mode 100644
index f4b7b76ae8..0000000000
--- a/lldb-netbsd/patches/patch-source_Host_netbsd_ThisThread.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD$
-
---- source/Host/netbsd/ThisThread.cpp.orig	2016-12-17 10:30:35.000000000 +0000
-+++ source/Host/netbsd/ThisThread.cpp
-@@ -12,15 +12,15 @@
- 
- #include "llvm/ADT/SmallVector.h"
- 
--#include <pthread.h>
-+#include <lwp.h>
- #include <string.h>
- 
- using namespace lldb_private;
- 
- void ThisThread::SetName(llvm::StringRef name) {
--  HostNativeThread::SetName(::pthread_self(), name);
-+//  HostNativeThread::SetName(_lwp_self(), name);
- }
- 
- void ThisThread::GetName(llvm::SmallVectorImpl<char> &name) {
--  HostNativeThread::GetName(::pthread_self(), name);
-+  HostNativeThread::GetName(_lwp_self(), name);
- }
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Process_gdb-remote_GDBRemoteCommunicationServerLLGS.cpp b/lldb-netbsd/patches/patch-source_Plugins_Process_gdb-remote_GDBRemoteCommunicationServerLLGS.cpp
index 276a6289d5..46f134cf9e 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_Process_gdb-remote_GDBRemoteCommunicationServerLLGS.cpp
+++ b/lldb-netbsd/patches/patch-source_Plugins_Process_gdb-remote_GDBRemoteCommunicationServerLLGS.cpp
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp.orig	2017-02-27 20:47:52.000000000 +0000
+--- source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp.orig	2017-03-18 01:35:30.062550938 +0000
 +++ source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp
-@@ -2666,7 +2666,7 @@ GDBRemoteCommunication::PacketResult
+@@ -2665,7 +2665,7 @@ GDBRemoteCommunication::PacketResult
  GDBRemoteCommunicationServerLLGS::Handle_qXfer_auxv_read(
      StringExtractorGDBRemote &packet) {
  // *BSD impls should be able to do this too.
@@ -11,12 +11,3 @@ $NetBSD$
    Log *log(GetLogIfAnyCategoriesSet(LIBLLDB_LOG_PROCESS));
  
    // Parse out the offset.
-@@ -3222,7 +3222,7 @@ void GDBRemoteCommunicationServerLLGS::C
- 
- // Clear any auxv cached data.
- // *BSD impls should be able to do this too.
--#if defined(__linux__)
-+#if defined(__linux__) || defined(__NetBSD__)
-   if (log)
-     log->Printf("GDBRemoteCommunicationServerLLGS::%s clearing auxv buffer "
-                 "(previously %s)",
Prev by Date: lldb-netbsd: Catch up after upstream changes (after rebase)
Next by Date: Makefile: sort
Previous by Thread: lldb-netbsd: Catch up after upstream changes (after rebase)
Next by Thread: Makefile: sort
Indexes:
Home | Main Index | Thread Index | Old Index