From 0c3c1859bd4d8917665e4f0e56b03ecbb87bcf0a Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 27 Sep 2022 09:02:20 -0400
Subject: [PATCH] import lldb-14.0.6-1.el9

---
 .gitignore                             |   2 +-
 .lldb.metadata                         |   2 +-
 SOURCES/increase-m_hwp_regs-size.patch |  12 ++++++++
 SOURCES/lldb-13.0.1.src.tar.xz.sig     | Bin 566 -> 0 bytes
 SOURCES/lldb-14.0.6.src.tar.xz.sig     | Bin 0 -> 566 bytes
 SPECS/lldb.spec                        |  38 +++++++++++++++++++------
 6 files changed, 44 insertions(+), 10 deletions(-)
 create mode 100644 SOURCES/increase-m_hwp_regs-size.patch
 delete mode 100644 SOURCES/lldb-13.0.1.src.tar.xz.sig
 create mode 100644 SOURCES/lldb-14.0.6.src.tar.xz.sig

diff --git a/.gitignore b/.gitignore
index 5b68c90..9aa46b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/lldb-13.0.1.src.tar.xz
+SOURCES/lldb-14.0.6.src.tar.xz
 SOURCES/tstellar-gpg-key.asc
diff --git a/.lldb.metadata b/.lldb.metadata
index 9a9196a..fe0b5bb 100644
--- a/.lldb.metadata
+++ b/.lldb.metadata
@@ -1,2 +1,2 @@
-23b6e1dd5295965ec0adfe4447787f95d24b07c3 SOURCES/lldb-13.0.1.src.tar.xz
+1d5b26df4c008adeb484b76caf115f7ac692c7b0 SOURCES/lldb-14.0.6.src.tar.xz
 b8d2648a01d36ed0186fd2c5af325fd28797f9a0 SOURCES/tstellar-gpg-key.asc
diff --git a/SOURCES/increase-m_hwp_regs-size.patch b/SOURCES/increase-m_hwp_regs-size.patch
new file mode 100644
index 0000000..7bf03f1
--- /dev/null
+++ b/SOURCES/increase-m_hwp_regs-size.patch
@@ -0,0 +1,12 @@
+diff -ruN lldb-13.0.1.src.orig/source/Plugins/Process/Linux/NativeRegisterContextLinux_ppc64le.h lldb-13.0.1.src/source/Plugins/Process/Linux/NativeRegisterContextLinux_ppc64le.h
+--- a/lldb-13.0.1.src.orig/source/Plugins/Process/Linux/NativeRegisterContextLinux_ppc64le.h	2022-01-20 22:31:59.000000000 +0100
++++ b/lldb-13.0.1.src/source/Plugins/Process/Linux/NativeRegisterContextLinux_ppc64le.h	2022-03-30 08:02:16.292360951 +0200
+@@ -122,7 +122,7 @@
+     int mode;               // Defines if watchpoint is read/write/access.
+   };
+ 
+-  std::array<DREG, 4> m_hwp_regs;
++  std::array<DREG, 16> m_hwp_regs;
+ 
+   // 16 is just a maximum value, query hardware for actual watchpoint count
+   uint32_t m_max_hwp_supported = 16;
diff --git a/SOURCES/lldb-13.0.1.src.tar.xz.sig b/SOURCES/lldb-13.0.1.src.tar.xz.sig
deleted file mode 100644
index 5856c4dd02b80dcde388c43032215d2e6e57a2dc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 566
zcmV-60?GY}0y6{v0SEvc79j*jP9iaCzek0rjBbvi$CRmtL7j>P0%7``3jhiU5TeJF
zsfIzFifrN!{T;Yi4YAeE2|W=F`LJJ;4G|{eNi(|fB)>a<iR8ls%!$ZPtN;l2>>mGf
z`~drD01J<i#=iMD|3xvD+gV+-Z`J|`kBk*pLfB`B3c~=7s8Bg$2&JuvlY<5IS~w>C
zuAJyF+G#@RHnWh3cnH;M7{rVyL~*%RU~a`V1ZNOBsVq!MtWxm9Hm?3vzf#pCHKG=F
z-8_2oy9hln%y1nJYKB==A){{L^!+yMo=JK~Z7u{?BdH!iWFi{pB0`^2ch^-@{~<2W
zQ65I#=OjECMyf<Q+{BSjfT)vdaoW5lV|PgPEC>sHU{WYg&PrIXJ|nQ~{SBcwE>=Y-
zC7YF06<9r_@y-n&=Q#SVmiQ3pkBaVveV6Sz(m1SWWvlxdYa7Fs8p3S~Ic@Fs(&S(%
zPaxW;_s=z3*l_waC<&?$V_aYqyA6ZR8fIwmI~AMRzZWn6NtcuV-n17W?ag@78t#2F
zazDO<>we4XC9??5f4!pYv-rXfGZI=r!UHu0hc_CQ8|nl2!gV3ds7P^!Eb_G04Vld)
z_a)@jyS#%i(^-d@`VDD_3<vs!URm9-D04#lZ9HZGtZy}iRk!opOiA4qCr#u%IOrqx
zZ<o!6q1}XS;#2`d`t_oTm~g|>7G(!X`k3z+^M7vU)?k4ozC_`8jmu7Yo^g-A$DLR=
EBBD+TSO5S3

diff --git a/SOURCES/lldb-14.0.6.src.tar.xz.sig b/SOURCES/lldb-14.0.6.src.tar.xz.sig
new file mode 100644
index 0000000000000000000000000000000000000000..fd1e0716a1aed98669718f79aa38c4e0d67040f4
GIT binary patch
literal 566
zcmV-60?GY}0y6{v0SEvc79j*jP9iaCzek0rjBbvi$CRmtL7j>P0%Ep`W&jEa5TeJF
zsfIzFieF$4|9ac%<8kT^6H6_N{fii0KTFW55#+2yr^KNuz6X~Moz9jOe!lT0<Q}5|
z<$Uj}3^n@YY%DVdb+nX1?S0s;gew}JU3pzAG!ExHL?a6&gieFJ(5Q=pyid-E=`Kd8
zoDp|jAeQ6(AQ1_&fDe_h!ZcDXH0^q)#}J7>zZCiEV)D$4KOFYC9G13TOjg?CGa4Ua
z5tW-V$~__bfhJD?j$A}?9l8%emr2dLx{I^luh7h*N}}9zsVF~k-;hCqcwu$pxZ*ui
zcZzjs@-9;0C)5f7bHWKBQx{}YE;Sd`EN?JgZS?a3dO+NR?$tEt0L|Am;TImvT6Ji~
z;w?N&&LwvPTxIGv4o_-tcKJ+Xh8`y7l!FnIil`<D6)*G*I}^v!0lo&@bGcH-2N~a|
z5xVo$44&OL)-d4PogoCH(|`WOoiMaCJ}iFB`Pb48%VQOX_ThWkFh3YtfgjiYQ(pq&
z!czhQLzDk4(_&aL?y!_xM_P;Kn54eG6JJ18m~oepY{AQ+2*eon8}CS_f3t0}s82m2
zKdnkipd7dE1M3NOqUb+a|0<RoMak9^6l>zuy~CA^A!(a)HrufWC!{%|2_gFt=UHo}
zi8)ViJn~pzr39sj#icby_nLI<Sht$B-pDdOu_LosG2DjMt6nO6$qM!$J4qY(;elGl
E+nM<ZfB*mh

literal 0
HcmV?d00001

diff --git a/SPECS/lldb.spec b/SPECS/lldb.spec
index 3f8a6d9..d677192 100644
--- a/SPECS/lldb.spec
+++ b/SPECS/lldb.spec
@@ -1,7 +1,10 @@
-#%%global rc_ver 5
-%global lldb_version 13.0.1
+%global lldb_version 14.0.6
+#global rc_ver 2
 %global lldb_srcdir %{name}-%{lldb_version}%{?rc_ver:rc%{rc_ver}}.src
 
+# LTO disabled for now to fix the build
+%global _lto_cflags %{nil}
+
 Name:		lldb
 Version:	%{lldb_version}%{?rc_ver:~rc%{rc_ver}}
 Release:	1%{?dist}
@@ -13,8 +16,17 @@ Source0:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{lldb_v
 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
 
-BuildRequires:	gcc
-BuildRequires:	gcc-c++
+# Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=2052982
+Patch0:		increase-m_hwp_regs-size.patch
+
+
+# RHEL only: We build LLVM with clang, which now defaults to using the
+#   libstdc++ from gcc-toolset-12. Since we're linking some clang
+#   tools statically to some static libraries from LLVM, we
+#   need to use libstdc++12 as well. So, use gcc-toolset-12
+#   to compile clang.
+BuildRequires: gcc-toolset-12-gcc-c++
+BuildRequires: gcc-toolset-12-annobin-plugin-gcc
 BuildRequires:	cmake
 BuildRequires:	ninja-build
 BuildRequires:	llvm-devel = %{version}
@@ -64,11 +76,9 @@ The package contains the LLDB Python module.
 %autosetup -n %{lldb_srcdir} -p2
 
 %build
-
-CFLAGS="%{optflags} -Wno-error=format-security"
-CXXFLAGS="%{optflags} -Wno-error=format-security"
-
 %cmake  -GNinja \
+	-DCMAKE_C_COMPILER=/opt/rh/gcc-toolset-12/root/usr/bin/gcc \
+	-DCMAKE_CXX_COMPILER=/opt/rh/gcc-toolset-12/root/usr/bin/g++ \
 	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 	-DCMAKE_SKIP_RPATH:BOOL=ON \
 	-DLLVM_LINK_LLVM_DYLIB:BOOL=ON \
@@ -128,6 +138,18 @@ rm -f %{buildroot}%{python3_sitearch}/six.*
 %{python3_sitearch}/lldb
 
 %changelog
+* Fri Jul 22 2022 Timm Bäder <tbaeder@redhat.com> - 14.0.6-1
+- 14.0.6 Release
+
+* Wed Jun 22 2022 Timm Bäder <tbaeder@redhat.com> - 14.0.5-1
+- 14.0.5 Release
+
+* Tue Apr 26 2022 Timm Bäder <tbaeder@redhat.com> - 14.0.0-1
+- 14.0.0 Release
+
+* Wed Mar 30 2022 Timm Bäder <tbaeder@redhat.com> - 13.0.1-2
+- Work around a lldb-server crash on ppc64le
+
 * Thu Feb 03 2022 Tom Stellard <tstellar@redhat.com> - 13.0.1-1
 - 13.0.1 Release