From b6debd0c08ef9fc368b79cd650304554a3252b11 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 6 Dec 2023 10:29:45 +0100 Subject: [PATCH] rebase of the patch --- debian/patches/D158491.diff | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/debian/patches/D158491.diff b/debian/patches/D158491.diff index 1ce768e1..925aefd0 100644 --- a/debian/patches/D158491.diff +++ b/debian/patches/D158491.diff @@ -1,9 +1,11 @@ see https://reviews.llvm.org/D158491, still unreviewed upstream ---- a/compiler-rt/lib/interception/interception.h -+++ b/compiler-rt/lib/interception/interception.h -@@ -199,8 +199,9 @@ - ".type " SANITIZER_STRINGIFY(TRAMPOLINE(func)) ", %function\n" \ +Index: llvm-toolchain-snapshot_18~++20231206102350+b304873134e8/compiler-rt/lib/interception/interception.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_" \ @@ -14,8 +16,10 @@ see https://reviews.llvm.org/D158491, still unreviewed upstream SANITIZER_STRINGIFY(CFI_ENDPROC) "\n" \ ".size " SANITIZER_STRINGIFY(TRAMPOLINE(func)) ", " \ ".-" SANITIZER_STRINGIFY(TRAMPOLINE(func)) "\n" \ ---- a/compiler-rt/lib/sanitizer_common/sanitizer_asm.h -+++ b/compiler-rt/lib/sanitizer_common/sanitizer_asm.h +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 @@ -44,6 +44,8 @@ #if defined(__x86_64__) || defined(__i386__) || defined(__sparc__)