pkgsrc-WIP-changes archive

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

lldb-netbsd: Reduce diff in PlatformNetBSD::CreateInstance with Linux



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Mon Dec 19 18:17:25 2016 +0100
Changeset:	f240d89b30e61c44e9a09d5a2631df5a7343da76

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

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

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

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 | 58 ++++++++++++++++++++--
 2 files changed, 55 insertions(+), 5 deletions(-)

diffs:
diff --git a/lldb-netbsd/distinfo b/lldb-netbsd/distinfo
index c6065b6..787bf58 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) = d22fdf0ee01ccee13d40e69e791420e8bd195598
+SHA1 (patch-source_Plugins_Platform_NetBSD_PlatformNetBSD.cpp) = 0445b935f0436088d501d46b2b9bec4c655f0f07
 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 f0ea13a..9329607 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_Platform_NetBSD_PlatformNetBSD.cpp
+++ b/lldb-netbsd/patches/patch-source_Plugins_Platform_NetBSD_PlatformNetBSD.cpp
@@ -2,7 +2,15 @@ $NetBSD$
 
 --- source/Plugins/Platform/NetBSD/PlatformNetBSD.cpp.orig	2016-12-17 10:29:30.000000000 +0000
 +++ source/Plugins/Platform/NetBSD/PlatformNetBSD.cpp
-@@ -34,6 +34,12 @@ using namespace lldb;
+@@ -23,6 +23,7 @@
+ #include "lldb/Breakpoint/BreakpointSite.h"
+ #include "lldb/Core/Debugger.h"
+ #include "lldb/Core/Error.h"
++#include "lldb/Core/Log.h"
+ #include "lldb/Core/Module.h"
+ #include "lldb/Core/ModuleSpec.h"
+ #include "lldb/Core/PluginManager.h"
+@@ -34,10 +35,29 @@ using namespace lldb;
  using namespace lldb_private;
  using namespace lldb_private::platform_netbsd;
  
@@ -12,10 +20,52 @@ $NetBSD$
 +/// Code to handle the PlatformNetBSD settings
 +//------------------------------------------------------------------
 +
++//------------------------------------------------------------------
++
  PlatformSP PlatformNetBSD::CreateInstance(bool force, const ArchSpec *arch) {
-   // The only time we create an instance is when we are creating a remote
-   // netbsd platform
-@@ -73,8 +79,6 @@ const char *PlatformNetBSD::GetDescripti
+-  // The only time we create an instance is when we are creating a remote
+-  // netbsd platform
+-  const bool is_host = false;
++  Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_PLATFORM));
++  if (log) {
++    const char *arch_name;
++    if (arch && arch->GetArchitectureName())
++      arch_name = arch->GetArchitectureName();
++    else
++      arch_name = "<null>";
++
++    const char *triple_cstr =
++        arch ? arch->GetTriple().getTriple().c_str() : "<null>";
++
++    log->Printf("PlatformNetBSD::%s(force=%s, arch={%s,%s})", __FUNCTION__,
++                force ? "true" : "false", arch_name, triple_cstr);
++  }
+ 
+   bool create = force;
+   if (create == false && arch && arch->IsValid()) {
+@@ -51,8 +71,19 @@ PlatformSP PlatformNetBSD::CreateInstanc
+       break;
+     }
+   }
+-  if (create)
+-    return PlatformSP(new PlatformNetBSD(is_host));
++
++  if (create) {
++    if (log)
++      log->Printf("PlatformNetBSD::%s() creating remote-netbsd platform",
++                  __FUNCTION__);
++    return PlatformSP(new PlatformNetBSD(false));
++  }
++
++  if (log)
++    log->Printf(
++        "PlatformLinux::%s() aborting creation of remote-netbsd platform",
++        __FUNCTION__);
++
+   return PlatformSP();
+ }
+ 
+@@ -73,8 +104,6 @@ const char *PlatformNetBSD::GetDescripti
      return "Remote NetBSD user platform plug-in.";
  }
  


Home | Main Index | Thread Index | Old Index