move all lldb patches into the same dir

debian/patches/lldb-libname.diff

@@ -1,17 +0,0 @@
----
- lldb/scripts/Python/finishSwigPythonLLDB.py |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: llvm-toolchain-snapshot_15~svn3315515/lldb/scripts/Python/finishSwigPythonLLDB.py
-===================================================================
---- llvm-toolchain-snapshot_15~svn3315515.orig/lldb/scripts/Python/finishSwigPythonLLDB.py
-+++ llvm-toolchain-snapshot_15~svn3315515/lldb/scripts/Python/finishSwigPythonLLDB.py
-@@ -443,7 +443,7 @@ def make_symlink_liblldb(
-             if eOSType == utilsOsType.EnumOsType.Darwin:
-                 strLibFileExtn = ".dylib"
-             else:
--                strLibFileExtn = ".so"
-+                strLibFileExtn = "-15.so"
-             strSrc = os.path.join(vstrLldbLibDir, "liblldb" + strLibFileExtn)
- 
-     bOk, strErrMsg = make_symlink(

debian/patches/lldb-soname.diff

@@ -1,50 +0,0 @@
----
- lldb/source/API/CMakeLists.txt |   14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-Index: llvm-toolchain-snapshot_14~++20220119063448+5fa826f4e284/lldb/source/API/CMakeLists.txt
-===================================================================
---- llvm-toolchain-snapshot_14~++20220119063448+5fa826f4e284.orig/lldb/source/API/CMakeLists.txt
-+++ llvm-toolchain-snapshot_14~++20220119063448+5fa826f4e284/lldb/source/API/CMakeLists.txt
-@@ -15,7 +15,12 @@ if(LLDB_ENABLE_LUA)
-   set(lldb_lua_wrapper ${lua_bindings_dir}/LLDBWrapLua.cpp)
- endif()
- 
--add_lldb_library(liblldb SHARED ${option_framework}
-+set(output_name lldb)
-+if (CMAKE_SYSTEM_NAME MATCHES "Windows")
-+  set(output_name liblldb)
-+endif()
-+
-+add_lldb_library(liblldb SHARED OUTPUT_NAME ${output_name} SONAME
-   SBAddress.cpp
-   SBAttachInfo.cpp
-   SBBlock.cpp
-@@ -158,7 +163,7 @@ endif()
- 
- set_target_properties(liblldb
-   PROPERTIES
--  VERSION ${LLDB_VERSION}
-+  VERSION 1
- )
- 
- target_compile_definitions(liblldb PRIVATE LLDB_IN_LIBLLDB)
-@@ -178,12 +183,12 @@ if (NOT CMAKE_SYSTEM_NAME MATCHES "Windo
-   set_target_properties(liblldb_exports PROPERTIES FOLDER "lldb misc")
- endif()
- 
--if (NOT MSVC)
--  set_target_properties(liblldb
--    PROPERTIES
--    OUTPUT_NAME lldb
--  )
--endif()
-+#if (NOT MSVC)
-+#  set_target_properties(liblldb
-+#    PROPERTIES
-+#    OUTPUT_NAME lldb
-+#    )
-+#endif()
- 
- # The Clang expression parser in LLDB requires the Clang resource directory to function.
- if (TARGET clang-resource-headers)

debian/patches/lldb-swig-2.diff

@@ -1,13 +0,0 @@
-diff --git a/lldb/bindings/python/python-typemaps.swig b/lldb/bindings/python/python-typemaps.swig
-index 203be803d2ebd..11f68d59ae7be 100644
---- a/lldb/bindings/python/python-typemaps.swig
-+++ b/lldb/bindings/python/python-typemaps.swig
-@@ -435,7 +435,7 @@ template <> bool SetNumberFromPyObject<double>(double &number, PyObject *obj) {
- 
- %typemap(out) lldb::FileSP {
-   $result = nullptr;
--  lldb::FileSP &sp = $1;
-+  const lldb::FileSP &sp = $1;
-   if (sp) {
-     PythonFile pyfile = unwrapOrSetPythonException(PythonFile::FromFile(*sp));
-     if (!pyfile.IsValid())

debian/patches/lldb-swig.diff

@@ -1,26 +0,0 @@
-diff --git a/lldb/bindings/CMakeLists.txt b/lldb/bindings/CMakeLists.txt
-index c8aa0bcf96817..9eed2f1e62999 100644
---- a/lldb/bindings/CMakeLists.txt
-+++ b/lldb/bindings/CMakeLists.txt
-@@ -26,8 +26,6 @@ set(SWIG_COMMON_FLAGS
-   -features autodoc
-   -I${LLDB_SOURCE_DIR}/include
-   -I${CMAKE_CURRENT_SOURCE_DIR}
--  -D__STDC_LIMIT_MACROS
--  -D__STDC_CONSTANT_MACROS
-   ${DARWIN_EXTRAS}
- )
- 
-diff --git a/lldb/bindings/interfaces.swig b/lldb/bindings/interfaces.swig
-index fb75513a0df1b..d984711bbd8a2 100644
---- a/lldb/bindings/interfaces.swig
-+++ b/lldb/bindings/interfaces.swig
-@@ -1,8 +1,5 @@
- /* Various liblldb typedefs that SWIG needs to know about.  */
- #define __extension__ /* Undefine GCC keyword to make Swig happy when processing glibc's stdint.h. */
--/* The ISO C99 standard specifies that in C++ implementations limit macros such
--   as INT32_MAX should only be defined if __STDC_LIMIT_MACROS is. */
--#define __STDC_LIMIT_MACROS
- %include "stdint.i"
- 
- %include "lldb/lldb-defines.h"

debian/patches/print-lldb-path.patch

@@ -1,16 +0,0 @@
-Author: Gianfranco Costamagna <locutusofborg@debian.org>
-Last-Update: 2020-01-21
-
-Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
-===================================================================
---- llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8.orig/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
-+++ llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
-@@ -239,6 +239,8 @@ void ScriptInterpreterPython::ComputePyt
-   // x86_64, or bin on Windows).
-   llvm::sys::path::remove_filename(path);
-   llvm::sys::path::append(path, LLDB_PYTHON_RELATIVE_LIBDIR);
-+  // remove double "lib/lib" statement
-+  std::replace(path.begin(), path.end(), '/lib/lib/', '/lib/');
- 
- #if defined(_WIN32)
-   // This will be injected directly through FileSpec.GetDirectory().SetString(),

debian/patches/series

@@ -27,7 +27,7 @@ disable-display-PASS-UNSUPPORTED-XFAIL.diff
 
 # Lib names
 0044-soname.diff
-lldb-soname.diff
+lldb/lldb-soname.diff
 #lldb-libname.diff
 openmp-soname.diff
 
@@ -122,12 +122,12 @@ bootstrap-fix-include-next.diff
 #D67877-cmake-clang-example.patch
 
 python3-shebang.patch
-print-lldb-path.patch
+lldb/print-lldb-path.patch
 lower-python-dep.diff
 scan-build-py-fix-default-bin.diff
 
 omp-riscv64.patch
-test-disable-lldb-i386.diff
+lldb/test-disable-lldb-i386.diff
 unbreak-atomic-mips.diff
 llvm-fix-lld-linker-check.diff
 openmp-fix-runtimes-build.diff
@@ -154,5 +154,5 @@ bolt.patch
 bolt-disable-emit-relocs.patch
 D124841-fix-powerpc-miscompile.patch
 mips/mips-assert-size.diff
-lldb-swig.diff
+lldb/lldb-swig.diff
-lldb-swig-2.diff
+lldb/lldb-swig-2.diff

debian/patches/test-disable-lldb-i386.diff

@@ -1,26 +0,0 @@
-Index: llvm-toolchain-snapshot_15~++20220510103135+63865e1fce62/integration-test-suite/tests/basic_lldb.c
-===================================================================
---- llvm-toolchain-snapshot_15~++20220510103135+63865e1fce62.orig/integration-test-suite/tests/basic_lldb.c
-+++ llvm-toolchain-snapshot_15~++20220510103135+63865e1fce62/integration-test-suite/tests/basic_lldb.c
-@@ -1,7 +1,7 @@
- // RUN: %clang -g -o %t %s
- // RUN: %lldb -s %S/basic_lldb.in %t | grep "main at basic_lldb.c:"
- // REQUIRES: lldb, clang
--// XFAIL: ppc64
-+// XFAIL: ppc64, i686, i386
- 
- int main() {
- 	int a=0;
-Index: llvm-toolchain-snapshot_15~++20220510103135+63865e1fce62/integration-test-suite/tests/basic_lldb2.cpp
-===================================================================
---- llvm-toolchain-snapshot_15~++20220510103135+63865e1fce62.orig/integration-test-suite/tests/basic_lldb2.cpp
-+++ llvm-toolchain-snapshot_15~++20220510103135+63865e1fce62/integration-test-suite/tests/basic_lldb2.cpp
-@@ -1,7 +1,7 @@
- // RUN: %clangxx -g -o %t %s
- // RUN: %lldb -s %S/basic_lldb2.in %t | grep "stop reason = step over"
- // REQUIRES: lldb, clangxx
--// XFAIL: ppc64
-+// XFAIL: ppc64, i686, i386
- 
- #include <vector>
- int main (void)