From a7fbe8483a0dd98308be8060e97cba9f2607ad3d Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 17 Jan 2024 09:17:43 +0100 Subject: [PATCH] rebase of the patch --- debian/patches/mips/D154390-pre-R6.diff | 26 +++++-------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/debian/patches/mips/D154390-pre-R6.diff b/debian/patches/mips/D154390-pre-R6.diff index 925aefd0..f311b6e9 100644 --- a/debian/patches/mips/D154390-pre-R6.diff +++ b/debian/patches/mips/D154390-pre-R6.diff @@ -1,25 +1,9 @@ see https://reviews.llvm.org/D158491, still unreviewed upstream -Index: llvm-toolchain-snapshot_18~++20231206102350+b304873134e8/compiler-rt/lib/interception/interception.h +Index: llvm-toolchain-snapshot_18~++20240117091415+da0755f7b7cc/compiler-rt/lib/sanitizer_common/sanitizer_asm.h =================================================================== ---- llvm-toolchain-snapshot_18~++20231206102350+b304873134e8.orig/compiler-rt/lib/interception/interception.h -+++ llvm-toolchain-snapshot_18~++20231206102350+b304873134e8/compiler-rt/lib/interception/interception.h -@@ -205,8 +205,9 @@ const interpose_substitution substitutio - ASM_TYPE_FUNCTION_STR "\n" \ - SANITIZER_STRINGIFY(TRAMPOLINE(func)) ":\n" \ - SANITIZER_STRINGIFY(CFI_STARTPROC) "\n" \ -- SANITIZER_STRINGIFY(ASM_TAIL_CALL) " __interceptor_" \ -- SANITIZER_STRINGIFY(ASM_PREEMPTIBLE_SYM(func)) "\n" \ -+ C_ASM_TAIL_CALL(SANITIZER_STRINGIFY(TRAMPOLINE(func)), \ -+ "__interceptor_" \ -+ SANITIZER_STRINGIFY(ASM_PREEMPTIBLE_SYM(func))) "\n" \ - SANITIZER_STRINGIFY(CFI_ENDPROC) "\n" \ - ".size " SANITIZER_STRINGIFY(TRAMPOLINE(func)) ", " \ - ".-" SANITIZER_STRINGIFY(TRAMPOLINE(func)) "\n" \ -Index: llvm-toolchain-snapshot_18~++20231206102350+b304873134e8/compiler-rt/lib/sanitizer_common/sanitizer_asm.h -=================================================================== ---- llvm-toolchain-snapshot_18~++20231206102350+b304873134e8.orig/compiler-rt/lib/sanitizer_common/sanitizer_asm.h -+++ llvm-toolchain-snapshot_18~++20231206102350+b304873134e8/compiler-rt/lib/sanitizer_common/sanitizer_asm.h +--- llvm-toolchain-snapshot_18~++20240117091415+da0755f7b7cc.orig/compiler-rt/lib/sanitizer_common/sanitizer_asm.h ++++ llvm-toolchain-snapshot_18~++20240117091415+da0755f7b7cc/compiler-rt/lib/sanitizer_common/sanitizer_asm.h @@ -44,6 +44,8 @@ #if defined(__x86_64__) || defined(__i386__) || defined(__sparc__) @@ -29,8 +13,8 @@ Index: llvm-toolchain-snapshot_18~++20231206102350+b304873134e8/compiler-rt/lib/ #elif defined(__arm__) || defined(__aarch64__) || defined(__mips__) || \ defined(__powerpc__) || defined(__loongarch_lp64) # define ASM_TAIL_CALL b -@@ -53,6 +55,25 @@ - # define ASM_TAIL_CALL tail +@@ -76,6 +78,25 @@ + SANITIZER_STRINGIFY(ASM_TAIL_CALL) " " i_func #endif +#if defined(__mips64) && __mips_isa_rev < 6