From 418b0808fd0dcc4105d42ad29be21f8512a5d8e3 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 5 Oct 2021 09:11:53 -0400 Subject: [PATCH] import lldb-12.0.1-1.module+el8.5.0+11871+08d0eab5 --- .gitignore | 4 +- .lldb.metadata | 4 +- ...H-lldb-Portable-asm-ptrace.h-include.patch | 26 ++++ ...rt-DWARF-5-DW_FORM_line_strp-used-by.patch | 131 ++++++++++++++++++ SOURCES/lldb-11.0.0.src.tar.xz.sig | Bin 566 -> 0 bytes SOURCES/lldb-12.0.1.src.tar.xz.sig | Bin 0 -> 566 bytes SPECS/lldb.spec | 36 ++--- 7 files changed, 181 insertions(+), 20 deletions(-) create mode 100644 SOURCES/0001-PATCH-lldb-Portable-asm-ptrace.h-include.patch create mode 100644 SOURCES/0002-PATCH-lldb-Support-DWARF-5-DW_FORM_line_strp-used-by.patch delete mode 100644 SOURCES/lldb-11.0.0.src.tar.xz.sig create mode 100644 SOURCES/lldb-12.0.1.src.tar.xz.sig diff --git a/.gitignore b/.gitignore index cc47929..e8b41ff 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/hans-gpg-key.asc -SOURCES/lldb-11.0.0.src.tar.xz +SOURCES/lldb-12.0.1.src.tar.xz +SOURCES/tstellar-gpg-key.asc diff --git a/.lldb.metadata b/.lldb.metadata index 4d1285a..3868b2c 100644 --- a/.lldb.metadata +++ b/.lldb.metadata @@ -1,2 +1,2 @@ -32fa4b0193960f05064f2ab31b5a89c7cf48a0b9 SOURCES/hans-gpg-key.asc -6bdb22e6b5e4700269f23452d66b0bddee93e008 SOURCES/lldb-11.0.0.src.tar.xz +07c4844f5a13ff063fed5b7c5c67b8aef4d1bb7b SOURCES/lldb-12.0.1.src.tar.xz +b8d2648a01d36ed0186fd2c5af325fd28797f9a0 SOURCES/tstellar-gpg-key.asc diff --git a/SOURCES/0001-PATCH-lldb-Portable-asm-ptrace.h-include.patch b/SOURCES/0001-PATCH-lldb-Portable-asm-ptrace.h-include.patch new file mode 100644 index 0000000..b98082e --- /dev/null +++ b/SOURCES/0001-PATCH-lldb-Portable-asm-ptrace.h-include.patch @@ -0,0 +1,26 @@ +From 6349965eccf12178cd4235e9f8996142d12ff607 Mon Sep 17 00:00:00 2001 +From: serge-sans-paille +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 ++#include ++#include + + namespace lldb_private { + namespace process_linux { +-- +1.8.3.1 + diff --git a/SOURCES/0002-PATCH-lldb-Support-DWARF-5-DW_FORM_line_strp-used-by.patch b/SOURCES/0002-PATCH-lldb-Support-DWARF-5-DW_FORM_line_strp-used-by.patch new file mode 100644 index 0000000..bd1f694 --- /dev/null +++ b/SOURCES/0002-PATCH-lldb-Support-DWARF-5-DW_FORM_line_strp-used-by.patch @@ -0,0 +1,131 @@ +From 2e94dca0c2cedf0bdbcf8517db2f3750ba95513b Mon Sep 17 00:00:00 2001 +From: serge-sans-paille +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 +@@ -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 + diff --git a/SOURCES/lldb-11.0.0.src.tar.xz.sig b/SOURCES/lldb-11.0.0.src.tar.xz.sig deleted file mode 100644 index b0e362a93f3c9f6e492d11068b08cf42ac8d3c5b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SW*e79j+-$oYbTxkTfz)xuK`!vrogTF_ku0$+p^4FC!W5D&uy zE;L%uUD$IE{0NYb=}rCge(O`lGX>a1@l6BoeES4+ZXQ+yP%|qsmovk_OO41SeYf*C zQuMqh=E3YDScY01(NC@hV0VY;TXtc}N}CZ?6|$=LiINiR2VWx?_SLtpsNGvPf#ZxO zo+-M^GNdnaPI!=^_!Lo)wEKrJ`<~^}Tz)oNR=ZA z4jyK}xOJ+lI7{C%5JOVt2M^Ua#bQWc7b6FWuj(*&cKUwV`f@FlYK{SD1mZD9?TVT5 zqaZKLcoiC58BwI~vrC2>#^PI9b~1{~YLbC|8vw=MH2^+`uH^|gdtRUMjauW+&jVeG z67$j29$?E^R$SW7cKlM`~r{O?=DV9RA~nup}^o16HO6P@qX( zdT<4ghk?TZlvg5%f3)=+mH0)IW-8$P-{Tvpx3S{ELnX#lHFNs5W+J+2;FrNpmPUF@ zdzA>oyO~oychD3)&O=mmF7pZpk?hn9i_fP)Zf(<&C*_XD$*BUnRzH)iabUY1#U|sE z7MGAHs2l5MJLP>pPqUBTen(lfY906>SSup}zjJLc@g6d`=jFvGN1qvIVydUkvV4PQ zfcHsaPNq;oolT$t|F5o`oDWBvXBLg%L*XHA2!sTm9Ru3CuS^&zuJ%sY>(7Uy%w&g8 Er*6v)kpKVy diff --git a/SOURCES/lldb-12.0.1.src.tar.xz.sig b/SOURCES/lldb-12.0.1.src.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000..34c887ea1680396af35af7ac95c46763d76ae774 GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j*jP9iaCzek0rjBbvi$CRmtL7j>P0$}Ie&j1Pu5TeJF zsfIzFilXHY{T&uGR2){b-PK*qLm>|2jyhOx`xf%Yn!%TPx~iFcM+rAY0Ze>-OZ#gn zJA)WZub@cdWyR3CO;l+7{mRkZ)EP`e`GP#!Ts%=Zg9Im_Y!AmiMM^kZz%hpLw%Qh8 zA088mj>(GdA|SxE&t~5d^+-D6Yj1Cpxt>cTk0M16k9w6a(sbGhuaI==$DoYoARUwT zZ#lJ79rhM6?YQ$AnlSlpX&Ixb$n#3VvFWsBz|hwt_S|O|$Z93DsBb)9aIKASE9g5Yg|`c(UGUm1!4$wXnsz}mlTyV~ zrN}QPv5i7uN98Bn(q8I&f?*mK@i{A-FaF+M*yqA`GVRF#}Gm4#%&QNigm)WP8 zoej4b?GD)e)FN$+0Onnh$iN)5d}G+l>`<>ujN;|;JEPJ*G>Y zu`fLLq9