From e5e85cd1940b58f574f1ca57b3d6a2054fa0791e Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Thu, 1 Aug 2024 12:15:06 +0200
Subject: [PATCH] Drop mips D154390 patch, already upstream

---
 debian/patches/mips/D154390-pre-R6.diff | 41 -------------------------
 debian/patches/series                   |  2 +-
 2 files changed, 1 insertion(+), 42 deletions(-)
 delete mode 100644 debian/patches/mips/D154390-pre-R6.diff

diff --git a/debian/patches/mips/D154390-pre-R6.diff b/debian/patches/mips/D154390-pre-R6.diff
deleted file mode 100644
index e31d8078..00000000
--- a/debian/patches/mips/D154390-pre-R6.diff
+++ /dev/null
@@ -1,41 +0,0 @@
-see https://reviews.llvm.org/D158491, still unreviewed upstream
-
-Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/compiler-rt/lib/sanitizer_common/sanitizer_asm.h
-===================================================================
---- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/compiler-rt/lib/sanitizer_common/sanitizer_asm.h
-+++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/compiler-rt/lib/sanitizer_common/sanitizer_asm.h
-@@ -54,6 +54,8 @@
- 
- #if defined(__x86_64__) || defined(__i386__) || defined(__sparc__)
- # define ASM_TAIL_CALL jmp
-+#elif defined(__mips__) && __mips_isa_rev >= 6
-+# define ASM_TAIL_CALL bc
- #elif defined(__arm__) || defined(__aarch64__) || defined(__mips__) || \
-     defined(__powerpc__) || defined(__loongarch_lp64)
- # define ASM_TAIL_CALL b
-@@ -86,6 +88,25 @@
-     SANITIZER_STRINGIFY(ASM_TAIL_CALL) " " i_func
- #endif
- 
-+#if defined(__mips64) && __mips_isa_rev < 6
-+# define C_ASM_TAIL_CALL(tfunc, ifunc)                        \
-+    "lui $t8, %hi(%neg(%gp_rel(" tfunc ")))\n"                \
-+    "daddu $t8, $t8, $t9\n"                                   \
-+    "daddu $t8, $t8, %lo(%neg(%gp_rel(" tfunc ")))\n"         \
-+    "ld $t9, %got_disp(" ifunc ")($t8)\n"                     \
-+    "jr $t9\n"
-+#elif defined(__mips__) && __mips_isa_rev < 6
-+# define C_ASM_TAIL_CALL(tfunc, ifunc)                        \
-+    ".set    noreorder\n"                                     \
-+    ".cpload $t9\n"                                           \
-+    ".set    reorder\n"                                       \
-+    "lw $t9, %got(" ifunc ")($gp)\n"                          \
-+    "jr $t9\n"
-+#elif defined(ASM_TAIL_CALL)
-+#  define C_ASM_TAIL_CALL(tfunc, ifunc) \
-+    SANITIZER_STRINGIFY(ASM_TAIL_CALL) " " ifunc
-+#endif
-+
- #if defined(__ELF__) && defined(__x86_64__) || defined(__i386__) || \
-     defined(__riscv)
- # define ASM_PREEMPTIBLE_SYM(sym) sym@plt
diff --git a/debian/patches/series b/debian/patches/series
index 2b71fde0..7954e83a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -139,6 +139,7 @@ wasm/wasm-compiler-rt-default.diff
 wasm/wasm-sysroot-usr.diff
 
 revert-update-doc.diff
+
 unwind-force-pthread-dl.diff
 force-sse2-compiler-rt.diff
 bolt-disable-emit-relocs.patch
@@ -146,7 +147,6 @@ link-grpc.diff
 libclang-major-version-only.diff
 D148945-revert.diff
 arm32-defaults.diff
-mips/D154390-pre-R6.diff
 disable-openmp-per-target.diff
 libsanitizer-timebits.diff
 offload-disable-static-assert.diff