pkgsrc-WIP-changes archive

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

lldb-git: Rebase local patch pending upstream to new revision



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Wed May 24 05:25:38 2017 +0200
Changeset:	ded6058e9a3bf89a2e9caadd7acfb23d35b5823b

Modified Files:
	lldb-git/distinfo
	lldb-git/patches/patch-source_Plugins_Process_elf-core_ProcessElfCore.cpp
	lldb-git/patches/patch-source_Plugins_Process_elf-core_ProcessElfCore.h

Log Message:
lldb-git: Rebase local patch pending upstream to new revision

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

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

diffstat:
 lldb-git/distinfo                                  |  4 +--
 ...rce_Plugins_Process_elf-core_ProcessElfCore.cpp | 42 +++++++++++-----------
 ...ource_Plugins_Process_elf-core_ProcessElfCore.h |  4 +--
 3 files changed, 25 insertions(+), 25 deletions(-)

diffs:
diff --git a/lldb-git/distinfo b/lldb-git/distinfo
index df6f4a643f..25baa15383 100644
--- a/lldb-git/distinfo
+++ b/lldb-git/distinfo
@@ -13,5 +13,5 @@ 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) = d7d43c20b34068a5f535b8eeb1af2dc87c2b3175
-SHA1 (patch-source_Plugins_Process_elf-core_ProcessElfCore.cpp) = af35bb785ff14a164c2aa019309cc5e5f0e27989
-SHA1 (patch-source_Plugins_Process_elf-core_ProcessElfCore.h) = 5754bcca237decc7ef8519c54a34840b1869d476
+SHA1 (patch-source_Plugins_Process_elf-core_ProcessElfCore.cpp) = a40965c208b6b2c6d103cdca4b4e8eb9b691adca
+SHA1 (patch-source_Plugins_Process_elf-core_ProcessElfCore.h) = b74b851ce37ee83e1b6cbf32ee4ecad909b7088c
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 6eb8ac24da..e356bef91a 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
@@ -59,7 +59,7 @@ $NetBSD$
  }
  
 -static void ParseNetBSDProcInfo(ThreadData &thread_data, DataExtractor &data) {
-+static Error ParseNetBSDProcInfo(DataExtractor &data, uint32_t &cpi_nlwps,
++static Status ParseNetBSDProcInfo(DataExtractor &data, uint32_t &cpi_nlwps,
 +                                 uint32_t &cpi_signo, uint32_t &cpi_siglwp) {
    lldb::offset_t offset = 0;
  
@@ -67,14 +67,14 @@ $NetBSD$
 +  uint32_t version = data.GetU32(&offset);
    if (version != 1)
 -    return;
-+    return Error(
++    return Status(
 +        "Error parsing NetBSD core(5) notes: Unsupported procinfo version");
  
 -  offset += 4;
 -  thread_data.signo = data.GetU32(&offset);
 +  uint32_t cpisize = data.GetU32(&offset);
 +  if (cpisize != NETBSD::NT_PROCINFO_SIZE)
-+    return Error(
++    return Status(
 +        "Error parsing NetBSD core(5) notes: Unsupported procinfo size");
 +
 +  cpi_signo = data.GetU32(&offset); /* killing signal */
@@ -99,7 +99,7 @@ $NetBSD$
 +  offset += NETBSD::NT_PROCINFO_CPI_NAME_SIZE;
 +  cpi_siglwp = data.GetU32(&offset); /* LWP target of killing signal */
 +
-+  return Error();
++  return Status();
  }
  
  static void ParseOpenBSDProcInfo(ThreadData &thread_data, DataExtractor &data) {
@@ -108,7 +108,7 @@ $NetBSD$
  /// 2) NOTE Entry contains a standard header followed by variable size data.
  ///   (see ELFNote structure)
 -/// 3) A Thread Context in a core file usually described by 3 NOTE entries.
-+Error ProcessElfCore::ParseThreadContextsFromNoteSegment(
++Status ProcessElfCore::ParseThreadContextsFromNoteSegment(
 +    const elf::ELFProgramHeader *segment_header, DataExtractor segment_data) {
 +
 +  assert(segment_header && segment_header->p_type == llvm::ELF::PT_NOTE);
@@ -139,14 +139,14 @@ $NetBSD$
  ///        new thread when it finds NT_PRSTATUS or NT_PRPSINFO NOTE entry.
  ///    For case (b) there may be either one NT_PRPSINFO per thread, or a single
  ///    one that applies to all threads (depending on the platform type).
--Error ProcessElfCore::ParseThreadContextsFromNoteSegment(
-+Error ProcessElfCore::ParseThreadContextsFromNoteSegmentGeneric(
+-Status ProcessElfCore::ParseThreadContextsFromNoteSegment(
++Status ProcessElfCore::ParseThreadContextsFromNoteSegmentGeneric(
      const elf::ELFProgramHeader *segment_header, DataExtractor segment_data) {
 +
    assert(segment_header && segment_header->p_type == llvm::ELF::PT_NOTE);
  
    lldb::offset_t offset = 0;
-@@ -607,21 +686,6 @@ Error ProcessElfCore::ParseThreadContext
+@@ -607,21 +686,6 @@ Status ProcessElfCore::ParseThreadContext
        default:
          break;
        }
@@ -168,7 +168,7 @@ $NetBSD$
      } else if (note.n_name.substr(0, 7) == "OpenBSD") {
        // OpenBSD per-thread information is stored in notes named
        // "OpenBSD@nnn" so match on the initial part of the string.
-@@ -659,7 +723,7 @@ Error ProcessElfCore::ParseThreadContext
+@@ -659,7 +723,7 @@ Status ProcessElfCore::ParseThreadContext
          // The result from FXSAVE is in NT_PRXFPREG for i386 core files
          if (arch.GetCore() == ArchSpec::eCore_x86_64_x86_64)
            thread_data->fpregset = note_data;
@@ -177,7 +177,7 @@ $NetBSD$
            thread_data->fpregset = note_data;
          break;
        case NT_PRPSINFO:
-@@ -717,6 +781,136 @@ Error ProcessElfCore::ParseThreadContext
+@@ -717,6 +781,136 @@ Status ProcessElfCore::ParseThreadContext
    return error;
  }
  
@@ -203,7 +203,7 @@ $NetBSD$
 +///
 +/// For more information see /usr/include/sys/exec_elf.h
 +///
-+Error ProcessElfCore::ParseThreadContextsFromNoteSegmentNetBSD(
++Status ProcessElfCore::ParseThreadContextsFromNoteSegmentNetBSD(
 +    const elf::ELFProgramHeader *segment_header, DataExtractor segment_data) {
 +
 +  assert(segment_header && segment_header->p_type == llvm::ELF::PT_NOTE);
@@ -237,7 +237,7 @@ $NetBSD$
 +
 +    if (name == "NetBSD-CORE") {
 +      if (note.n_type == NETBSD::NT_PROCINFO) {
-+        Error error = ParseNetBSDProcInfo(note_data, nlwps, signo, siglwp);
++        Status error = ParseNetBSDProcInfo(note_data, nlwps, signo, siglwp);
 +        if (error.Fail())
 +          return error;
 +      } else if (note.n_type == NETBSD::NT_AUXV) {
@@ -246,7 +246,7 @@ $NetBSD$
 +    } else if (name.consume_front("NetBSD-CORE@")) {
 +      lldb::tid_t tid;
 +      if (name.getAsInteger(10, tid))
-+        return Error("Error parsing NetBSD core(5) notes: Cannot convert "
++        return Status("Error parsing NetBSD core(5) notes: Cannot convert "
 +                     "LWP ID to integer");
 +
 +      switch (arch.GetMachine()) {
@@ -258,31 +258,31 @@ $NetBSD$
 +          m_thread_data.back().tid = tid;
 +        } else if (note.n_type == NETBSD::AMD64::NT_FPREGS) {
 +          if (m_thread_data.empty() || tid != m_thread_data.back().tid)
-+            return Error("Error parsing NetBSD core(5) notes: Unexpected order "
++            return Status("Error parsing NetBSD core(5) notes: Unexpected order "
 +                         "of NOTEs PT_GETFPREG before PT_GETREG");
 +          m_thread_data.back().fpregset = note_data;
 +        } else {
-+          return Error(
++          return Status(
 +              "Error parsing NetBSD core(5) notes: Unsupported AMD64 NOTE");
 +        }
 +      } break;
 +      default:
-+        return Error(
++        return Status(
 +            "Error parsing NetBSD core(5) notes: Unsupported architecture");
 +      }
 +    } else {
-+      return Error("Error parsing NetBSD core(5) notes: Unrecognized note");
++      return Status("Error parsing NetBSD core(5) notes: Unrecognized note");
 +    }
 +
 +    offset += note_size;
 +  }
 +
 +  if (m_thread_data.empty())
-+    return Error("Error parsing NetBSD core(5) notes: No threads information "
++    return Status("Error parsing NetBSD core(5) notes: No threads information "
 +                 "specified in notes");
 +
 +  if (m_thread_data.size() != nlwps)
-+    return Error("Error parsing NetBSD core(5) notes: Mismatch between the "
++    return Status("Error parsing NetBSD core(5) notes: Mismatch between the "
 +                 "number of LWPs in netbsd_elfcore_procinfo and the number of "
 +                 "LWPs specified by MD notes");
 +
@@ -304,11 +304,11 @@ $NetBSD$
 +    }
 +
 +    if (!passed)
-+      return Error(
++      return Status(
 +          "Error parsing NetBSD core(5) notes: Signal passed to unknown LWP");
 +  }
 +
-+  return Error();
++  return Status();
 +}
 +
  uint32_t ProcessElfCore::GetNumThreadContexts() {
diff --git a/lldb-git/patches/patch-source_Plugins_Process_elf-core_ProcessElfCore.h b/lldb-git/patches/patch-source_Plugins_Process_elf-core_ProcessElfCore.h
index 5b542c7683..869d877f24 100644
--- a/lldb-git/patches/patch-source_Plugins_Process_elf-core_ProcessElfCore.h
+++ b/lldb-git/patches/patch-source_Plugins_Process_elf-core_ProcessElfCore.h
@@ -8,13 +8,13 @@ $NetBSD$
  
 +  // Parse thread(s) data structuresNetBSD(prstatus, prpsinfo) from given NOTE
 +  // segment
-+  lldb_private::Error ParseThreadContextsFromNoteSegmentNetBSD(
++  lldb_private::Status ParseThreadContextsFromNoteSegmentNetBSD(
 +      const elf::ELFProgramHeader *segment_header,
 +      lldb_private::DataExtractor segment_data);
 +
 +  // Parse thread(s) data structuresGeneric(prstatus, prpsinfo) from given NOTE
 +  // segment
-+  lldb_private::Error ParseThreadContextsFromNoteSegmentGeneric(
++  lldb_private::Status ParseThreadContextsFromNoteSegmentGeneric(
 +      const elf::ELFProgramHeader *segment_header,
 +      lldb_private::DataExtractor segment_data);
 +


Home | Main Index | Thread Index | Old Index