From fb022829fe7d177f98519342fbe3d91ccc06ef34 Mon Sep 17 00:00:00 2001
From: James Antill <jantill@redhat.com>
Date: Thu, 23 Feb 2023 12:52:01 -0500
Subject: [PATCH] Import rpm: d37987799e9413ac96c59b72cf8e375c5635c8ad

---
 .gitignore                             |   4 ++--
 disable-std-vector-prettyprinter.patch |  15 +++++++++++++
 lldb-15.0.7.src.tar.xz.sig             | Bin 0 -> 566 bytes
 lldb.spec                              |  30 +++++++++++++++++++++++--
 sources                                |   4 ++--
 5 files changed, 47 insertions(+), 6 deletions(-)
 create mode 100644 disable-std-vector-prettyprinter.patch
 create mode 100644 lldb-15.0.7.src.tar.xz.sig

diff --git a/.gitignore b/.gitignore
index 4f26533..07c3c26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/lldb-14.0.0.src.tar.xz
-SOURCES/tstellar-gpg-key.asc
+SOURCES/lldb-15.0.7.src.tar.xz
+SOURCES/release-keys.asc
diff --git a/disable-std-vector-prettyprinter.patch b/disable-std-vector-prettyprinter.patch
new file mode 100644
index 0000000..1f1150b
--- /dev/null
+++ b/disable-std-vector-prettyprinter.patch
@@ -0,0 +1,15 @@
+diff -ruN lldb-14.0.0.src.orig/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp lldb-14.0.0.src/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp
+--- a/lldb-14.0.0.src.orig/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp	2022-03-14 10:44:55.000000000 +0100
++++ b/lldb-14.0.0.src/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp	2022-06-08 07:06:32.227607437 +0200
+@@ -940,11 +940,6 @@
+   stl_deref_flags.SetFrontEndWantsDereference();
+ 
+   cpp_category_sp->GetRegexTypeSyntheticsContainer()->Add(
+-      RegularExpression("^std::vector<.+>(( )?&)?$"),
+-      SyntheticChildrenSP(new ScriptedSyntheticChildren(
+-          stl_synth_flags,
+-          "lldb.formatters.cpp.gnu_libstdcpp.StdVectorSynthProvider")));
+-  cpp_category_sp->GetRegexTypeSyntheticsContainer()->Add(
+       RegularExpression("^std::map<.+> >(( )?&)?$"),
+       SyntheticChildrenSP(new ScriptedSyntheticChildren(
+           stl_synth_flags,
diff --git a/lldb-15.0.7.src.tar.xz.sig b/lldb-15.0.7.src.tar.xz.sig
new file mode 100644
index 0000000000000000000000000000000000000000..00d3ebd59e6652dbf6828162d9f34a4c899a2a4c
GIT binary patch
literal 566
zcmV-60?GY}0y6{v0SEvc79j*jP9iaCzek0rjBbvi$CRmtL7j>P0%O0rK>!K~5TeJF
zsfIzFilz4t|4-n7G1UPfob{31?i!2_zDKG8Ku{L+ohmR)=GAY*h`4lNc=of#m5x1;
zP$F$O^c1f#m2@bXK$0omoHK>Sp>){<_>nT=(~vjxpRT8W7i6**Q8OpXD8+oEtk8mO
zpLXMrmwt!e`8{_HhfW}dZ;8siU)#k0-wV$@{OXZgw_~(59N!LaKCpvMw{ZH94t<=I
zAMYm?1kw>59jhDU#9!Bh5IRNsg36@Y<9<8U>UK^8?>#NwPQI^JPyMba8}|<_C?%-#
zmvT^trD#IRK=yJa%^x7LVBgli3$!Leg*<y|68pw#6SZ%bj@{<D3BRdVY(IO_^Uj{i
zgFE59n2K$rdcxzmC_peoE&HK%yw5`*Zcc&ZH?<LIt3Lf(ST_nAVG-*<G~7oZcLqL`
z3@f#ULj+gbK2LC%>s$TVmY9&?vm4_SN=$q8lm^pcsfgRqRO^&9)p4gX+&w5Ng>F}3
z2O1f~Oy=?sZqf&M4F>iJpO3RC?f=iZ6pwl>=ux1~O26DJn!H!<*hbj$>k3~O-Fb!}
zBN&DX?pXIoM~qCBNw|3nv<ix4@&Ih}UIuoe#krK7?6bS3RB01Y{M(!z?`uL^_dFiq
zy~OQ9N5-nCLWV2?c4av-xCtjO`*QS^Ka8cCm1f${bs@XG?OAPC*Fj8^sFwxTM}|SJ
ECYuNn@&Et;

literal 0
HcmV?d00001

diff --git a/lldb.spec b/lldb.spec
index fa1fd87..e4cda1a 100644
--- a/lldb.spec
+++ b/lldb.spec
@@ -1,7 +1,12 @@
-%global lldb_version 14.0.0
+%global lldb_version 15.0.7
 #global rc_ver 2
 %global lldb_srcdir %{name}-%{lldb_version}%{?rc_ver:rc%{rc_ver}}.src
 
+%ifarch ppc64le
+# Too many threads on some systems causes OOM errors.
+%global _smp_mflags -j8
+%endif
+
 Name:		lldb
 Version:	%{lldb_version}%{?rc_ver:~rc%{rc_ver}}
 Release:	1%{?dist}
@@ -11,7 +16,7 @@ License:	NCSA
 URL:		http://lldb.llvm.org/
 Source0:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{lldb_version}%{?rc_ver:-rc%{rc_ver}}/%{lldb_srcdir}.tar.xz
 Source1:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{lldb_version}%{?rc_ver:-rc%{rc_ver}}/%{lldb_srcdir}.tar.xz.sig
-Source2:	tstellar-gpg-key.asc
+Source2:	release-keys.asc
 
 BuildRequires:	gcc
 BuildRequires:	gcc-c++
@@ -32,6 +37,15 @@ BuildRequires:	multilib-rpm-config
 
 Requires:	python3-lldb
 
+# There is a problem with the debug info generated by the
+# GCC version we ship in RHEL 8. It somehow makes it very
+# hard for lldb to inspect std::vector types.
+# Disable the pretty-printer for now, since otherwise
+# such vectors look empty to the developer even though
+# they aren't.
+# See https://bugzilla.redhat.com/show_bug.cgi?id=2082508
+Patch001:	disable-std-vector-prettyprinter.patch
+
 # For origin certification
 BuildRequires:	gnupg2
 
@@ -132,6 +146,18 @@ rm -f %{buildroot}%{python3_sitearch}/six.*
 %{python3_sitearch}/lldb
 
 %changelog
+* Thu Jan 19 2023 Tom Stellard <tstellar@redhat.com> - 15.0.7-1
+- Update to LLVM 15.0.7
+
+* Tue Sep 06 2022 Nikita Popov <npopov@redhat.com> - 15.0.0-1
+- Update to LLVM 15.0.0
+
+* Tue Jun 28 2022 Tom Stellard <tstellar@redhat.com> - 14.0.6-1
+- 14.0.6 Release
+
+* Wed Jun 08 2022 Timm Bäder <tbaeder@redhat.com> - 14.0.0-2
+- Disable libstdc++ std::vector prettyprinter
+
 * Thu Apr 07 2022 Timm Bäder <tbaeder@redhat.com> - 14.0.0-1
 - Update to 14.0.0
 
diff --git a/sources b/sources
index 168e38f..39bebb3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (lldb-14.0.0.src.tar.xz) = 496121383b10c9feceb775f88fe5d1deb3c2c23b6993aabdb02c0e643c8eab9e86821ea5dd0ba37380ce6fa8aae99ad88616257f638d9642c06ba381a1acbf4e
-SHA512 (tstellar-gpg-key.asc) = a6720905008fab485d24263c4a65b0b379636a2dfa38e14bbcd2cc9a48afb9f66afe179f5f455c49902512ddb76517afd456a2c02d942fec1a2d764142834f4d
+SHA1 (lldb-15.0.7.src.tar.xz) = 2966a93fab2ed784f0afbad548ba20ec39c77c28
+SHA1 (release-keys.asc) = 347bdd5ee6d6b93c9644c268511815912c0fb2dc