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

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

README.en.md

@@ -1,7 +1,7 @@
-# lldb-latest
+# lldb
 
 #### Description
-Next generation high-performance debugger
+{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**}
 
 #### Software Architecture
 Software architecture description

README.md

@@ -1,7 +1,9 @@
-# lldb-latest
+# lldb
 
 #### 介绍
-Next generation high-performance debugger
+{**以下是码云平台说明，您可以替换此简介**
+码云是 OSCHINA 推出的基于 Git 的代码托管平台（同时支持 SVN）。专为开发者提供稳定、高效、安全的云端软件开发协作平台
+无论是个人、团队、或是企业，都能够用码云实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)}
 
 #### 软件架构
 软件架构说明
@@ -27,11 +29,11 @@ Next generation high-performance debugger
 4.  新建 Pull Request
 
 
-#### 特技
+#### 码云特技
 
 1.  使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
-2.  Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com)
+2.  码云官方博客 [blog.gitee.com](https://blog.gitee.com)
-3.  你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目
+3.  你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目
-4.  [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目
+4.  [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目
-5.  Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
+5.  码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
-6.  Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
+6.  码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)

lldb.spec

@@ -1,64 +1,35 @@
-%bcond_without toolchain_clang
+Name:		lldb
-
+Version:	12.0.1
-%if %{with toolchain_clang}
-%global toolchain clang
-%endif
-
-%global maj_ver 18
-%global min_ver 1
-%global patch_ver 8
-%global lldb_version %{maj_ver}.%{min_ver}.%{patch_ver}
-
-%global _scl_prefix /opt/openEuler
-%{?scl:%scl_package %scl}
-%{!?scl:%global scl_prefix llvm-toolset-%{maj_ver}-}
-%{!?scl:%global pkg_name %{name}}
-%global install_prefix %{!?scl:%{_scl_prefix}/llvm-toolset-%{maj_ver}/root}%{_prefix}
-%global install_datadir %{!?scl:%{_scl_prefix}/llvm-toolset-%{maj_ver}/root}%{_datadir}
-
-%global install_bindir %{install_prefix}/bin
-%global install_includedir %{install_prefix}/include
-%if 0%{?__isa_bits} == 64
-%global install_libdir %{install_prefix}/lib64
-%else
-%global install_libdir %{install_prefix}/lib
-%endif
-%global install_libexecdir %{install_prefix}/libexec
-%global install_sharedir %{install_prefix}/share
-%global install_docdir %{install_sharedir}/doc
-
-Name:		%{?scl_prefix}lldb
-Version:	%{lldb_version}
 Release:	1
 Summary:	Next generation high-performance debugger
 
 License:	NCSA
 URL:		http://lldb.llvm.org/
-Source0:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/lldb-%{version}.src.tar.xz
+Source0:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{name}-%{version}.src.tar.xz
 
 BuildRequires:	gcc
 BuildRequires:	gcc-c++
 BuildRequires:	cmake
-BuildRequires:	ninja-build
+BuildRequires:	llvm-devel = %{version}
-BuildRequires:  %{?scl_prefix}clang
+BuildRequires:	llvm-test = %{version}
-BuildRequires:	%{?scl_prefix}llvm-devel = %{version}
+BuildRequires:	clang-devel = %{version}
-BuildRequires:	%{?scl_prefix}llvm-test = %{version}
-BuildRequires:	%{?scl_prefix}clang-devel = %{version}
-BuildRequires:	%{?scl_prefix}clang-tools-extra = %{version}
 BuildRequires:	ncurses-devel
 BuildRequires:	swig
-BuildRequires:	%{?scl_prefix}llvm-static = %{version}
+BuildRequires:	llvm-static = %{version}
 BuildRequires:	libffi-devel
 BuildRequires:	zlib-devel
 BuildRequires:	libxml2-devel
 BuildRequires:	libedit-devel
 BuildRequires:	python3-lit
 BuildRequires:	multilib-rpm-config
-%if %{with toolchain_clang}
-BuildRequires:	clang
-%endif
 
-Requires:	%{?scl_prefix}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
 LLDB is a next generation, high-performance debugger. It is built as a set
@@ -68,40 +39,37 @@ disassembler.
 
 %package devel
 Summary:	Development header files for LLDB
-Requires:	%{pkg_name}%{?_isa} = %{version}-%{release}
+Requires:	%{name}%{?_isa} = %{version}-%{release}
 
 %description devel
 The package contains header files for the LLDB debugger.
 
-%package -n %{?scl_prefix}python3-lldb
+%package -n python3-lldb
 %{?python_provide:%python_provide python3-lldb}
 Summary:	Python module for LLDB
 BuildRequires:	python3-devel
 BuildRequires:	python3-setuptools
 Requires:	python3-six
-Requires:	%{pkg_name}%{?_isa} = %{version}-%{release}
+Requires:	%{name}%{?_isa} = %{version}-%{release}
-BuildRequires: %{?scl_prefix}llvm-cmake-utils = %{version}
 
-%description -n %{?scl_prefix}python3-lldb
+%description -n python3-lldb
 The package contains the LLDB Python module.
 
 %prep
-%autosetup -n lldb-%{version}.src -p2
+%autosetup -n %{name}-%{version}.src -p2
 
 %build
 
+mkdir -p _build
+cd _build
+
 # Python version detection is broken
 LDFLAGS="%{__global_ldflags} -lpthread -ldl"
 
 CFLAGS="%{optflags} -Wno-error=format-security"
 CXXFLAGS="%{optflags} -Wno-error=format-security"
 
-mkdir -p _build
-cd _build
 %cmake  .. \
-    -DCMAKE_INSTALL_PREFIX=%{install_prefix} \
-    -DLLVM_COMMON_CMAKE_UTILS=%{install_datadir}/llvm/cmake \
-    -DLLVM_MAIN_SRC_DIR=%{install_prefix}/src \
 	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 	-DCMAKE_SKIP_RPATH:BOOL=ON \
 	-DLLVM_LINK_LLVM_DYLIB:BOOL=ON \
@@ -110,10 +78,6 @@ cd _build
 	-DLLDB_DISABLE_CURSES:BOOL=OFF \
 	-DLLDB_DISABLE_LIBEDIT:BOOL=OFF \
 	-DLLDB_DISABLE_PYTHON:BOOL=OFF \
-%if "%toolchain" == "clang"
-	-DCMAKE_C_COMPILER=clang \
-	-DCMAKE_CXX_COMPILER=clang++ \
-%endif
 %if 0%{?__isa_bits} == 64
 	-DLLVM_LIBDIR_SUFFIX=64 \
 %else
@@ -126,26 +90,24 @@ cd _build
 	-DLLVM_EXTERNAL_LIT=%{_bindir}/lit \
 	-DCLANG_LINK_CLANG_DYLIB=ON \
 	-DLLVM_LIT_ARGS="-sv \
-	--path %{install_libdir}/llvm" \
+	--path %{_libdir}/llvm" \
 
-%make_build
+make %{?_smp_mflags}
 
 %install
 cd _build
-%make_install
+make install DESTDIR=%{buildroot}
 
 # remove static libraries
-rm -fv %{buildroot}%{install_libdir}/*.a
+rm -fv %{buildroot}%{_libdir}/*.a
 
 # python: fix binary libraries location
-liblldb=$(basename $(readlink -e %{buildroot}%{install_libdir}/liblldb.so))
+liblldb=$(basename $(readlink -e %{buildroot}%{_libdir}/liblldb.so))
-mkdir -p %{buildroot}%{python3_sitearch}
-mv %{buildroot}%{install_prefix}/..%{python3_sitearch}/lldb %{buildroot}%{python3_sitearch}/lldb
 ln -vsf "../../../${liblldb}" %{buildroot}%{python3_sitearch}/lldb/_lldb.so
 %py_byte_compile %{__python3} %{buildroot}%{python3_sitearch}/lldb
 
 # remove bundled six.py
-rm -f %{buildroot}%{install_prefix}%{python3_sitearch}/six.*
+rm -f %{buildroot}%{python3_sitearch}/six.*
 
 %ldconfig_scriptlets
 
@@ -154,33 +116,18 @@ rm -f %{buildroot}%{install_prefix}%{python3_sitearch}/six.*
 
 %files
 %license LICENSE.TXT
-%{install_bindir}/lldb*
+%{_bindir}/lldb*
-%{install_libdir}/liblldb.so.*
+%{_libdir}/liblldb.so.*
-%{install_libdir}/liblldbIntelFeatures.so.*
+%{_libdir}/liblldbIntelFeatures.so.*
 
 %files devel
-%{install_includedir}/lldb
+%{_includedir}/lldb
-%{install_libdir}/*.so
+%{_libdir}/*.so
 
-%files -n %{?scl_prefix}python3-lldb
+%files -n python3-lldb
 %{python3_sitearch}/lldb
 
 %changelog
-* Fri Dec 6 2024 liyunfei <liyunfei33@huawei.com> - 18.1.8-1
-- init for Multi-Version LLVM-18.1.8
-
-* Wed Nov 13 2024 Funda Wang <fundawang@yeah.net> - 17.0.6-3
-- adopt to new cmake macro
-
-* Tue Aug 20 2024 liyunfei <liyunfei33@huawei.com> - 17.0.6-2
-- Add BiSheng Autotuner support.
-
-* Mon Dec 4 2023 zhoujing <zhoujing@huawei.com> 17.0.6-1
-- upgrade lldb to 17.0.6
-
-* Mon Jul 17 2023 cf-zhao <zhaochuanfeng@huawei.com> 15.0.7-1
-- upgrade lldb to 15.0.7
-
 * Thu Jan 06 2022 Chen Chen <chen_aka_jan@163.com> - 12.0.1-1
 - upgrade lldb to 12.0.1
 

lldb.yaml

@@ -1,4 +1,4 @@
 version_control: github
 src_repo: llvm/llvm-project
 tag_prefix: ^llvmorg-
-separator: .
+seperator: .