packages/lldb18
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade lldb to 12.0.1

Browse Source 
(cherry picked from commit ba8aa74a7aeac8d92cbef4d7d4ffb381e920e105)
This commit is contained in:
chen-jan 2022-01-06 15:35:07 +08:00 committed by openeuler-sync-bot
parent ef06699448
commit c06a9997fd
4 changed files with 220 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
0001-PATCH-lldb-Portable-asm-ptrace.h-include.patch Normal file
View File

@ -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

131
0002-PATCH-lldb-Support-DWARF-5-DW_FORM_line_strp-used-by.patch Normal file
View File

@ -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

BIN
lldb-10.0.1.src.tar.xz → lldb-12.0.1.src.tar.xz
View File

Binary file not shown.

39
lldb.spec
View File

@ -1,5 +1,5 @@
Name: lldb Name: lldb
Version: 10.0.1 Version: 12.0.1
Release: 1 Release: 1
Summary: Next generation high-performance debugger Summary: Next generation high-performance debugger
@ -7,12 +7,30 @@ License: NCSA
URL: http://lldb.llvm.org/ URL: http://lldb.llvm.org/
Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{name}-%{version}.src.tar.xz Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{name}-%{version}.src.tar.xz
BuildRequires: cmake llvm-devel = %{version} llvm-test = %{version} clang-devel = %{version} BuildRequires: gcc
BuildRequires: ncurses-devel swig llvm-static = %{version} libffi-devel zlib-devel BuildRequires: gcc-c++
BuildRequires: libxml2-devel libedit-devel python3-lit BuildRequires: cmake
BuildRequires: llvm-devel = %{version}
BuildRequires: llvm-test = %{version}
BuildRequires: clang-devel = %{version}
BuildRequires: ncurses-devel
BuildRequires: swig
BuildRequires: llvm-static = %{version}
BuildRequires: libffi-devel
BuildRequires: zlib-devel
BuildRequires: libxml2-devel
BuildRequires: libedit-devel
BuildRequires: python3-lit
BuildRequires: multilib-rpm-config
Requires: python3-lldb 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 %description
LLDB is a next generation, high-performance debugger. It is built as a set LLDB is a next generation, high-performance debugger. It is built as a set
of reusable components which highly leverage existing libraries in the of reusable components which highly leverage existing libraries in the
@ -21,7 +39,7 @@ disassembler.
%package devel %package devel
Summary: Development header files for LLDB Summary: Development header files for LLDB
Requires: %{name} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel %description devel
The package contains header files for the LLDB debugger. The package contains header files for the LLDB debugger.
@ -30,7 +48,9 @@ The package contains header files for the LLDB debugger.
%{?python_provide:%python_provide python3-lldb} %{?python_provide:%python_provide python3-lldb}
Summary: Python module for LLDB Summary: Python module for LLDB
BuildRequires: python3-devel BuildRequires: python3-devel
BuildRequires: python3-setuptools
Requires: python3-six Requires: python3-six
Requires: %{name}%{?_isa} = %{version}-%{release}
%description -n python3-lldb %description -n python3-lldb
The package contains the LLDB Python module. The package contains the LLDB Python module.
@ -51,6 +71,7 @@ CXXFLAGS="%{optflags} -Wno-error=format-security"
%cmake .. \ %cmake .. \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_SKIP_RPATH:BOOL=ON \
-DLLVM_LINK_LLVM_DYLIB:BOOL=ON \ -DLLVM_LINK_LLVM_DYLIB:BOOL=ON \
-DLLVM_CONFIG:FILEPATH=/usr/bin/llvm-config-%{__isa_bits} \ -DLLVM_CONFIG:FILEPATH=/usr/bin/llvm-config-%{__isa_bits} \
\ \
@ -90,7 +111,11 @@ rm -f %{buildroot}%{python3_sitearch}/six.*
%ldconfig_scriptlets %ldconfig_scriptlets
%check
%files %files
%license LICENSE.TXT
%{_bindir}/lldb* %{_bindir}/lldb*
%{_libdir}/liblldb.so.* %{_libdir}/liblldb.so.*
%{_libdir}/liblldbIntelFeatures.so.* %{_libdir}/liblldbIntelFeatures.so.*
@ -103,7 +128,11 @@ rm -f %{buildroot}%{python3_sitearch}/six.*
%{python3_sitearch}/lldb %{python3_sitearch}/lldb
%changelog %changelog
* Thu Jan 06 2022 Chen Chen <chen_aka_jan@163.com> - 12.0.1-1
- upgrade lldb to 12.0.1
* Mon Oct 12 2020 wangxiao <wangxiao65@huawei.com> - 10.0.1-1 * Mon Oct 12 2020 wangxiao <wangxiao65@huawei.com> - 10.0.1-1
- upgrade lldb to 10.0.1 - upgrade lldb to 10.0.1
* Mon Dec 2 2019 likexin <likexin@huawei.com> 7.0.0-2 * Mon Dec 2 2019 likexin <likexin@huawei.com> 7.0.0-2
- Package init - Package init