import lldb-15.0.7-1.el9

.gitignore

@@ -1,2 +1,2 @@
-SOURCES/lldb-14.0.6.src.tar.xz
-SOURCES/tstellar-gpg-key.asc
+SOURCES/lldb-15.0.7.src.tar.xz
+SOURCES/release-keys.asc

.lldb.metadata

@@ -1,2 +1,2 @@
-1d5b26df4c008adeb484b76caf115f7ac692c7b0 SOURCES/lldb-14.0.6.src.tar.xz
-b8d2648a01d36ed0186fd2c5af325fd28797f9a0 SOURCES/tstellar-gpg-key.asc
+2966a93fab2ed784f0afbad548ba20ec39c77c28 SOURCES/lldb-15.0.7.src.tar.xz
+347bdd5ee6d6b93c9644c268511815912c0fb2dc SOURCES/release-keys.asc

SOURCES/6f59f302e4358b4dc869bc298c2b9c06aa716b60.diff

@@ -0,0 +1,13 @@
+diff --git a/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_ppc64le.h b/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_ppc64le.h
+index fac395807796c..942c65fcd241d 100644
+--- a/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_ppc64le.h
++++ b/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_ppc64le.h
+@@ -122,7 +122,7 @@ class NativeRegisterContextLinux_ppc64le : public NativeRegisterContextLinux {
+     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;

SOURCES/increase-m_hwp_regs-size.patch

@@ -1,12 +0,0 @@
-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;

SPECS/lldb.spec

@@ -1,23 +1,23 @@
-%global lldb_version 14.0.6
-#global rc_ver 2
-%global lldb_srcdir %{name}-%{lldb_version}%{?rc_ver:rc%{rc_ver}}.src
+%global toolchain clang
+%global lldb_version 15.0.7
+%global lldb_srcdir %{name}-%{lldb_version}.src
 
 # LTO disabled for now to fix the build
 %global _lto_cflags %{nil}
 
 Name:		lldb
-Version:	%{lldb_version}%{?rc_ver:~rc%{rc_ver}}
+Version:	%{lldb_version}
 Release:	1%{?dist}
 Summary:	Next generation high-performance debugger
 
 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
+Source0:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{lldb_version}/%{lldb_srcdir}.tar.xz
+Source1:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{lldb_version}/%{lldb_srcdir}.tar.xz.sig
+Source2:	release-keys.asc
 
-# Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=2052982
-Patch0:		increase-m_hwp_regs-size.patch
+# TODO: Drop once 16.0.0 is out
+Patch0:		https://github.com/llvm/llvm-project/commit/6f59f302e4358b4dc869bc298c2b9c06aa716b60.diff
 
 
 # RHEL only: We build LLVM with clang, which now defaults to using the
@@ -27,6 +27,7 @@ Patch0:		increase-m_hwp_regs-size.patch
 #   to compile clang.
 BuildRequires: gcc-toolset-12-gcc-c++
 BuildRequires: gcc-toolset-12-annobin-plugin-gcc
+BuildRequires:	clang
 BuildRequires:	cmake
 BuildRequires:	ninja-build
 BuildRequires:	llvm-devel = %{version}
@@ -76,9 +77,8 @@ The package contains the LLDB Python module.
 %autosetup -n %{lldb_srcdir} -p2
 
 %build
+
 %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 \
@@ -138,6 +138,18 @@ rm -f %{buildroot}%{python3_sitearch}/six.*
 %{python3_sitearch}/lldb
 
 %changelog
+* Tue Jan 17 2023 Konrad Kleine <kkleine@redhat.com> - 15.0.7-1
+- Update to 15.0.7
+
+* Sat Dec 10 2022 Konrad Kleine <kkleine@redhat.com> - 15.0.6-1
+- Update to 15.0.6
+
+* Thu Oct 20 2022 Konrad Kleine <kkleine@redhat.com> - 15.0.1-2
+- Bring back patch for rhbz#2052982
+
+* Mon Oct 17 2022 Konrad Kleine <kkleine@redhat.com> - 15.0.1-1
+- Update to 15.0.1
+
 * Fri Jul 22 2022 Timm Bäder <tbaeder@redhat.com> - 14.0.6-1
 - 14.0.6 Release