pkgsrc-WIP-changes archive

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

lldb-netbsd: Update to SVN r. 303965



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sat May 27 22:46:44 2017 +0200
Changeset:	1a2fc99287b7d459e96c038274272b8488a9d2be

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

Log Message:
lldb-netbsd: Update to SVN r. 303965

Rediff local patches, partly merged upstream.

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=1a2fc99287b7d459e96c038274272b8488a9d2be

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                               |  3 +-
 ..._Plugins_Process_NetBSD_NativeProcessNetBSD.cpp | 61 ----------------------
 ...ce_Plugins_Process_NetBSD_NativeProcessNetBSD.h |  2 -
 4 files changed, 2 insertions(+), 66 deletions(-)

diffs:
diff --git a/lldb-netbsd/Makefile b/lldb-netbsd/Makefile
index 75e0017d4e..6924027231 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=	303743
+SVN_REVISION.lldb=	303965
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://lldb.org/
diff --git a/lldb-netbsd/distinfo b/lldb-netbsd/distinfo
index 1b541dd7aa..7af8e585c2 100644
--- a/lldb-netbsd/distinfo
+++ b/lldb-netbsd/distinfo
@@ -13,7 +13,6 @@ 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) = 776e0826e3c780a4a5d28009ec772a00bcece87b
-SHA1 (patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h) = adc83b19e793491b1c6ea0fd8b46cd9f32e592fc
+SHA1 (patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp) = 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 00447a5865..afc76512f4 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp
+++ b/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp
@@ -1,63 +1,2 @@
 $NetBSD$
 
---- source/Plugins/Process/NetBSD/NativeProcessNetBSD.cpp.orig	2017-05-24 01:55:02.000000000 +0000
-+++ source/Plugins/Process/NetBSD/NativeProcessNetBSD.cpp
-@@ -167,8 +167,6 @@ NativeProcessNetBSD::NativeProcessNetBSD
- 
- // Handles all waitpid events from the inferior process.
- void NativeProcessNetBSD::MonitorCallback(lldb::pid_t pid, int signal) {
--  Log *log(ProcessPOSIXLog::GetLogIfAllCategoriesSet(POSIX_LOG_PROCESS));
--
-   switch (signal) {
-   case SIGTRAP:
-     return MonitorSIGTRAP(pid);
-@@ -196,7 +194,6 @@ void NativeProcessNetBSD::MonitorExited(
- }
- 
- void NativeProcessNetBSD::MonitorSIGSTOP(lldb::pid_t pid) {
--  Log *log(ProcessPOSIXLog::GetLogIfAllCategoriesSet(POSIX_LOG_PROCESS));
-   ptrace_siginfo_t info;
- 
-   const auto siginfo_err =
-@@ -306,7 +303,6 @@ void NativeProcessNetBSD::MonitorSIGTRAP
- 
- 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
- }
- 
- ::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);
- 
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h b/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h
deleted file mode 100644
index afc76512f4..0000000000
--- a/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h
+++ /dev/null
@@ -1,2 +0,0 @@
-$NetBSD$
-


Home | Main Index | Thread Index | Old Index