From 9fa20062f0f5a49ff44873889617b0e28011a4db Mon Sep 17 00:00:00 2001 From: pin Date: Fri, 12 Aug 2022 08:54:30 +0000 Subject: devel/lldb: llvm update --- devel/lldb/Makefile | 3 +-- devel/lldb/PLIST | 15 +++++++++++---- devel/lldb/distinfo | 16 ++++++++-------- .../patches/patch-cmake_modules_LLDBStandalone.cmake | 6 +++--- devel/lldb/patches/patch-source_API_CMakeLists.txt | 6 +++--- ...source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp | 12 ++++++------ ...h-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h | 10 +++++----- 7 files changed, 37 insertions(+), 31 deletions(-) (limited to 'devel') diff --git a/devel/lldb/Makefile b/devel/lldb/Makefile index 795c276cd73..8dbed7e9dc9 100644 --- a/devel/lldb/Makefile +++ b/devel/lldb/Makefile @@ -1,6 +1,5 @@ -# $NetBSD: Makefile,v 1.37 2022/06/30 11:18:16 nia Exp $ +# $NetBSD: Makefile,v 1.38 2022/08/12 08:54:30 pin Exp $ -PKGREVISION= 2 .include "../../lang/llvm/version.mk" DISTNAME= lldb-${LLVM_VERSION}.src diff --git a/devel/lldb/PLIST b/devel/lldb/PLIST index 188d4b0266c..f1a950401a2 100644 --- a/devel/lldb/PLIST +++ b/devel/lldb/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.14 2021/11/23 20:55:42 wiz Exp $ +@comment $NetBSD: PLIST,v 1.15 2022/08/12 08:54:31 pin Exp $ bin/lldb bin/lldb-argdumper bin/lldb-instr @@ -105,6 +105,7 @@ include/lldb/Core/AddressResolver.h include/lldb/Core/AddressResolverFileLine.h include/lldb/Core/Architecture.h include/lldb/Core/Communication.h +include/lldb/Core/DataFileCache.h include/lldb/Core/Debugger.h include/lldb/Core/Declaration.h include/lldb/Core/Disassembler.h @@ -230,7 +231,6 @@ include/lldb/Host/PseudoTerminal.h include/lldb/Host/SafeMachO.h include/lldb/Host/Socket.h include/lldb/Host/SocketAddress.h -include/lldb/Host/StringConvert.h include/lldb/Host/Terminal.h include/lldb/Host/ThreadLauncher.h include/lldb/Host/Time.h @@ -324,6 +324,7 @@ include/lldb/Interpreter/OptionValues.h include/lldb/Interpreter/Options.h include/lldb/Interpreter/Property.h include/lldb/Interpreter/ScriptInterpreter.h +include/lldb/Interpreter/ScriptedInterface.h include/lldb/Interpreter/ScriptedProcessInterface.h include/lldb/Symbol/ArmUnwindInfo.h include/lldb/Symbol/Block.h @@ -361,8 +362,10 @@ include/lldb/Symbol/UnwindTable.h include/lldb/Symbol/Variable.h include/lldb/Symbol/VariableList.h include/lldb/Target/ABI.h +include/lldb/Target/AppleArm64ExceptionClass.h include/lldb/Target/AssertFrameRecognizer.h include/lldb/Target/DynamicLoader.h +include/lldb/Target/DynamicRegisterInfo.h include/lldb/Target/ExecutionContext.h include/lldb/Target/ExecutionContextScope.h include/lldb/Target/InstrumentationRuntime.h @@ -375,6 +378,7 @@ include/lldb/Target/Memory.h include/lldb/Target/MemoryHistory.h include/lldb/Target/MemoryRegionInfo.h include/lldb/Target/MemoryTagManager.h +include/lldb/Target/MemoryTagMap.h include/lldb/Target/ModuleCache.h include/lldb/Target/OperatingSystem.h include/lldb/Target/PathMappingList.h @@ -398,6 +402,7 @@ include/lldb/Target/StackFrame.h include/lldb/Target/StackFrameList.h include/lldb/Target/StackFrameRecognizer.h include/lldb/Target/StackID.h +include/lldb/Target/Statistics.h include/lldb/Target/StopInfo.h include/lldb/Target/StructuredDataPlugin.h include/lldb/Target/SystemRuntime.h @@ -455,6 +460,7 @@ include/lldb/Utility/FileSpec.h include/lldb/Utility/Flags.h include/lldb/Utility/GDBRemote.h include/lldb/Utility/IOObject.h +include/lldb/Utility/Instrumentation.h include/lldb/Utility/Iterable.h include/lldb/Utility/LLDBAssert.h include/lldb/Utility/Listener.h @@ -468,7 +474,6 @@ include/lldb/Utility/RangeMap.h include/lldb/Utility/RegisterValue.h include/lldb/Utility/RegularExpression.h include/lldb/Utility/Reproducer.h -include/lldb/Utility/ReproducerInstrumentation.h include/lldb/Utility/ReproducerProvider.h include/lldb/Utility/Scalar.h include/lldb/Utility/SelectHelper.h @@ -497,6 +502,7 @@ include/lldb/Utility/UserIDResolver.h include/lldb/Utility/VASPrintf.h include/lldb/Utility/VMRange.h include/lldb/Utility/XcodeSDK.h +include/lldb/Version/Version.h include/lldb/lldb-defines.h include/lldb/lldb-enumerations.h include/lldb/lldb-forward.h @@ -510,8 +516,9 @@ include/lldb/lldb-public.h include/lldb/lldb-types.h include/lldb/lldb-versioning.h lib/liblldb.so -lib/liblldb.so.13 +lib/liblldb.so.14 lib/liblldb.so.${PKGVERSION} +lib/lua/5.3/lldb.so ${PYSITELIB}/lldb/__init__.py ${PYSITELIB}/lldb/_lldb.so ${PYSITELIB}/lldb/embedded_interpreter.py diff --git a/devel/lldb/distinfo b/devel/lldb/distinfo index 0b29e208ab2..4a1c5e41d70 100644 --- a/devel/lldb/distinfo +++ b/devel/lldb/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.29 2022/02/03 20:38:40 adam Exp $ +$NetBSD: distinfo,v 1.30 2022/08/12 08:54:31 pin Exp $ -BLAKE2s (lldb-13.0.1.src.tar.xz) = f01995e86d3005c817cd47562ba1e1264123330f021c56c29ec2a127c0a1db23 -SHA512 (lldb-13.0.1.src.tar.xz) = 4d6f134305d3f869e951c9cef6d792945b47bc6b3226acb1df2e85bb54cac980efa8b12bd399bdc7bb8d108154400205221c387d4d75024c20f61d8e4ed2dee9 -Size (lldb-13.0.1.src.tar.xz) = 9904936 bytes -SHA1 (patch-cmake_modules_LLDBStandalone.cmake) = 55a8d614cc52872968fc7c7c205c7d6e4021b538 -SHA1 (patch-source_API_CMakeLists.txt) = edc7bdaa39436dd8df6c5e8172f39c5329fa8cb2 -SHA1 (patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp) = b2fcd2a6fbe7c9c514df657d60b21a93d9d4667c -SHA1 (patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h) = 1a01bed99b146a7c3e8bcdc559dc2755f997ac4c +BLAKE2s (lldb-14.0.6.src.tar.xz) = 41dcd1742c7b654007d257127a45a41d7c5304dc403913e6ba2129bb98ed77f1 +SHA512 (lldb-14.0.6.src.tar.xz) = 3fd616f2c992edfa92c86a38aaaaccdeec1ba34186ec38856c4e543cf41163f366855a8b2a22d09b9f7152041c52ac5963f5986d31b72bcb942661fddad55543 +Size (lldb-14.0.6.src.tar.xz) = 10088312 bytes +SHA1 (patch-cmake_modules_LLDBStandalone.cmake) = 773d420c3fd2c9b4af6af9d42c5778e96a1ae52b +SHA1 (patch-source_API_CMakeLists.txt) = 23a7b24632f937a4541863aff6a7591255cafe40 +SHA1 (patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp) = 15c6d8399198de567b4e901533e1b1f77d9e348f +SHA1 (patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h) = 26a7298b835b97b89257975f7e87f0f8225e5f99 diff --git a/devel/lldb/patches/patch-cmake_modules_LLDBStandalone.cmake b/devel/lldb/patches/patch-cmake_modules_LLDBStandalone.cmake index a0714c98212..0431be1670a 100644 --- a/devel/lldb/patches/patch-cmake_modules_LLDBStandalone.cmake +++ b/devel/lldb/patches/patch-cmake_modules_LLDBStandalone.cmake @@ -1,8 +1,8 @@ -$NetBSD: patch-cmake_modules_LLDBStandalone.cmake,v 1.4 2019/10/19 14:01:37 adam Exp $ +$NetBSD: patch-cmake_modules_LLDBStandalone.cmake,v 1.5 2022/08/12 08:54:31 pin Exp $ ---- cmake/modules/LLDBStandalone.cmake.orig 2019-07-17 19:36:20.000000000 +0000 +--- cmake/modules/LLDBStandalone.cmake.orig 2022-06-22 16:46:24.000000000 +0000 +++ cmake/modules/LLDBStandalone.cmake -@@ -74,7 +74,6 @@ list(APPEND CMAKE_MODULE_PATH "${LLVM_DI +@@ -85,7 +85,6 @@ list(APPEND CMAKE_MODULE_PATH "${LLVM_DI include(AddLLVM) include(TableGen) include(HandleLLVMOptions) diff --git a/devel/lldb/patches/patch-source_API_CMakeLists.txt b/devel/lldb/patches/patch-source_API_CMakeLists.txt index e860ecd7938..d3ac7db389b 100644 --- a/devel/lldb/patches/patch-source_API_CMakeLists.txt +++ b/devel/lldb/patches/patch-source_API_CMakeLists.txt @@ -1,10 +1,10 @@ -$NetBSD: patch-source_API_CMakeLists.txt,v 1.5 2021/07/12 18:47:16 adam Exp $ +$NetBSD: patch-source_API_CMakeLists.txt,v 1.6 2022/08/12 08:54:31 pin Exp $ Fix finding libxml2's includes. ---- source/API/CMakeLists.txt.orig 2021-04-06 16:38:18.000000000 +0000 +--- source/API/CMakeLists.txt.orig 2022-06-22 16:46:24.000000000 +0000 +++ source/API/CMakeLists.txt -@@ -19,6 +19,10 @@ if(LLDB_ENABLE_LUA) +@@ -15,6 +15,10 @@ if(LLDB_ENABLE_LUA) set(lldb_lua_wrapper ${lua_bindings_dir}/LLDBWrapLua.cpp) endif() diff --git a/devel/lldb/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp b/devel/lldb/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp index c7e0f08dbbb..d1ba202278e 100644 --- a/devel/lldb/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp +++ b/devel/lldb/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp @@ -1,10 +1,10 @@ -$NetBSD: patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp,v 1.2 2021/07/12 18:47:16 adam Exp $ +$NetBSD: patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp,v 1.3 2022/08/12 08:54:31 pin Exp $ Provide StopProcess. ---- source/Plugins/Process/NetBSD/NativeProcessNetBSD.cpp.orig 2021-04-06 16:38:18.000000000 +0000 +--- source/Plugins/Process/NetBSD/NativeProcessNetBSD.cpp.orig 2022-06-22 16:46:24.000000000 +0000 +++ source/Plugins/Process/NetBSD/NativeProcessNetBSD.cpp -@@ -346,6 +346,29 @@ void NativeProcessNetBSD::MonitorSignal( +@@ -381,6 +381,29 @@ void NativeProcessNetBSD::MonitorSignal( SetState(StateType::eStateStopped, true); } @@ -33,8 +33,8 @@ Provide StopProcess. + Status NativeProcessNetBSD::PtraceWrapper(int req, lldb::pid_t pid, void *addr, int data, int *result) { - Log *log(ProcessPOSIXLog::GetLogIfAllCategoriesSet(POSIX_LOG_PTRACE)); -@@ -498,7 +521,7 @@ Status NativeProcessNetBSD::Resume(const + Log *log = GetLog(POSIXLog::Ptrace); +@@ -533,7 +556,7 @@ Status NativeProcessNetBSD::Resume(const return ret; } @@ -43,7 +43,7 @@ Provide StopProcess. Status NativeProcessNetBSD::Detach() { Status error; -@@ -523,7 +546,7 @@ Status NativeProcessNetBSD::Signal(int s +@@ -558,7 +581,7 @@ Status NativeProcessNetBSD::Signal(int s } Status NativeProcessNetBSD::Interrupt() { diff --git a/devel/lldb/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h b/devel/lldb/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h index 4a0eeec0e55..3a5caa46768 100644 --- a/devel/lldb/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h +++ b/devel/lldb/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h @@ -1,14 +1,14 @@ -$NetBSD: patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h,v 1.3 2020/09/23 06:58:46 adam Exp $ +$NetBSD: patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h,v 1.4 2022/08/12 08:54:31 pin Exp $ Declare StopProcess. ---- source/Plugins/Process/NetBSD/NativeProcessNetBSD.h.orig 2020-07-07 16:21:37.000000000 +0000 +--- source/Plugins/Process/NetBSD/NativeProcessNetBSD.h.orig 2022-06-22 16:46:24.000000000 +0000 +++ source/Plugins/Process/NetBSD/NativeProcessNetBSD.h -@@ -86,6 +86,7 @@ public: +@@ -87,6 +87,7 @@ public: // Interface used by NativeRegisterContext-derived classes. static Status PtraceWrapper(int req, lldb::pid_t pid, void *addr = nullptr, int data = 0, int *result = nullptr); + static Status StopProcess(lldb::pid_t pid); - private: - MainLoop::SignalHandleUP m_sigchld_handle; + llvm::Expected SaveCore(llvm::StringRef path_hint) override; + -- cgit v1.2.3