lldb-git: Upgrade userdata patch with upstream review

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Fri Feb 24 01:22:59 2017 +0100
Changeset:	5ed17069bca598ad13012a93762ba2560d39a468

Modified Files:
	lldb-git/distinfo
	lldb-git/patches/patch-source_Plugins_Process_Utility_RegisterContextNetBSD__x86__64.cpp

Log Message:
lldb-git: Upgrade userdata patch with upstream review

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=5ed17069bca598ad13012a93762ba2560d39a468

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

diffstat:
 lldb-git/distinfo                                         |  2 +-
 ...ins_Process_Utility_RegisterContextNetBSD__x86__64.cpp | 15 ++++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diffs:
diff --git a/lldb-git/distinfo b/lldb-git/distinfo
index 57165514ea..2497bbc095 100644
--- a/lldb-git/distinfo
+++ b/lldb-git/distinfo
@@ -13,4 +13,4 @@ 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_Host_common_Socket.cpp) = ca346f85b393f309d526bb2a55a072d1d0455a5b
-SHA1 (patch-source_Plugins_Process_Utility_RegisterContextNetBSD__x86__64.cpp) = 755266e51d86bc697ba828818fdbd117d6193318
+SHA1 (patch-source_Plugins_Process_Utility_RegisterContextNetBSD__x86__64.cpp) = fef8c0a1c462eca936879a1c7447e2545aaea971
diff --git a/lldb-git/patches/patch-source_Plugins_Process_Utility_RegisterContextNetBSD__x86__64.cpp b/lldb-git/patches/patch-source_Plugins_Process_Utility_RegisterContextNetBSD__x86__64.cpp
index 1e6829c950..732b9b9567 100644
--- a/lldb-git/patches/patch-source_Plugins_Process_Utility_RegisterContextNetBSD__x86__64.cpp
+++ b/lldb-git/patches/patch-source_Plugins_Process_Utility_RegisterContextNetBSD__x86__64.cpp
@@ -21,7 +21,7 @@ $NetBSD$
  
  /*
   * src/sys/arch/amd64/include/mcontext.h
-@@ -66,276 +70,24 @@ struct UserArea {
+@@ -66,276 +70,21 @@ struct UserArea {
    GPR gpr;
    uint64_t mc_tlsbase;
    FPR fpr;
@@ -88,8 +88,7 @@ $NetBSD$
 -             LLDB_INVALID_REGNUM, lldb_st##i##_x86_64 },                       \
 -             nullptr, nullptr, nullptr, 0                                      \
 -  }
-+#define DR_OFFSET(reg_index) (LLVM_EXTENSION offsetof(DBG, dr[reg_index]))
- 
+-
 -#define DEFINE_FP_MM(reg, i)                                                   \
 -  {                                                                            \
 -    #reg #i, nullptr, sizeof(uint64_t),                                        \
@@ -122,7 +121,10 @@ $NetBSD$
 -                                   lldb_##reg##i##_x86_64 },                   \
 -                                   nullptr, nullptr, nullptr, 0                \
 -  }
--
++#define DR_OFFSET(reg_index)                                                   \
++  (LLVM_EXTENSION offsetof(UserArea, dbg) +                                    \
++   LLVM_EXTENSION offsetof(DBG, dr[reg_index]))
+ 
 -#define DEFINE_GPR_PSEUDO_32(reg32, reg64)                                     \
 -  {                                                                            \
 -    #reg32, nullptr, 4,                                                        \
@@ -302,11 +304,6 @@ $NetBSD$
 +#define DECLARE_REGISTER_INFOS_X86_64_STRUCT
 +#include "RegisterInfos_x86_64.h"
 +#undef DECLARE_REGISTER_INFOS_X86_64_STRUCT
-+
-+static std::vector<lldb_private::RegisterInfo> &GetSharedRegisterInfoVector() {
-+  static std::vector<lldb_private::RegisterInfo> register_infos;
-+  return register_infos;
-+}
  
  static const RegisterInfo *
  PrivateGetRegisterInfoPtr(const lldb_private::ArchSpec &target_arch) {