From 4cf15e66711010d2c01fe59ed46522e9c6317922 Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Sat, 22 Jun 2024 12:18:57 +0200 Subject: [PATCH] Enable lldb on riscv64 It has been supported for a few releases but not enabled on the debian side. This should fix the autopkgtest on riscv64 --- debian/changelog | 7 +++++++ debian/control | 16 ++++++++-------- debian/control.in | 16 ++++++++-------- debian/rules | 2 +- 4 files changed, 24 insertions(+), 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index 60d37106..52686ccc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-18 (1:18.1.7-1~exp2) UNRELEASED; urgency=medium + + [ Aurelien Jarno ] + * Enable lldb on riscv64. + + -- Aurelien Jarno Sat, 22 Jun 2024 12:18:16 +0200 + llvm-toolchain-18 (1:18.1.7-1~exp1) experimental; urgency=medium [ Sylvestre Ledru ] diff --git a/debian/control b/debian/control index 46e825e2..c90d3363 100644 --- a/debian/control +++ b/debian/control @@ -562,8 +562,8 @@ Description: LLVM-based linker, header files # ------------- lldb ------------- Package: lldb-18 -Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 -# ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed +Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 riscv64 +# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 mipsel mips64el have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm18 (= ${binary:Version}), python3-lldb-18 Pre-Depends: ${misc:Pre-Depends} @@ -574,8 +574,8 @@ Description: Next generation, high-performance debugger Package: liblldb-18 Provides: ${t64:Provides} -Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 -# ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed +Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 riscv64 +# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 mipsel mips64el have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm18 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Section: libs @@ -588,8 +588,8 @@ Description: Next generation, high-performance debugger, library Package: python3-lldb-18 Section: python -Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 -# ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed +Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 riscv64 +# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 mipsel mips64el have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-18 (= ${binary:Version}) Conflicts: python3-lldb-x.y Replaces: python3-lldb-x.y @@ -604,8 +604,8 @@ Description: Next generation, high-performance debugger, python3 lib Package: liblldb-18-dev Section: libdevel -Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 -# ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed +Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 riscv64 +# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 mipsel mips64el have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-18 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Description: Next generation, high-performance debugger, header files diff --git a/debian/control.in b/debian/control.in index 04af789e..a8506043 100644 --- a/debian/control.in +++ b/debian/control.in @@ -562,8 +562,8 @@ Description: LLVM-based linker, header files # ------------- lldb ------------- Package: lldb-@LLVM_VERSION@ -Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 -# ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed +Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 riscv64 +# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 mipsel mips64el have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version}), python3-lldb-@LLVM_VERSION@ Pre-Depends: ${misc:Pre-Depends} @@ -574,8 +574,8 @@ Description: Next generation, high-performance debugger Package: liblldb-@LLVM_VERSION@ Provides: ${t64:Provides} -Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 -# ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed +Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 riscv64 +# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 mipsel mips64el have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Section: libs @@ -588,8 +588,8 @@ Description: Next generation, high-performance debugger, library Package: python3-lldb-@LLVM_VERSION@ Section: python -Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 -# ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed +Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 riscv64 +# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 mipsel mips64el have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-@LLVM_VERSION@ (= ${binary:Version}) Conflicts: python3-lldb-x.y Replaces: python3-lldb-x.y @@ -604,8 +604,8 @@ Description: Next generation, high-performance debugger, python3 lib Package: liblldb-@LLVM_VERSION@-dev Section: libdevel -Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 -# ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed +Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 riscv64 +# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 mipsel mips64el have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-@LLVM_VERSION@ (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Description: Next generation, high-performance debugger, header files diff --git a/debian/rules b/debian/rules index 31de2baf..07879c0d 100755 --- a/debian/rules +++ b/debian/rules @@ -453,7 +453,7 @@ else endif LLDB_ENABLE=yes -LLDB_DISABLE_ARCHS := hurd-i386 ia64 powerpc powerpcspe ppc64 riscv64 sparc64 mips64el mipsel +LLDB_DISABLE_ARCHS := hurd-i386 ia64 powerpc powerpcspe ppc64 sparc64 mips64el mipsel # hurd has threading issues ifeq (,$(filter-out $(LLDB_DISABLE_ARCHS), $(DEB_HOST_ARCH))) # Disable LLDB for this arch.