pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
lldb-netbsd: Update to SVN 294071 and reduce local diffs
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Sat Feb 4 19:50:12 2017 +0100
Changeset: 0277dd37e7007f89a9d9b7cb3fc9b9a0a04fa94d
Modified Files:
clang-netbsd/Makefile.common
lldb-netbsd/Makefile
lldb-netbsd/PLIST
lldb-netbsd/distinfo
lldb-netbsd/patches/patch-source_Plugins_Platform_NetBSD_PlatformNetBSD.cpp
lldb-netbsd/patches/patch-source_Plugins_Platform_NetBSD_PlatformNetBSD.h
llvm-netbsd/Makefile
llvm-netbsd/PLIST
Log Message:
lldb-netbsd: Update to SVN 294071 and reduce local diffs
Use new option LLDB_USE_SYSTEM_SIX to remove conflict with six.py from pkgsrc.
Reduce patch for PlatformNetBSD*, part of differences addressed upstream by
moving code to shared base class.
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=0277dd37e7007f89a9d9b7cb3fc9b9a0a04fa94d
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
clang-netbsd/Makefile.common | 2 +-
lldb-netbsd/Makefile | 5 +-
lldb-netbsd/PLIST | 13 +-
lldb-netbsd/distinfo | 4 +-
...urce_Plugins_Platform_NetBSD_PlatformNetBSD.cpp | 205 ++++-----------------
...source_Plugins_Platform_NetBSD_PlatformNetBSD.h | 37 +---
llvm-netbsd/Makefile | 2 +-
llvm-netbsd/PLIST | 1 +
8 files changed, 59 insertions(+), 210 deletions(-)
diffs:
diff --git a/clang-netbsd/Makefile.common b/clang-netbsd/Makefile.common
index 38dbdaead6..8b2ca6a87e 100644
--- a/clang-netbsd/Makefile.common
+++ b/clang-netbsd/Makefile.common
@@ -6,7 +6,7 @@ CATEGORIES= lang devel
SVN_REPOSITORIES= clang
SVN_REPO.clang= http://llvm.org/svn/llvm-project/cfe/trunk
-SVN_REVISION.clang= 293902
+SVN_REVISION.clang= 294071
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://clang.llvm.org/
diff --git a/lldb-netbsd/Makefile b/lldb-netbsd/Makefile
index 5fddbeda92..1b92b48ebf 100644
--- a/lldb-netbsd/Makefile
+++ b/lldb-netbsd/Makefile
@@ -5,13 +5,15 @@ CATEGORIES= lang devel
SVN_REPOSITORIES= lldb
SVN_REPO.lldb= http://llvm.org/svn/llvm-project/lldb/trunk
-SVN_REVISION.lldb= 293902
+SVN_REVISION.lldb= 294071
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://lldb.org/
COMMENT= Next generation, high-performance debugger
LICENSE= modified-bsd
+DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
+
WRKSRC= ${WRKDIR}/${PKGBASE}
CONFIGURE_DIRS= ${WRKDIR}/build
CMAKE_ARG_PATH= ${WRKSRC}
@@ -25,6 +27,7 @@ CMAKE_ARGS+= -DLLVM_CONFIG=${LLVM_CONFIG_PATH}
CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
CMAKE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
+CMAKE_ARGS+= -DLLDB_USE_SYSTEM_SIX:BOOL=TRUE
CHECK_PORTABILITY_SKIP= utils/buildit/build_llvm
diff --git a/lldb-netbsd/PLIST b/lldb-netbsd/PLIST
index be49b8ef40..c1047f6ee4 100644
--- a/lldb-netbsd/PLIST
+++ b/lldb-netbsd/PLIST
@@ -99,7 +99,6 @@ include/lldb/Core/Broadcaster.h
include/lldb/Core/ClangForward.h
include/lldb/Core/Communication.h
include/lldb/Core/Connection.h
-include/lldb/Core/ConstString.h
include/lldb/Core/DataBuffer.h
include/lldb/Core/DataBufferHeap.h
include/lldb/Core/DataBufferMemoryMap.h
@@ -108,7 +107,6 @@ include/lldb/Core/DataExtractor.h
include/lldb/Core/Debugger.h
include/lldb/Core/Disassembler.h
include/lldb/Core/EmulateInstruction.h
-include/lldb/Core/Error.h
include/lldb/Core/Event.h
include/lldb/Core/FastDemangle.h
include/lldb/Core/FileLineResolver.h
@@ -133,21 +131,17 @@ include/lldb/Core/PluginInterface.h
include/lldb/Core/PluginManager.h
include/lldb/Core/RangeMap.h
include/lldb/Core/RegisterValue.h
-include/lldb/Core/RegularExpression.h
include/lldb/Core/STLUtils.h
include/lldb/Core/Scalar.h
include/lldb/Core/SearchFilter.h
include/lldb/Core/Section.h
include/lldb/Core/SourceManager.h
include/lldb/Core/State.h
-include/lldb/Core/Stream.h
include/lldb/Core/StreamAsynchronousIO.h
include/lldb/Core/StreamBuffer.h
include/lldb/Core/StreamCallback.h
include/lldb/Core/StreamFile.h
include/lldb/Core/StreamGDBRemote.h
-include/lldb/Core/StreamString.h
-include/lldb/Core/StreamTee.h
include/lldb/Core/StringList.h
include/lldb/Core/StructuredData.h
include/lldb/Core/ThreadSafeDenseMap.h
@@ -461,7 +455,9 @@ include/lldb/Target/Unwind.h
include/lldb/Target/UnwindAssembly.h
include/lldb/Utility/AnsiTerminal.h
include/lldb/Utility/CleanUp.h
+include/lldb/Utility/ConstString.h
include/lldb/Utility/Either.h
+include/lldb/Utility/Error.h
include/lldb/Utility/Iterable.h
include/lldb/Utility/JSON.h
include/lldb/Utility/LLDBAssert.h
@@ -470,10 +466,14 @@ include/lldb/Utility/ProcessStructReader.h
include/lldb/Utility/PseudoTerminal.h
include/lldb/Utility/Range.h
include/lldb/Utility/RegisterNumber.h
+include/lldb/Utility/RegularExpression.h
include/lldb/Utility/SafeMachO.h
include/lldb/Utility/SelectHelper.h
include/lldb/Utility/SharedCluster.h
include/lldb/Utility/SharingPtr.h
+include/lldb/Utility/Stream.h
+include/lldb/Utility/StreamString.h
+include/lldb/Utility/StreamTee.h
include/lldb/Utility/StringExtractor.h
include/lldb/Utility/StringLexer.h
include/lldb/Utility/TaskPool.h
@@ -595,5 +595,4 @@ ${PYSITELIB}/lldb/lldb-argdumper
${PYSITELIB}/lldb/runtime/__init__.py
${PYSITELIB}/lldb/utils/__init__.py
${PYSITELIB}/lldb/utils/symbolication.py
-${PYSITELIB}/six.py
@pkgdir include/lldb/Host/windows/getopt
diff --git a/lldb-netbsd/distinfo b/lldb-netbsd/distinfo
index 967fb3156a..3ea30bc905 100644
--- a/lldb-netbsd/distinfo
+++ b/lldb-netbsd/distinfo
@@ -21,8 +21,8 @@ SHA1 (patch-source_Host_linux_HostInfoLinux.cpp) = fb375b959fe0f08c9e888194c58af
SHA1 (patch-source_Host_netbsd_HostThreadNetBSD.cpp) = a1b0fbdad062309a845cfefe4469614fbbe9d20e
SHA1 (patch-source_Host_netbsd_ThisThread.cpp) = f0d32c81bc1b8fe9aeb86519ea46ba2cb16571c2
SHA1 (patch-source_Initialization_SystemInitializerCommon.cpp) = 80c850b980fe2902f10e441df7a18f428dd1154a
-SHA1 (patch-source_Plugins_Platform_NetBSD_PlatformNetBSD.cpp) = 129e853c1f93f063a0d30c737bcd82e3e589539b
-SHA1 (patch-source_Plugins_Platform_NetBSD_PlatformNetBSD.h) = 4327a21e79378b8f35adb07614adb41c37bbaf61
+SHA1 (patch-source_Plugins_Platform_NetBSD_PlatformNetBSD.cpp) = 8815b6c32192a763523c35f9edd80cba009a08ae
+SHA1 (patch-source_Plugins_Platform_NetBSD_PlatformNetBSD.h) = c95a91f230e3504eb1adc07f1b58ef5805a335fc
SHA1 (patch-source_Plugins_Process_CMakeLists.txt) = c689ff4ec455234f8d506dc9eb8e0ed7f750d426
SHA1 (patch-source_Plugins_Process_NetBSD_CMakeLists.txt) = 483584dad2dba01dccd065435a5d75eedf11b3c6
SHA1 (patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp) = 1553f31a05d79c6df6212836d5e83c6bd7003b3e
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 6b24f19834..5051ee8ceb 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_Platform_NetBSD_PlatformNetBSD.cpp
+++ b/lldb-netbsd/patches/patch-source_Plugins_Platform_NetBSD_PlatformNetBSD.cpp
@@ -1,6 +1,6 @@
$NetBSD$
---- source/Plugins/Platform/NetBSD/PlatformNetBSD.cpp.orig 2016-12-17 10:29:30.000000000 +0000
+--- source/Plugins/Platform/NetBSD/PlatformNetBSD.cpp.orig 2017-02-04 18:35:35.000000000 +0000
+++ source/Plugins/Platform/NetBSD/PlatformNetBSD.cpp
@@ -20,24 +20,107 @@
// Other libraries and framework includes
@@ -8,7 +8,7 @@ $NetBSD$
#include "lldb/Breakpoint/BreakpointLocation.h"
-#include "lldb/Breakpoint/BreakpointSite.h"
#include "lldb/Core/Debugger.h"
- #include "lldb/Core/Error.h"
++#include "lldb/Utility/Error.h"
+#include "lldb/Core/Log.h"
#include "lldb/Core/Module.h"
+#include "lldb/Core/ModuleList.h"
@@ -16,12 +16,13 @@ $NetBSD$
#include "lldb/Core/PluginManager.h"
-#include "lldb/Host/Host.h"
+#include "lldb/Core/State.h"
-+#include "lldb/Core/StreamString.h"
++#include "lldb/Utility/StreamString.h"
+#include "lldb/Host/FileSpec.h"
#include "lldb/Host/HostInfo.h"
+#include "lldb/Interpreter/OptionValueProperties.h"
+#include "lldb/Interpreter/Property.h"
#include "lldb/Target/Process.h"
+-#include "lldb/Utility/Error.h"
+#include "lldb/Target/Target.h"
+
+// Define these constants from NetBSD mman.h for use when targeting
@@ -137,7 +138,7 @@ $NetBSD$
return PlatformSP();
}
-@@ -66,81 +160,57 @@ ConstString PlatformNetBSD::GetPluginNam
+@@ -66,211 +160,51 @@ ConstString PlatformNetBSD::GetPluginNam
}
}
@@ -216,112 +217,7 @@ $NetBSD$
+ PlatformPOSIX::Terminate();
}
- Error PlatformNetBSD::ResolveExecutable(
-- const ModuleSpec &module_spec, lldb::ModuleSP &exe_module_sp,
-+ const ModuleSpec &ms, lldb::ModuleSP &exe_module_sp,
- const FileSpecList *module_search_paths_ptr) {
- Error error;
- // Nothing special to do here, just use the actual file and architecture
-
- char exe_path[PATH_MAX];
-- ModuleSpec resolved_module_spec(module_spec);
-+ ModuleSpec resolved_module_spec(ms);
-
- if (IsHost()) {
-- // If we have "ls" as the module_spec's file, resolve the executable
-- // location based on
-+ // If we have "ls" as the exe_file, resolve the executable location based on
- // the current path variables
- if (!resolved_module_spec.GetFileSpec().Exists()) {
-- module_spec.GetFileSpec().GetPath(exe_path, sizeof(exe_path));
-+ resolved_module_spec.GetFileSpec().GetPath(exe_path, sizeof(exe_path));
- resolved_module_spec.GetFileSpec().SetFile(exe_path, true);
- }
-
-@@ -163,25 +233,46 @@ Error PlatformNetBSD::ResolveExecutable(
- // We may connect to a process and use the provided executable (Don't use
- // local $PATH).
-
-- // Resolve any executable within a bundle on MacOSX
-- Host::ResolveExecutableInBundle(resolved_module_spec.GetFileSpec());
--
-- if (resolved_module_spec.GetFileSpec().Exists()) {
-+ if (resolved_module_spec.GetFileSpec().Exists())
- error.Clear();
-- } else {
-- error.SetErrorStringWithFormat(
-- "the platform is not currently connected, and '%s' doesn't exist "
-- "in the system root.",
-- resolved_module_spec.GetFileSpec().GetPath().c_str());
-- }
-+ else
-+ error.SetErrorStringWithFormat("the platform is not currently "
-+ "connected, and '%s' doesn't exist in "
-+ "the system root.",
-+ exe_path);
- }
- }
-
- if (error.Success()) {
- if (resolved_module_spec.GetArchitecture().IsValid()) {
- error = ModuleList::GetSharedModule(resolved_module_spec, exe_module_sp,
-- module_search_paths_ptr, NULL, NULL);
-+ NULL, NULL, NULL);
-+ if (error.Fail()) {
-+ // If we failed, it may be because the vendor and os aren't known. If
-+ // that is the
-+ // case, try setting them to the host architecture and give it another
-+ // try.
-+ llvm::Triple &module_triple =
-+ resolved_module_spec.GetArchitecture().GetTriple();
-+ bool is_vendor_specified =
-+ (module_triple.getVendor() != llvm::Triple::UnknownVendor);
-+ bool is_os_specified =
-+ (module_triple.getOS() != llvm::Triple::UnknownOS);
-+ if (!is_vendor_specified || !is_os_specified) {
-+ const llvm::Triple &host_triple =
-+ HostInfo::GetArchitecture(HostInfo::eArchKindDefault).GetTriple();
-+
-+ if (!is_vendor_specified)
-+ module_triple.setVendorName(host_triple.getVendorName());
-+ if (!is_os_specified)
-+ module_triple.setOSName(host_triple.getOSName());
-
-+ error = ModuleList::GetSharedModule(resolved_module_spec,
-+ exe_module_sp, NULL, NULL, NULL);
-+ }
-+ }
-+
-+ // TODO find out why exe_module_sp might be NULL
- if (!exe_module_sp || exe_module_sp->GetObjectFile() == NULL) {
- exe_module_sp.reset();
- error.SetErrorStringWithFormat(
-@@ -197,9 +288,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,
-- module_search_paths_ptr, 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())
-@@ -232,10 +322,9 @@ Error PlatformNetBSD::ResolveExecutable(
- return error;
- }
-
--// From PlatformMacOSX only
- Error PlatformNetBSD::GetFileWithUUID(const FileSpec &platform_file,
-- const UUID *uuid_ptr,
-- FileSpec &local_file) {
-+ const UUID *uuid_ptr,
-+ FileSpec &local_file) {
- if (IsRemote()) {
- if (m_remote_platform_sp)
- return m_remote_platform_sp->GetFileWithUUID(platform_file, uuid_ptr,
-@@ -251,106 +340,25 @@ Error PlatformNetBSD::GetFileWithUUID(co
+ //------------------------------------------------------------------
/// Default Constructor
//------------------------------------------------------------------
PlatformNetBSD::PlatformNetBSD(bool is_host)
@@ -333,9 +229,7 @@ $NetBSD$
- m_major_os_version, m_minor_os_version, m_update_os_version);
- return false;
-}
-+ : PlatformPOSIX(is_host) // This is the local host platform
-+{}
-
+-
-bool PlatformNetBSD::GetRemoteOSBuildString(std::string &s) {
- if (m_remote_platform_sp)
- return m_remote_platform_sp->GetRemoteOSBuildString(s);
@@ -403,7 +297,9 @@ $NetBSD$
-
- return error;
-}
--
++ : PlatformPOSIX(is_host) // This is the local host platform
++{}
+
-Error PlatformNetBSD::DisconnectRemote() {
- Error error;
-
@@ -419,32 +315,7 @@ $NetBSD$
- }
- return error;
-}
-+//------------------------------------------------------------------
-+/// Destructor.
-+///
-+/// The destructor is virtual since this class is designed to be
-+/// inherited from by the plug-in instance.
-+//------------------------------------------------------------------
-+PlatformNetBSD::~PlatformNetBSD() = default;
-
- bool PlatformNetBSD::GetProcessInfo(lldb::pid_t pid,
-- ProcessInstanceInfo &process_info) {
-+ ProcessInstanceInfo &process_info) {
- bool success = false;
- if (IsHost()) {
- success = Platform::GetProcessInfo(pid, process_info);
-- } else if (m_remote_platform_sp) {
-- success = m_remote_platform_sp->GetProcessInfo(pid, process_info);
-+ } else {
-+ if (m_remote_platform_sp)
-+ success = m_remote_platform_sp->GetProcessInfo(pid, process_info);
- }
- return success;
- }
-@@ -371,55 +379,6 @@ PlatformNetBSD::FindProcesses(const Proc
- return match_count;
- }
-
+-
-const char *PlatformNetBSD::GetUserName(uint32_t uid) {
- // Check the cache in Platform in case we have already looked this uid up
- const char *user_name = Platform::GetUserName(uid);
@@ -493,11 +364,11 @@ $NetBSD$
- module_sp->SetPlatformFileSpec(module_spec.GetFileSpec());
- return error;
-}
--
++PlatformNetBSD::~PlatformNetBSD() = default;
+
bool PlatformNetBSD::GetSupportedArchitectureAtIndex(uint32_t idx,
ArchSpec &arch) {
- if (IsHost()) {
-@@ -471,79 +430,248 @@ bool PlatformNetBSD::GetSupportedArchite
+@@ -323,79 +257,239 @@ bool PlatformNetBSD::GetSupportedArchite
}
void PlatformNetBSD::GetStatus(Stream &strm) {
@@ -605,6 +476,14 @@ $NetBSD$
- target = new_target_sp.get();
- } else
- error.Clear();
+-
+- if (target && error.Success()) {
+- debugger.GetTargetList().SetSelectedTarget(target);
+- // The netbsd always currently uses the GDB remote debugger plug-in
+- // so even when debugging locally we are debugging remotely!
+- // Just like the darwin plugin.
+- process_sp = target->CreateProcess(
+- attach_info.GetListenerForProcess(debugger), "gdb-remote", NULL);
+// For local debugging, NetBSD will override the debug logic to use llgs-launch
+// rather than
+// lldb-launch, llgs-attach. This differs from current lldb-launch,
@@ -654,13 +533,8 @@ $NetBSD$
+ return process_sp;
+ }
-- if (target && error.Success()) {
-- debugger.GetTargetList().SetSelectedTarget(target);
-- // The netbsd always currently uses the GDB remote debugger plug-in
-- // so even when debugging locally we are debugging remotely!
-- // Just like the darwin plugin.
-- process_sp = target->CreateProcess(
-- attach_info.GetListenerForProcess(debugger), "gdb-remote", NULL);
+- if (process_sp)
+- error = process_sp->Attach(attach_info);
+ target = new_target_sp.get();
+ if (!target) {
+ error.SetErrorString("CreateTarget() returned nullptr");
@@ -668,14 +542,17 @@ $NetBSD$
+ log->Printf("PlatformNetBSD::%s failed: %s", __FUNCTION__,
+ error.AsCString());
+ return process_sp;
-+ }
-+ } else {
+ }
+ } else {
+- if (m_remote_platform_sp)
+- process_sp =
+- m_remote_platform_sp->Attach(attach_info, debugger, target, error);
+- else
+- error.SetErrorString("the platform is not currently connected");
+ if (log)
+ log->Printf("PlatformNetBSD::%s using provided target", __FUNCTION__);
+ }
-
-- if (process_sp)
-- error = process_sp->Attach(attach_info);
++
+ // Mark target as currently selected target.
+ debugger.GetTargetList().SetSelectedTarget(target);
+
@@ -761,13 +638,8 @@ $NetBSD$
+ log->Printf("PlatformNetBSD::%s pid %" PRIu64
+ " not using process STDIO pty",
+ __FUNCTION__, process_sp->GetID());
- }
- } else {
-- if (m_remote_platform_sp)
-- process_sp =
-- m_remote_platform_sp->Attach(attach_info, debugger, target, error);
-- else
-- error.SetErrorString("the platform is not currently connected");
++ }
++ } else {
+ if (log)
+ log->Printf("PlatformNetBSD::%s process launch failed: %s", __FUNCTION__,
+ error.AsCString());
@@ -792,12 +664,3 @@ $NetBSD$
+ flags_platform |= MAP_ANON;
+ return flags_platform;
+}
-+
-+ConstString PlatformNetBSD::GetFullNameForDylib(ConstString basename) {
-+ if (basename.IsEmpty())
-+ return basename;
-+
-+ StreamString stream;
-+ stream.Printf("lib%s.so", basename.GetCString());
-+ return ConstString(stream.GetString());
-+}
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Platform_NetBSD_PlatformNetBSD.h b/lldb-netbsd/patches/patch-source_Plugins_Platform_NetBSD_PlatformNetBSD.h
index e4aec420c2..aee8991eb8 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_Platform_NetBSD_PlatformNetBSD.h
+++ b/lldb-netbsd/patches/patch-source_Plugins_Platform_NetBSD_PlatformNetBSD.h
@@ -1,8 +1,8 @@
$NetBSD$
---- source/Plugins/Platform/NetBSD/PlatformNetBSD.h.orig 2016-12-17 10:29:30.000000000 +0000
+--- source/Plugins/Platform/NetBSD/PlatformNetBSD.h.orig 2017-02-04 18:35:35.000000000 +0000
+++ source/Plugins/Platform/NetBSD/PlatformNetBSD.h
-@@ -14,109 +14,73 @@
+@@ -14,96 +14,59 @@
// C++ Includes
// Other libraries and framework includes
// Project includes
@@ -63,10 +63,6 @@ $NetBSD$
- std::string *command_output,
- uint32_t timeout_sec) override;
-
- Error ResolveExecutable(const ModuleSpec &module_spec,
- lldb::ModuleSP &module_sp,
- const FileSpecList *module_search_paths_ptr) override;
-
- bool GetRemoteOSVersion() override;
-
- bool GetRemoteOSBuildString(std::string &s) override;
@@ -83,33 +79,22 @@ $NetBSD$
- Error DisconnectRemote() override;
-
- const char *GetHostname() override;
+-
+- const char *GetUserName(uint32_t uid) override;
+-
+- const char *GetGroupName(uint32_t gid) override;
+-
+- Error LaunchProcess(ProcessLaunchInfo &launch_info) override;
+ const char *GetDescription() override {
+ return GetPluginDescriptionStatic(IsHost());
+ }
-- const char *GetUserName(uint32_t uid) override;
-+ void GetStatus(Stream &strm) override;
-
-- const char *GetGroupName(uint32_t gid) override;
-+ Error GetFileWithUUID(const FileSpec &platform_file, const UUID *uuid,
-+ FileSpec &local_file) override;
-
- bool GetProcessInfo(lldb::pid_t pid, ProcessInstanceInfo &proc_info) override;
-
- uint32_t FindProcesses(const ProcessInstanceInfoMatch &match_info,
- ProcessInstanceInfoList &process_infos) override;
-
-- Error LaunchProcess(ProcessLaunchInfo &launch_info) override;
--
- lldb::ProcessSP Attach(ProcessAttachInfo &attach_info, Debugger &debugger,
- Target *target, Error &error) override;
--
++ void GetStatus(Stream &strm) override;
+
- // NetBSD processes can not be launched by spawning and attaching.
- bool CanDebugProcess() override { return false; }
--
-- // Only on PlatformMacOSX:
-- Error GetFileWithUUID(const FileSpec &platform_file, const UUID *uuid,
-- FileSpec &local_file) override;
+ bool GetSupportedArchitectureAtIndex(uint32_t idx, ArchSpec &arch) override;
- Error GetSharedModule(const ModuleSpec &module_spec, Process *process,
@@ -134,8 +119,6 @@ $NetBSD$
- // remote netbsd OS
+ uint64_t ConvertMmapFlagsToPlatform(const ArchSpec &arch,
+ unsigned flags) override;
-+
-+ ConstString GetFullNameForDylib(ConstString basename) override;
private:
DISALLOW_COPY_AND_ASSIGN(PlatformNetBSD);
diff --git a/llvm-netbsd/Makefile b/llvm-netbsd/Makefile
index 4468cb45a1..5932246ba5 100644
--- a/llvm-netbsd/Makefile
+++ b/llvm-netbsd/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= lang devel
SVN_REPOSITORIES= llvm
SVN_REPO.llvm= http://llvm.org/svn/llvm-project/llvm/trunk
-SVN_REVISION.llvm= 293902
+SVN_REVISION.llvm= 294071
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://llvm.org/
diff --git a/llvm-netbsd/PLIST b/llvm-netbsd/PLIST
index 9e76d16889..a418cf076b 100644
--- a/llvm-netbsd/PLIST
+++ b/llvm-netbsd/PLIST
@@ -381,6 +381,7 @@ include/llvm/DebugInfo/CodeView/CodeView.h
include/llvm/DebugInfo/CodeView/CodeViewError.h
include/llvm/DebugInfo/CodeView/CodeViewRecordIO.h
include/llvm/DebugInfo/CodeView/EnumTables.h
+include/llvm/DebugInfo/CodeView/Formatters.h
include/llvm/DebugInfo/CodeView/FunctionId.h
include/llvm/DebugInfo/CodeView/Line.h
include/llvm/DebugInfo/CodeView/ModuleSubstream.h
Home |
Main Index |
Thread Index |
Old Index