Compare commits
7 Commits
| Author | SHA1 | Date |
|---|---|---|
Tom Stellard
|
c903ccdd2d | |
serge-sans-paille
|
21d84fe905 | |
|
Tom Stellard
|
58f4a1520b | |
|
Tom Stellard
|
f98688d084 | |
|
serge-sans-paille
|
982a843f96 | |
Jonathan Wakely
|
299421f31f | |
|
serge-sans-paille
|
50fa88a281 |
|
|
@ -61,3 +61,17 @@
|
|||
/lldb-11.1.0rc1.src.tar.xz.sig
|
||||
/lldb-11.1.0rc2.src.tar.xz
|
||||
/lldb-11.1.0rc2.src.tar.xz.sig
|
||||
/lldb-12.0.0rc1.src.tar.xz
|
||||
/lldb-12.0.0rc1.src.tar.xz.sig
|
||||
/lldb-12.0.0rc2.src.tar.xz
|
||||
/lldb-12.0.0rc2.src.tar.xz.sig
|
||||
/lldb-12.0.0rc3.src.tar.xz
|
||||
/lldb-12.0.0rc3.src.tar.xz.sig
|
||||
/lldb-12.0.0rc4.src.tar.xz
|
||||
/lldb-12.0.0rc4.src.tar.xz.sig
|
||||
/lldb-12.0.0rc5.src.tar.xz
|
||||
/lldb-12.0.0rc5.src.tar.xz.sig
|
||||
/lldb-12.0.0.src.tar.xz
|
||||
/lldb-12.0.0.src.tar.xz.sig
|
||||
/lldb-12.0.1.src.tar.xz
|
||||
/lldb-12.0.1.src.tar.xz.sig
|
||||
|
|
|
|||
|
|
@ -1,24 +0,0 @@
|
|||
From 7ef45eab67114ce1ed136f0666f34aafd0dab89d Mon Sep 17 00:00:00 2001
|
||||
From: Tom Stellard <tstellar@redhat.com>
|
||||
Date: Tue, 14 Mar 2017 14:54:10 -0400
|
||||
Subject: [PATCH] Fix build with gcc 7
|
||||
|
||||
---
|
||||
include/lldb/Utility/TaskPool.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/include/lldb/Utility/TaskPool.h b/include/lldb/Utility/TaskPool.h
|
||||
index 3ad9c7c..bcd8186 100644
|
||||
--- a/include/lldb/Utility/TaskPool.h
|
||||
+++ b/include/lldb/Utility/TaskPool.h
|
||||
@@ -12,6 +12,7 @@
|
||||
|
||||
#include <cassert>
|
||||
#include <cstdint>
|
||||
+#include <functional>
|
||||
#include <future>
|
||||
#include <list>
|
||||
#include <queue>
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
diff -ru lldb-8.0.0rc1.src.orig/lit/CMakeLists.txt lldb-8.0.0rc1.src/lit/CMakeLists.txt
|
||||
--- lldb-8.0.0rc1.src.orig/lit/CMakeLists.txt 2019-02-13 13:55:19.983186453 +0000
|
||||
+++ lldb-8.0.0rc1.src/lit/CMakeLists.txt 2019-02-13 13:58:01.783865287 +0000
|
||||
@@ -19,18 +19,23 @@
|
||||
|
||||
list(APPEND LLDB_TEST_DEPS
|
||||
LLDBUnitTests
|
||||
- dsymutil
|
||||
- llc
|
||||
lldb
|
||||
lldb-test
|
||||
- llvm-config
|
||||
- llvm-mc
|
||||
- llvm-objcopy
|
||||
- FileCheck
|
||||
- count
|
||||
- not
|
||||
)
|
||||
|
||||
+if (NOT LLDB_BUILT_STANDALONE)
|
||||
+ list(APPEND LLDB_TEST_DEPS
|
||||
+ dsymutil
|
||||
+ llc
|
||||
+ llvm-config
|
||||
+ llvm-mc
|
||||
+ llvm-objcopy
|
||||
+ FileCheck
|
||||
+ count
|
||||
+ not
|
||||
+ )
|
||||
+endif()
|
||||
+
|
||||
if(TARGET lld)
|
||||
list(APPEND LLDB_TEST_DEPS lld)
|
||||
endif()
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
From 6349965eccf12178cd4235e9f8996142d12ff607 Mon Sep 17 00:00:00 2001
|
||||
From: serge-sans-paille <sguelton@redhat.com>
|
||||
Date: Thu, 25 Feb 2021 14:27:43 +0100
|
||||
Subject: [PATCH 1/2] [PATCH][lldb] Portable asm/ptrace.h include
|
||||
|
||||
---
|
||||
lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_arm64.h | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_arm64.h b/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_arm64.h
|
||||
index 344eae2..c483abc 100644
|
||||
--- a/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_arm64.h
|
||||
+++ b/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_arm64.h
|
||||
@@ -14,7 +14,8 @@
|
||||
#include "Plugins/Process/Linux/NativeRegisterContextLinux.h"
|
||||
#include "Plugins/Process/Utility/RegisterInfoPOSIX_arm64.h"
|
||||
|
||||
-#include <asm/ptrace.h>
|
||||
+#include <sys/ptrace.h>
|
||||
+#include <linux/ptrace.h>
|
||||
|
||||
namespace lldb_private {
|
||||
namespace process_linux {
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,321 +0,0 @@
|
|||
From 8f442727f2e8d6d426ae9cef42434ef538d1ed13 Mon Sep 17 00:00:00 2001
|
||||
From: Michal Gorny <mgorny@gentoo.org>
|
||||
Date: Fri, 4 Oct 2019 12:03:03 +0000
|
||||
Subject: [PATCH] [lldb] [cmake] Support linking against clang-cpp dylib
|
||||
|
||||
Link against clang-cpp dylib rather than split libs when
|
||||
CLANG_LINK_CLANG_DYLIB is enabled.
|
||||
|
||||
Differential Revision: https://reviews.llvm.org/D68456
|
||||
|
||||
llvm-svn: 373734
|
||||
---
|
||||
lldb/cmake/modules/AddLLDB.cmake | 15 +++++++++++++--
|
||||
lldb/source/Core/CMakeLists.txt | 4 +++-
|
||||
.../Plugins/ExpressionParser/Clang/CMakeLists.txt | 19 ++++++++++---------
|
||||
lldb/source/Plugins/Language/ObjC/CMakeLists.txt | 3 ++-
|
||||
.../ObjC/AppleObjCRuntime/CMakeLists.txt | 3 ++-
|
||||
.../RenderScript/RenderScriptRuntime/CMakeLists.txt | 3 ++-
|
||||
lldb/source/Plugins/Platform/MacOSX/CMakeLists.txt | 3 ++-
|
||||
lldb/source/Plugins/SymbolFile/DWARF/CMakeLists.txt | 5 +++--
|
||||
.../Plugins/SymbolFile/NativePDB/CMakeLists.txt | 5 +++--
|
||||
lldb/source/Plugins/SymbolFile/PDB/CMakeLists.txt | 7 ++++---
|
||||
lldb/source/Symbol/CMakeLists.txt | 8 +++++---
|
||||
lldb/tools/lldb-instr/CMakeLists.txt | 2 +-
|
||||
12 files changed, 50 insertions(+), 27 deletions(-)
|
||||
|
||||
diff --git a/lldb/cmake/modules/AddLLDB.cmake b/lldb/cmake/modules/AddLLDB.cmake
|
||||
index 4c99278..35a8097 100644
|
||||
--- a/lldb/cmake/modules/AddLLDB.cmake
|
||||
+++ b/lldb/cmake/modules/AddLLDB.cmake
|
||||
@@ -37,7 +37,7 @@ function(add_lldb_library name)
|
||||
cmake_parse_arguments(PARAM
|
||||
"MODULE;SHARED;STATIC;OBJECT;PLUGIN"
|
||||
"INSTALL_PREFIX;ENTITLEMENTS"
|
||||
- "EXTRA_CXXFLAGS;DEPENDS;LINK_LIBS;LINK_COMPONENTS"
|
||||
+ "EXTRA_CXXFLAGS;DEPENDS;LINK_LIBS;LINK_COMPONENTS;CLANG_LIBS"
|
||||
${ARGN})
|
||||
llvm_process_sources(srcs ${PARAM_UNPARSED_ARGUMENTS})
|
||||
list(APPEND LLVM_LINK_COMPONENTS ${PARAM_LINK_COMPONENTS})
|
||||
@@ -91,6 +91,12 @@ function(add_lldb_library name)
|
||||
${pass_ENTITLEMENTS}
|
||||
${pass_NO_INSTALL_RPATH}
|
||||
)
|
||||
+
|
||||
+ if(CLANG_LINK_CLANG_DYLIB)
|
||||
+ target_link_libraries(${name} PRIVATE clang-cpp)
|
||||
+ else()
|
||||
+ target_link_libraries(${name} PRIVATE ${PARAM_CLANG_LIBS})
|
||||
+ endif()
|
||||
endif()
|
||||
|
||||
if(PARAM_SHARED)
|
||||
@@ -132,7 +138,7 @@ function(add_lldb_executable name)
|
||||
cmake_parse_arguments(ARG
|
||||
"GENERATE_INSTALL"
|
||||
"INSTALL_PREFIX;ENTITLEMENTS"
|
||||
- "LINK_LIBS;LINK_COMPONENTS"
|
||||
+ "LINK_LIBS;CLANG_LIBS;LINK_COMPONENTS"
|
||||
${ARGN}
|
||||
)
|
||||
|
||||
@@ -152,6 +158,11 @@ function(add_lldb_executable name)
|
||||
)
|
||||
|
||||
target_link_libraries(${name} PRIVATE ${ARG_LINK_LIBS})
|
||||
+ if(CLANG_LINK_CLANG_DYLIB)
|
||||
+ target_link_libraries(${name} PRIVATE clang-cpp)
|
||||
+ else()
|
||||
+ target_link_libraries(${name} PRIVATE ${ARG_CLANG_LIBS})
|
||||
+ endif()
|
||||
set_target_properties(${name} PROPERTIES FOLDER "lldb executables")
|
||||
|
||||
if(ARG_GENERATE_INSTALL)
|
||||
diff --git a/lldb/source/Core/CMakeLists.txt b/lldb/source/Core/CMakeLists.txt
|
||||
index 7ca37f9..2e05fa3 100644
|
||||
--- a/lldb/source/Core/CMakeLists.txt
|
||||
+++ b/lldb/source/Core/CMakeLists.txt
|
||||
@@ -58,7 +58,6 @@ add_lldb_library(lldbCore
|
||||
ValueObjectVariable.cpp
|
||||
|
||||
LINK_LIBS
|
||||
- clangAST
|
||||
lldbBreakpoint
|
||||
lldbDataFormatters
|
||||
lldbExpression
|
||||
@@ -71,6 +70,9 @@ add_lldb_library(lldbCore
|
||||
lldbPluginObjCLanguage
|
||||
${LLDB_CURSES_LIBS}
|
||||
|
||||
+ CLANG_LIBS
|
||||
+ clangDriver
|
||||
+
|
||||
LINK_COMPONENTS
|
||||
Support
|
||||
Demangle
|
||||
diff --git a/lldb/source/Plugins/ExpressionParser/Clang/CMakeLists.txt b/lldb/source/Plugins/ExpressionParser/Clang/CMakeLists.txt
|
||||
index 950dae6..3fc1e0d 100644
|
||||
--- a/lldb/source/Plugins/ExpressionParser/Clang/CMakeLists.txt
|
||||
+++ b/lldb/source/Plugins/ExpressionParser/Clang/CMakeLists.txt
|
||||
@@ -25,6 +25,16 @@ add_lldb_library(lldbPluginExpressionParserClang PLUGIN
|
||||
${tablegen_deps}
|
||||
|
||||
LINK_LIBS
|
||||
+ lldbCore
|
||||
+ lldbExpression
|
||||
+ lldbHost
|
||||
+ lldbInterpreter
|
||||
+ lldbSymbol
|
||||
+ lldbTarget
|
||||
+ lldbUtility
|
||||
+ lldbPluginCPlusPlusLanguage
|
||||
+ lldbPluginCPPRuntime
|
||||
+ CLANG_LIBS
|
||||
clangAST
|
||||
clangCodeGen
|
||||
clangDriver
|
||||
@@ -36,15 +46,6 @@ add_lldb_library(lldbPluginExpressionParserClang PLUGIN
|
||||
clangRewriteFrontend
|
||||
clangSema
|
||||
clangSerialization
|
||||
- lldbCore
|
||||
- lldbExpression
|
||||
- lldbHost
|
||||
- lldbInterpreter
|
||||
- lldbSymbol
|
||||
- lldbTarget
|
||||
- lldbUtility
|
||||
- lldbPluginCPlusPlusLanguage
|
||||
- lldbPluginCPPRuntime
|
||||
LINK_COMPONENTS
|
||||
Core
|
||||
ExecutionEngine
|
||||
diff --git a/lldb/source/Plugins/Language/ObjC/CMakeLists.txt b/lldb/source/Plugins/Language/ObjC/CMakeLists.txt
|
||||
index afb68d4..ebb96c2 100644
|
||||
--- a/lldb/source/Plugins/Language/ObjC/CMakeLists.txt
|
||||
+++ b/lldb/source/Plugins/Language/ObjC/CMakeLists.txt
|
||||
@@ -22,7 +22,6 @@ add_lldb_library(lldbPluginObjCLanguage PLUGIN
|
||||
NSString.cpp
|
||||
|
||||
LINK_LIBS
|
||||
- clangAST
|
||||
lldbCore
|
||||
lldbDataFormatters
|
||||
lldbExpression
|
||||
@@ -32,6 +31,8 @@ add_lldb_library(lldbPluginObjCLanguage PLUGIN
|
||||
lldbUtility
|
||||
lldbPluginAppleObjCRuntime
|
||||
lldbPluginClangCommon
|
||||
+ CLANG_LIBS
|
||||
+ clangAST
|
||||
|
||||
EXTRA_CXXFLAGS ${EXTRA_CXXFLAGS}
|
||||
)
|
||||
diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/CMakeLists.txt b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/CMakeLists.txt
|
||||
index 29d9ba1..bcf3240 100644
|
||||
--- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/CMakeLists.txt
|
||||
+++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/CMakeLists.txt
|
||||
@@ -9,7 +9,6 @@ add_lldb_library(lldbPluginAppleObjCRuntime PLUGIN
|
||||
AppleObjCTypeEncodingParser.cpp
|
||||
|
||||
LINK_LIBS
|
||||
- clangAST
|
||||
lldbBreakpoint
|
||||
lldbCore
|
||||
lldbExpression
|
||||
@@ -20,6 +19,8 @@ add_lldb_library(lldbPluginAppleObjCRuntime PLUGIN
|
||||
lldbUtility
|
||||
lldbPluginExpressionParserClang
|
||||
lldbPluginCPPRuntime
|
||||
+ CLANG_LIBS
|
||||
+ clangAST
|
||||
LINK_COMPONENTS
|
||||
Support
|
||||
)
|
||||
diff --git a/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/CMakeLists.txt b/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/CMakeLists.txt
|
||||
index 1a6c499..c122e09 100644
|
||||
--- a/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/CMakeLists.txt
|
||||
+++ b/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/CMakeLists.txt
|
||||
@@ -13,7 +13,6 @@ add_lldb_library(lldbPluginRenderScriptRuntime PLUGIN
|
||||
${tablegen_deps}
|
||||
|
||||
LINK_LIBS
|
||||
- clangBasic
|
||||
lldbBreakpoint
|
||||
lldbCore
|
||||
lldbDataFormatters
|
||||
@@ -22,6 +21,8 @@ add_lldb_library(lldbPluginRenderScriptRuntime PLUGIN
|
||||
lldbInterpreter
|
||||
lldbSymbol
|
||||
lldbTarget
|
||||
+ CLANG_LIBS
|
||||
+ clangBasic
|
||||
LINK_COMPONENTS
|
||||
Core
|
||||
IRReader
|
||||
diff --git a/lldb/source/Plugins/Platform/MacOSX/CMakeLists.txt b/lldb/source/Plugins/Platform/MacOSX/CMakeLists.txt
|
||||
index 6f0d952..dc04693 100644
|
||||
--- a/lldb/source/Plugins/Platform/MacOSX/CMakeLists.txt
|
||||
+++ b/lldb/source/Plugins/Platform/MacOSX/CMakeLists.txt
|
||||
@@ -31,7 +31,6 @@ add_lldb_library(lldbPluginPlatformMacOSX PLUGIN
|
||||
${PLUGIN_PLATFORM_MACOSX_SOURCES}
|
||||
|
||||
LINK_LIBS
|
||||
- clangBasic
|
||||
lldbBreakpoint
|
||||
lldbCore
|
||||
lldbHost
|
||||
@@ -41,6 +40,8 @@ add_lldb_library(lldbPluginPlatformMacOSX PLUGIN
|
||||
lldbUtility
|
||||
lldbPluginPlatformPOSIX
|
||||
${OBJC_LIBS}
|
||||
+ CLANG_LIBS
|
||||
+ clangBasic
|
||||
LINK_COMPONENTS
|
||||
Support
|
||||
)
|
||||
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/CMakeLists.txt b/lldb/source/Plugins/SymbolFile/DWARF/CMakeLists.txt
|
||||
index cd588cb..69d2d21 100644
|
||||
--- a/lldb/source/Plugins/SymbolFile/DWARF/CMakeLists.txt
|
||||
+++ b/lldb/source/Plugins/SymbolFile/DWARF/CMakeLists.txt
|
||||
@@ -36,8 +36,6 @@ add_lldb_library(lldbPluginSymbolFileDWARF PLUGIN
|
||||
UniqueDWARFASTType.cpp
|
||||
|
||||
LINK_LIBS
|
||||
- clangAST
|
||||
- clangBasic
|
||||
lldbCore
|
||||
lldbExpression
|
||||
lldbHost
|
||||
@@ -48,6 +46,9 @@ add_lldb_library(lldbPluginSymbolFileDWARF PLUGIN
|
||||
lldbPluginObjCLanguage
|
||||
lldbPluginCPlusPlusLanguage
|
||||
lldbPluginExpressionParserClang
|
||||
+ CLANG_LIBS
|
||||
+ clangAST
|
||||
+ clangBasic
|
||||
LINK_COMPONENTS
|
||||
DebugInfoDWARF
|
||||
Support
|
||||
diff --git a/lldb/source/Plugins/SymbolFile/NativePDB/CMakeLists.txt b/lldb/source/Plugins/SymbolFile/NativePDB/CMakeLists.txt
|
||||
index 52b431d..aaecec4 100644
|
||||
--- a/lldb/source/Plugins/SymbolFile/NativePDB/CMakeLists.txt
|
||||
+++ b/lldb/source/Plugins/SymbolFile/NativePDB/CMakeLists.txt
|
||||
@@ -11,11 +11,12 @@ add_lldb_library(lldbPluginSymbolFileNativePDB PLUGIN
|
||||
UdtRecordCompleter.cpp
|
||||
|
||||
LINK_LIBS
|
||||
- clangAST
|
||||
- clangLex
|
||||
lldbCore
|
||||
lldbSymbol
|
||||
lldbUtility
|
||||
+ CLANG_LIBS
|
||||
+ clangAST
|
||||
+ clangLex
|
||||
LINK_COMPONENTS
|
||||
DebugInfoCodeView
|
||||
DebugInfoPDB
|
||||
diff --git a/lldb/source/Plugins/SymbolFile/PDB/CMakeLists.txt b/lldb/source/Plugins/SymbolFile/PDB/CMakeLists.txt
|
||||
index 64168d0..79bdce42 100644
|
||||
--- a/lldb/source/Plugins/SymbolFile/PDB/CMakeLists.txt
|
||||
+++ b/lldb/source/Plugins/SymbolFile/PDB/CMakeLists.txt
|
||||
@@ -4,12 +4,13 @@ add_lldb_library(lldbPluginSymbolFilePDB PLUGIN
|
||||
SymbolFilePDB.cpp
|
||||
|
||||
LINK_LIBS
|
||||
- clangAST
|
||||
- clangLex
|
||||
lldbCore
|
||||
+ lldbPluginSymbolFileNativePDB
|
||||
lldbSymbol
|
||||
lldbUtility
|
||||
- lldbPluginSymbolFileNativePDB
|
||||
+ CLANG_LIBS
|
||||
+ clangAST
|
||||
+ clangLex
|
||||
LINK_COMPONENTS
|
||||
DebugInfoPDB
|
||||
Support
|
||||
diff --git a/lldb/source/Symbol/CMakeLists.txt b/lldb/source/Symbol/CMakeLists.txt
|
||||
index 4b922c2..8614172 100644
|
||||
--- a/lldb/source/Symbol/CMakeLists.txt
|
||||
+++ b/lldb/source/Symbol/CMakeLists.txt
|
||||
@@ -47,9 +47,6 @@ add_lldb_library(lldbSymbol
|
||||
${PLATFORM_SOURCES}
|
||||
|
||||
LINK_LIBS
|
||||
- clangAST
|
||||
- clangBasic
|
||||
- clangFrontend
|
||||
lldbCore
|
||||
lldbExpression
|
||||
lldbHost
|
||||
@@ -61,6 +58,11 @@ add_lldb_library(lldbSymbol
|
||||
lldbPluginObjCLanguage
|
||||
lldbPluginObjCRuntime
|
||||
|
||||
+ CLANG_LIBS
|
||||
+ clangAST
|
||||
+ clangBasic
|
||||
+ clangFrontend
|
||||
+
|
||||
LINK_COMPONENTS
|
||||
Support
|
||||
)
|
||||
diff --git a/lldb/tools/lldb-instr/CMakeLists.txt b/lldb/tools/lldb-instr/CMakeLists.txt
|
||||
index e3dbeba..8da453b 100644
|
||||
--- a/lldb/tools/lldb-instr/CMakeLists.txt
|
||||
+++ b/lldb/tools/lldb-instr/CMakeLists.txt
|
||||
@@ -1,7 +1,7 @@
|
||||
add_lldb_tool(lldb-instr
|
||||
Instrument.cpp
|
||||
|
||||
- LINK_LIBS
|
||||
+ CLANG_LIBS
|
||||
clangAST
|
||||
clangBasic
|
||||
clangCodeGen
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -0,0 +1,131 @@
|
|||
From 2e94dca0c2cedf0bdbcf8517db2f3750ba95513b Mon Sep 17 00:00:00 2001
|
||||
From: serge-sans-paille <sguelton@redhat.com>
|
||||
Date: Tue, 2 Mar 2021 14:08:02 +0100
|
||||
Subject: [PATCH 2/2] [PATCH][lldb] Support DWARF-5 DW_FORM_line_strp (used by
|
||||
GCC)
|
||||
|
||||
---
|
||||
.../SymbolFile/DWARF/DWARFDebugInfoEntry.cpp | 1 +
|
||||
.../Plugins/SymbolFile/DWARF/DWARFFormValue.cpp | 73 +++++++++++-----------
|
||||
2 files changed, 39 insertions(+), 35 deletions(-)
|
||||
|
||||
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.cpp
|
||||
index 4212988..bce2529 100644
|
||||
--- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.cpp
|
||||
+++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.cpp
|
||||
@@ -173,6 +173,7 @@ bool DWARFDebugInfoEntry::Extract(const DWARFDataExtractor &data,
|
||||
break;
|
||||
|
||||
case DW_FORM_strp:
|
||||
+ case DW_FORM_line_strp:
|
||||
case DW_FORM_sec_offset:
|
||||
data.GetU32(&offset);
|
||||
break;
|
||||
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFFormValue.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFFormValue.cpp
|
||||
index 305f1cb..ec78c5b 100644
|
||||
--- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFFormValue.cpp
|
||||
+++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFFormValue.cpp
|
||||
@@ -150,40 +150,40 @@ struct FormSize {
|
||||
uint8_t valid:1, size:7;
|
||||
};
|
||||
static FormSize g_form_sizes[] = {
|
||||
- {0,0}, // 0x00 unused
|
||||
- {0,0}, // 0x01 DW_FORM_addr
|
||||
- {0,0}, // 0x02 unused
|
||||
- {0,0}, // 0x03 DW_FORM_block2
|
||||
- {0,0}, // 0x04 DW_FORM_block4
|
||||
- {1,2}, // 0x05 DW_FORM_data2
|
||||
- {1,4}, // 0x06 DW_FORM_data4
|
||||
- {1,8}, // 0x07 DW_FORM_data8
|
||||
- {0,0}, // 0x08 DW_FORM_string
|
||||
- {0,0}, // 0x09 DW_FORM_block
|
||||
- {0,0}, // 0x0a DW_FORM_block1
|
||||
- {1,1}, // 0x0b DW_FORM_data1
|
||||
- {1,1}, // 0x0c DW_FORM_flag
|
||||
- {0,0}, // 0x0d DW_FORM_sdata
|
||||
- {1,4}, // 0x0e DW_FORM_strp
|
||||
- {0,0}, // 0x0f DW_FORM_udata
|
||||
- {0,0}, // 0x10 DW_FORM_ref_addr (addr size for DWARF2 and earlier, 4 bytes for
|
||||
- // DWARF32, 8 bytes for DWARF32 in DWARF 3 and later
|
||||
- {1,1}, // 0x11 DW_FORM_ref1
|
||||
- {1,2}, // 0x12 DW_FORM_ref2
|
||||
- {1,4}, // 0x13 DW_FORM_ref4
|
||||
- {1,8}, // 0x14 DW_FORM_ref8
|
||||
- {0,0}, // 0x15 DW_FORM_ref_udata
|
||||
- {0,0}, // 0x16 DW_FORM_indirect
|
||||
- {1,4}, // 0x17 DW_FORM_sec_offset
|
||||
- {0,0}, // 0x18 DW_FORM_exprloc
|
||||
- {1,0}, // 0x19 DW_FORM_flag_present
|
||||
- {0,0}, // 0x1a
|
||||
- {0,0}, // 0x1b
|
||||
- {0,0}, // 0x1c
|
||||
- {0,0}, // 0x1d
|
||||
- {0,0}, // 0x1e
|
||||
- {0,0}, // 0x1f
|
||||
- {1,8}, // 0x20 DW_FORM_ref_sig8
|
||||
+ {0, 0}, // 0x00 unused
|
||||
+ {0, 0}, // 0x01 DW_FORM_addr
|
||||
+ {0, 0}, // 0x02 unused
|
||||
+ {0, 0}, // 0x03 DW_FORM_block2
|
||||
+ {0, 0}, // 0x04 DW_FORM_block4
|
||||
+ {1, 2}, // 0x05 DW_FORM_data2
|
||||
+ {1, 4}, // 0x06 DW_FORM_data4
|
||||
+ {1, 8}, // 0x07 DW_FORM_data8
|
||||
+ {0, 0}, // 0x08 DW_FORM_string
|
||||
+ {0, 0}, // 0x09 DW_FORM_block
|
||||
+ {0, 0}, // 0x0a DW_FORM_block1
|
||||
+ {1, 1}, // 0x0b DW_FORM_data1
|
||||
+ {1, 1}, // 0x0c DW_FORM_flag
|
||||
+ {0, 0}, // 0x0d DW_FORM_sdata
|
||||
+ {1, 4}, // 0x0e DW_FORM_strp
|
||||
+ {0, 0}, // 0x0f DW_FORM_udata
|
||||
+ {0, 0}, // 0x10 DW_FORM_ref_addr (addr size for DWARF2 and earlier, 4 bytes
|
||||
+ // for DWARF32, 8 bytes for DWARF32 in DWARF 3 and later
|
||||
+ {1, 1}, // 0x11 DW_FORM_ref1
|
||||
+ {1, 2}, // 0x12 DW_FORM_ref2
|
||||
+ {1, 4}, // 0x13 DW_FORM_ref4
|
||||
+ {1, 8}, // 0x14 DW_FORM_ref8
|
||||
+ {0, 0}, // 0x15 DW_FORM_ref_udata
|
||||
+ {0, 0}, // 0x16 DW_FORM_indirect
|
||||
+ {1, 4}, // 0x17 DW_FORM_sec_offset
|
||||
+ {0, 0}, // 0x18 DW_FORM_exprloc
|
||||
+ {1, 0}, // 0x19 DW_FORM_flag_present
|
||||
+ {0, 0}, // 0x1a DW_FORM_strx (ULEB128)
|
||||
+ {0, 0}, // 0x1b DW_FORM_addrx (ULEB128)
|
||||
+ {1, 4}, // 0x1c DW_FORM_ref_sup4
|
||||
+ {0, 0}, // 0x1d DW_FORM_strp_sup (4 bytes for DWARF32, 8 bytes for DWARF64)
|
||||
+ {1, 16}, // 0x1e DW_FORM_data16
|
||||
+ {1, 4}, // 0x1f DW_FORM_line_strp
|
||||
+ {1, 8}, // 0x20 DW_FORM_ref_sig8
|
||||
};
|
||||
|
||||
llvm::Optional<uint8_t>
|
||||
@@ -286,6 +286,7 @@ bool DWARFFormValue::SkipValue(dw_form_t form,
|
||||
// 32 bit for DWARF 32, 64 for DWARF 64
|
||||
case DW_FORM_sec_offset:
|
||||
case DW_FORM_strp:
|
||||
+ case DW_FORM_line_strp:
|
||||
*offset_ptr += 4;
|
||||
return true;
|
||||
|
||||
@@ -398,7 +399,8 @@ void DWARFFormValue::Dump(Stream &s) const {
|
||||
case DW_FORM_udata:
|
||||
s.PutULEB128(uvalue);
|
||||
break;
|
||||
- case DW_FORM_strp: {
|
||||
+ case DW_FORM_strp:
|
||||
+ case DW_FORM_line_strp: {
|
||||
const char *dbg_str = AsCString();
|
||||
if (dbg_str) {
|
||||
s.QuotedCString(dbg_str);
|
||||
@@ -606,6 +608,7 @@ bool DWARFFormValue::FormIsSupported(dw_form_t form) {
|
||||
case DW_FORM_flag:
|
||||
case DW_FORM_sdata:
|
||||
case DW_FORM_strp:
|
||||
+ case DW_FORM_line_strp:
|
||||
case DW_FORM_strx:
|
||||
case DW_FORM_strx1:
|
||||
case DW_FORM_strx2:
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
3810
D15067.id41365.diff
3810
D15067.id41365.diff
File diff suppressed because it is too large
Load Diff
Binary file not shown.
59
lldb.spec
59
lldb.spec
|
|
@ -1,10 +1,10 @@
|
|||
%global rc_ver 2
|
||||
%global baserelease 3
|
||||
%global lldb_srcdir %{name}-%{version}%{?rc_ver:rc%{rc_ver}}.src
|
||||
#global rc_ver 3
|
||||
%global lldb_version 12.0.1
|
||||
%global lldb_srcdir %{name}-%{lldb_version}%{?rc_ver:rc%{rc_ver}}.src
|
||||
|
||||
Name: lldb
|
||||
Version: 11.1.0
|
||||
Release: %{baserelease}%{?rc_ver:.rc%{rc_ver}}%{?dist}
|
||||
Version: %{lldb_version}%{?rc_ver:~rc%{rc_ver}}
|
||||
Release: 1%{?dist}
|
||||
Summary: Next generation high-performance debugger
|
||||
|
||||
License: NCSA
|
||||
|
|
@ -35,6 +35,9 @@ Requires: python3-lldb
|
|||
# For origin certification
|
||||
BuildRequires: gnupg2
|
||||
|
||||
Patch0: 0001-PATCH-lldb-Portable-asm-ptrace.h-include.patch
|
||||
Patch1: 0002-PATCH-lldb-Support-DWARF-5-DW_FORM_line_strp-used-by.patch
|
||||
|
||||
%description
|
||||
LLDB is a next generation, high-performance debugger. It is built as a set
|
||||
of reusable components which highly leverage existing libraries in the
|
||||
|
|
@ -52,6 +55,7 @@ The package contains header files for the LLDB debugger.
|
|||
%{?python_provide:%python_provide python3-lldb}
|
||||
Summary: Python module for LLDB
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-setuptools
|
||||
Requires: python3-six
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
|
|
@ -127,6 +131,51 @@ rm -f %{buildroot}%{python3_sitearch}/six.*
|
|||
%{python3_sitearch}/lldb
|
||||
|
||||
%changelog
|
||||
* Wed Jul 14 2021 Tom Stellard <tstellar@redhat.com> - 12.0.1-1
|
||||
- 12.0.1 Release
|
||||
|
||||
* Wed Jun 09 2021 Tom Stellard <tstellar@redhat.com> - 12.0.0-3
|
||||
- Bump release again to correct older nvr typo
|
||||
|
||||
* Mon Jun 07 2021 Tom Stellard <tstellar@redhat.com> - 12.0.0-2
|
||||
- Bump release to correct older nvr typo
|
||||
|
||||
* Fri Apr 16 2021 Tom Stellard <tstellar@redhat.com> - 12.0.0-1
|
||||
- 12.0.0 Release
|
||||
|
||||
* Thu Apr 08 2021 sguelton@redhat.com - 12.0.0-11.rc5
|
||||
- New upstream release candidate
|
||||
|
||||
* Fri Apr 02 2021 sguelton@redhat.com - 12.0.0-10.rc4
|
||||
- New upstream release candidate
|
||||
|
||||
* Wed Mar 31 2021 Jonathan Wakely <jwakely@redhat.com> - 12.0.0-9.rc3
|
||||
- Rebuilt for removed libstdc++ symbols (#1937698)
|
||||
|
||||
* Thu Mar 11 2021 sguelton@redhat.com - 12.0.0-8.rc3
|
||||
- LLVM 12.0.0 rc3
|
||||
|
||||
* Thu Mar 11 2021 sguelton@redhat.com - 12.0.0-7.rc2
|
||||
- rebuilt
|
||||
|
||||
* Tue Mar 02 2021 sguelton@redhat.com - 12.0.0-6.rc2
|
||||
- Update test regexp
|
||||
|
||||
* Tue Mar 02 2021 sguelton@redhat.com - 12.0.0-5.rc2
|
||||
- Improve CI debugging
|
||||
|
||||
* Tue Mar 02 2021 sguelton@redhat.com - 12.0.0-4.rc2
|
||||
- Apply upstream D97721
|
||||
|
||||
* Mon Mar 01 2021 sguelton@redhat.com - 12.0.0-3.rc2
|
||||
- Update CI test
|
||||
|
||||
* Thu Feb 25 2021 sguelton@redhat.com - 12.0.0-0.2.rc2
|
||||
- 12.0.0-rc2 release
|
||||
|
||||
* Wed Feb 17 2021 sguelton@redhat.com - 12.0.0-0.1.rc1
|
||||
- 12.0.0-rc1 release
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 11.1.0-3.rc2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
|
|
@ -1,92 +0,0 @@
|
|||
commit 9ad9480c3a380a04b3dbe869c0675d6bba37247b
|
||||
Author: Kamil Rytarowski <n54@gmx.com>
|
||||
Date: Thu May 25 20:12:30 2017 +0000
|
||||
|
||||
Fix bug #28898
|
||||
lldb: libedit produces garbled, unusable input on Linux
|
||||
|
||||
Apply patch from Christos Zoulas, upstream libedit developer.
|
||||
It has been tested on NetBSD/amd64.
|
||||
|
||||
New code supports combination of wide libedit and disabled
|
||||
LLDB_EDITLINE_USE_WCHAR, which was the popular case on Linux
|
||||
systems.
|
||||
|
||||
|
||||
git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@303907 91177308-0d34-0410-b5e6-96231b3b80d8
|
||||
|
||||
diff --git a/include/lldb/Host/Editline.h b/include/lldb/Host/Editline.h
|
||||
index 2b1a8e0..0b75e9c 100644
|
||||
--- a/include/lldb/Host/Editline.h
|
||||
+++ b/include/lldb/Host/Editline.h
|
||||
@@ -82,8 +82,14 @@ using EditLineStringStreamType = std::stringstream;
|
||||
using EditLineCharType = char;
|
||||
#endif
|
||||
|
||||
+#ifdef EL_CLIENTDATA /* editline with wide support + wide char read function */
|
||||
+using EditLineGetCharType = wchar_t;
|
||||
+#else
|
||||
+using EditLineGetCharType = char;
|
||||
+#endif
|
||||
+
|
||||
typedef int (*EditlineGetCharCallbackType)(::EditLine *editline,
|
||||
- EditLineCharType *c);
|
||||
+ EditLineGetCharType *c);
|
||||
typedef unsigned char (*EditlineCommandCallbackType)(::EditLine *editline,
|
||||
int ch);
|
||||
typedef const char *(*EditlinePromptCallbackType)(::EditLine *editline);
|
||||
@@ -270,7 +276,7 @@ private:
|
||||
|
||||
/// Character reading implementation for EditLine that supports our multi-line
|
||||
/// editing trickery.
|
||||
- int GetCharacter(EditLineCharType *c);
|
||||
+ int GetCharacter(EditLineGetCharType *c);
|
||||
|
||||
/// Prompt implementation for EditLine.
|
||||
const char *Prompt();
|
||||
@@ -323,7 +329,7 @@ private:
|
||||
/// single or multi-line editing.
|
||||
void ConfigureEditor(bool multiline);
|
||||
|
||||
- bool CompleteCharacter(char ch, EditLineCharType &out);
|
||||
+ bool CompleteCharacter(char ch, EditLineGetCharType &out);
|
||||
|
||||
private:
|
||||
#if LLDB_EDITLINE_USE_WCHAR
|
||||
diff --git a/source/Host/common/Editline.cpp b/source/Host/common/Editline.cpp
|
||||
index 7d4b398..7b580dd 100644
|
||||
--- a/source/Host/common/Editline.cpp
|
||||
+++ b/source/Host/common/Editline.cpp
|
||||
@@ -474,7 +474,7 @@ unsigned char Editline::RecallHistory(bool earlier) {
|
||||
return CC_NEWLINE;
|
||||
}
|
||||
|
||||
-int Editline::GetCharacter(EditLineCharType *c) {
|
||||
+int Editline::GetCharacter(EditLineGetCharType *c) {
|
||||
const LineInfoW *info = el_wline(m_editline);
|
||||
|
||||
// Paint a faint version of the desired prompt over the version libedit draws
|
||||
@@ -969,7 +969,7 @@ void Editline::ConfigureEditor(bool multiline) {
|
||||
}));
|
||||
|
||||
el_wset(m_editline, EL_GETCFN, (EditlineGetCharCallbackType)([](
|
||||
- EditLine *editline, EditLineCharType *c) {
|
||||
+ EditLine *editline, EditLineGetCharType *c) {
|
||||
return Editline::InstanceFor(editline)->GetCharacter(c);
|
||||
}));
|
||||
|
||||
@@ -1360,12 +1360,12 @@ void Editline::PrintAsync(Stream *stream, const char *s, size_t len) {
|
||||
}
|
||||
}
|
||||
|
||||
-bool Editline::CompleteCharacter(char ch, EditLineCharType &out) {
|
||||
+bool Editline::CompleteCharacter(char ch, EditLineGetCharType &out) {
|
||||
#if !LLDB_EDITLINE_USE_WCHAR
|
||||
if (ch == (char)EOF)
|
||||
return false;
|
||||
|
||||
- out = ch;
|
||||
+ out = (unsigned char)ch;
|
||||
return true;
|
||||
#else
|
||||
std::codecvt_utf8<wchar_t> cvt;
|
||||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (lldb-11.1.0rc2.src.tar.xz) = 0091a80c591c9321710cf554d16cf3e19c4539503f0b8e1c190b343d60216e72bcfecad792a11b3479d18a3d0c6eb8074d7de03c502d72fa30f00ae67bb1159b
|
||||
SHA512 (lldb-11.1.0rc2.src.tar.xz.sig) = 8cda4e5beefcc8c9282005360377d39ad34040700adb6ca2dbd2a00309e9098451e77c084af98cd189304f9879ece59aee57106ddc53a045adfeba204ef41dc9
|
||||
SHA512 (lldb-12.0.1.src.tar.xz) = df3c8e088bf69fb843cd7365fd2df4cefb72c9a313511fb0d0fa3e06e7d12cada35a1d621ec4312c99799e68ff76955423993ce0310c58f74ccd5151984f38ee
|
||||
SHA512 (lldb-12.0.1.src.tar.xz.sig) = f11f9763213470a9041dedaea64e074f16854b7258543af58fb86c0a84aa8ee60cf4c36984f707276aa79ace7d4152a8b15079a6b50f55c156d3976d8b6b1eb9
|
||||
|
|
|
|||
|
|
@ -0,0 +1,38 @@
|
|||
#!/bin/bash
|
||||
|
||||
usage() {
|
||||
echo "usage `basename $0` [OPTIONS]"
|
||||
echo " --threads NUM The number of threads to use for running tests."
|
||||
}
|
||||
|
||||
thread_args=""
|
||||
repo_url=https://github.com/opencollab/llvm-toolchain-integration-test-suite
|
||||
|
||||
while [ $# -gt 0 ]; do
|
||||
case $1 in
|
||||
--threads)
|
||||
shift
|
||||
threads="$1"
|
||||
;;
|
||||
* )
|
||||
echo "unknown option: $1"
|
||||
echo ""
|
||||
usage
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
|
||||
if [ -n "$threads" ]; then
|
||||
thread_args="-j$threads"
|
||||
fi
|
||||
|
||||
set -xe
|
||||
|
||||
cd $(mktemp -d -p /var/tmp)
|
||||
git clone $repo_url
|
||||
cd llvm-toolchain-integration-test-suite
|
||||
mkdir _build && cd _build
|
||||
cmake .. -GNinja
|
||||
ninja $thread_args check
|
||||
|
|
@ -4,8 +4,12 @@ set -ex
|
|||
|
||||
g++ -g test.cpp
|
||||
|
||||
test `lldb -b -o 'breakpoint set --file test.cpp --line 7' -o run -o 'p v' -- a.out \
|
||||
| grep \
|
||||
-e '(std::vector<int, std::allocator<int> >) $0 = size=1 {' \
|
||||
lldb -b -o 'breakpoint set --file test.cpp --line 7' -o run -o 'p v' -- a.out | tee lldb.log
|
||||
|
||||
test `grep \
|
||||
-e '(std::vector<int, std::allocator<> >) $0 = size=1 {' \
|
||||
-e '\[0\] = 2' \
|
||||
lldb.log \
|
||||
| wc -l` -eq 2
|
||||
|
||||
rm lldb.log
|
||||
|
|
|
|||
|
|
@ -18,8 +18,26 @@
|
|||
required_packages:
|
||||
- gcc-c++
|
||||
- lldb
|
||||
# the requirements below are for the integration suite
|
||||
- cmake
|
||||
- llvm-devel
|
||||
- clang
|
||||
- clang-analyzer
|
||||
- clang-tools-extra
|
||||
- compiler-rt
|
||||
- ninja-build
|
||||
- libcxx-devel
|
||||
- libomp-devel
|
||||
- python-lit
|
||||
- lld
|
||||
- lldb
|
||||
- git
|
||||
- make
|
||||
- libstdc++-static
|
||||
- clang-devel
|
||||
tests:
|
||||
# rhbz#1567262
|
||||
- python-embedded-interpreter:
|
||||
dir: python-embedded-interpreter
|
||||
run: ./runtest.sh
|
||||
- integration-test-suite
|
||||
|
|
|
|||
Loading…
Reference in New Issue