diff --git a/debian/changelog b/debian/changelog
index 479a0cc4..fb204d63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -135,6 +135,8 @@ llvm-toolchain-12 (1:12.0.1-7) unstable; urgency=medium
 
   [  Gianfranco Costamagna ]
   * Add a patch to fix omp build on riscv64
+  * Don't build lldb on riscv64, fails to build due to missing
+    CreateHostNativeRegisterContextLinux implementation on this architecture.
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 31 Aug 2021 20:56:40 +0200
 
@@ -505,6 +507,13 @@ llvm-toolchain-snapshot (1:12~++20200715052739+d6e79e3dd6d-1~exp1) experimental;
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 08 Jul 2020 15:19:14 +0200
 
+llvm-toolchain-11 (1:11.1.0-1~exp3) UNRELEASED; urgency=medium
+
+  * Cherry-pick upstream commit to fix a libgl1-mesa-dri texture failure.
+    (Closes: #989545)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 01 Sep 2021 12:24:34 +0200
+
 llvm-toolchain-11 (1:11.1.0-1~exp2) experimental; urgency=medium
 
   * Fix the default binary path for scan-build-py to clang-11 (instead of
diff --git a/debian/control b/debian/control
index f618065e..436563b5 100644
--- a/debian/control
+++ b/debian/control
@@ -495,8 +495,8 @@ Description: LLVM-based linker, header files
 # ------------- lldb -------------
 
 Package: lldb-13
-Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 riscv64
-# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 have been removed
+Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32
+# ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm13 (= ${binary:Version}), llvm-13-dev,
  python3-lldb-13
 Pre-Depends: ${misc:Pre-Depends}
@@ -506,8 +506,8 @@ Description: Next generation, high-performance debugger
  Project, such as the Clang expression parser and LLVM disassembler.
 
 Package: liblldb-13
-Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 riscv64
-# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 have been removed
+Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 
+# ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm13 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Section: libs
@@ -520,8 +520,8 @@ Description: Next generation, high-performance debugger, library
 
 Package: python3-lldb-13
 Section: python
-Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 riscv64
-# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 have been removed
+Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32
+# ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-13 (= ${binary:Version}), python3-six
 Conflicts: python3-lldb-x.y
 Replaces: python3-lldb-x.y
@@ -536,8 +536,8 @@ Description: Next generation, high-performance debugger, python3 lib
 
 Package: liblldb-13-dev
 Section: libdevel
-Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 riscv64
-# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 have been removed
+Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32
+# ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-13 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Description: Next generation, high-performance debugger, header files
diff --git a/debian/rules b/debian/rules
index ecb303a7..aeab9e71 100755
--- a/debian/rules
+++ b/debian/rules
@@ -260,7 +260,7 @@ else
 endif
 
 LLDB_ENABLE=yes
-LLDB_DISABLE_ARCHS := hurd-i386 ia64 powerpc powerpcspe ppc64 sparc64
+LLDB_DISABLE_ARCHS := hurd-i386 ia64 powerpc powerpcspe ppc64 riscv64 sparc64
 # hurd has threading issues
 ifeq (,$(filter-out $(LLDB_DISABLE_ARCHS), $(DEB_HOST_ARCH)))
 # Disable LLDB for this arch.