lldb-netbsd: Reduce diff in PlatformNetBSD.org with Linux

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

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Mon Dec 19 19:02:28 2016 +0100
Changeset:	9f24252075e9c03eab06b898ea2cabde02f5e5cf

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

Log Message:
lldb-netbsd: Reduce diff in PlatformNetBSD.org with Linux

Non functional changes.

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=9f24252075e9c03eab06b898ea2cabde02f5e5cf

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

diffstat:
 lldb-netbsd/distinfo                               |  2 +-
 ...urce_Plugins_Platform_NetBSD_PlatformNetBSD.cpp | 31 ++++++++++++++--------
 2 files changed, 21 insertions(+), 12 deletions(-)

diffs:
diff --git a/lldb-netbsd/distinfo b/lldb-netbsd/distinfo
index e31b479..c6dab6d 100644
--- a/lldb-netbsd/distinfo
+++ b/lldb-netbsd/distinfo
@@ -22,7 +22,7 @@ SHA1 (patch-source_Host_netbsd_HostThreadNetBSD.cpp) = a1b0fbdad062309a845cfefe4
 SHA1 (patch-source_Host_netbsd_ProcessLauncherNetBSD.cpp) = 8b36c0b8d5c75ce501e4848ca07392a7aab68877
 SHA1 (patch-source_Host_netbsd_ThisThread.cpp) = f0d32c81bc1b8fe9aeb86519ea46ba2cb16571c2
 SHA1 (patch-source_Initialization_SystemInitializerCommon.cpp) = b8a2f94eb71dbd265701fdd62e3d36bc0d7081f1
-SHA1 (patch-source_Plugins_Platform_NetBSD_PlatformNetBSD.cpp) = eca0281443659716f12cc781108b4de4a905e2ca
+SHA1 (patch-source_Plugins_Platform_NetBSD_PlatformNetBSD.cpp) = 9f5b3dec50a85905622fabc4551eb0dab3ef6b3b
 SHA1 (patch-source_Plugins_Process_CMakeLists.txt) = c0168f81da56d9896eb414e6b8bb7262de04ac33
 SHA1 (patch-source_Plugins_Process_NetBSD_CMakeLists.txt) = df17afdf71c29d945c887e318718904793cd48ad
 SHA1 (patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp) = f83c6cdb1c66713707e723a342ddfd864048ddba
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Platform_NetBSD_PlatformNetBSD.cpp b/lldb-netbsd/patches/patch-source_Plugins_Platform_NetBSD_PlatformNetBSD.cpp
index dc68702..a6f9574 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_Platform_NetBSD_PlatformNetBSD.cpp
+++ b/lldb-netbsd/patches/patch-source_Plugins_Platform_NetBSD_PlatformNetBSD.cpp
@@ -65,7 +65,7 @@ $NetBSD$
    return PlatformSP();
  }
  
-@@ -73,8 +104,6 @@ const char *PlatformNetBSD::GetDescripti
+@@ -73,14 +104,11 @@ const char *PlatformNetBSD::GetDescripti
      return "Remote NetBSD user platform plug-in.";
  }
  
@@ -74,7 +74,13 @@ $NetBSD$
  void PlatformNetBSD::Initialize() {
    Platform::Initialize();
  
-@@ -92,8 +121,11 @@ void PlatformNetBSD::Initialize() {
+   if (g_initialize_count++ == 0) {
+ #if defined(__NetBSD__)
+-    // Force a host flag to true for the default platform object.
+     PlatformSP default_platform_sp(new PlatformNetBSD(true));
+     default_platform_sp->SetSystemArchitecture(HostInfo::GetArchitecture());
+     Platform::SetHostPlatform(default_platform_sp);
+@@ -92,8 +120,11 @@ void PlatformNetBSD::Initialize() {
  }
  
  void PlatformNetBSD::Terminate() {
@@ -88,7 +94,7 @@ $NetBSD$
  
    Platform::Terminate();
  }
-@@ -127,20 +159,19 @@ Error PlatformNetBSD::RunShellCommand(co
+@@ -127,20 +158,19 @@ Error PlatformNetBSD::RunShellCommand(co
  }
  
  Error PlatformNetBSD::ResolveExecutable(
@@ -113,7 +119,7 @@ $NetBSD$
        resolved_module_spec.GetFileSpec().SetFile(exe_path, true);
      }
  
-@@ -163,24 +194,46 @@ Error PlatformNetBSD::ResolveExecutable(
+@@ -163,25 +193,46 @@ Error PlatformNetBSD::ResolveExecutable(
        // We may connect to a process and use the provided executable (Don't use
        // local $PATH).
  
@@ -166,21 +172,24 @@ $NetBSD$
 +                                              exe_module_sp, NULL, NULL, NULL);
 +        }
 +      }
-+
-+      // TODO find out why exe_module_sp might be NULL
  
++      // TODO find out why exe_module_sp might be NULL
        if (!exe_module_sp || exe_module_sp->GetObjectFile() == NULL) {
          exe_module_sp.reset();
-@@ -199,7 +252,7 @@ Error PlatformNetBSD::ResolveExecutable(
+         error.SetErrorStringWithFormat(
+@@ -197,9 +248,8 @@ Error PlatformNetBSD::ResolveExecutable(
+       for (uint32_t idx = 0; GetSupportedArchitectureAtIndex(
+                idx, resolved_module_spec.GetArchitecture());
             ++idx) {
-         error =
-             ModuleList::GetSharedModule(resolved_module_spec, exe_module_sp,
+-        error =
+-            ModuleList::GetSharedModule(resolved_module_spec, exe_module_sp,
 -                                        module_search_paths_ptr, NULL, NULL);
-+                                        NULL, NULL, NULL);
++        error = ModuleList::GetSharedModule(resolved_module_spec, exe_module_sp,
++                                            NULL, NULL, NULL);
          // Did we find an executable using one of the
          if (error.Success()) {
            if (exe_module_sp && exe_module_sp->GetObjectFile())
-@@ -234,8 +287,8 @@ Error PlatformNetBSD::ResolveExecutable(
+@@ -234,8 +284,8 @@ Error PlatformNetBSD::ResolveExecutable(
  
  // From PlatformMacOSX only
  Error PlatformNetBSD::GetFileWithUUID(const FileSpec &platform_file,