rebase of the patch

This commit is contained in:
Sylvestre Ledru 2023-12-06 10:29:45 +01:00
parent 60d6dd5b5d
commit b6debd0c08

View File

@ -1,9 +1,11 @@
see https://reviews.llvm.org/D158491, still unreviewed upstream see https://reviews.llvm.org/D158491, still unreviewed upstream
--- a/compiler-rt/lib/interception/interception.h Index: llvm-toolchain-snapshot_18~++20231206102350+b304873134e8/compiler-rt/lib/interception/interception.h
+++ b/compiler-rt/lib/interception/interception.h ===================================================================
@@ -199,8 +199,9 @@ --- llvm-toolchain-snapshot_18~++20231206102350+b304873134e8.orig/compiler-rt/lib/interception/interception.h
".type " SANITIZER_STRINGIFY(TRAMPOLINE(func)) ", %function\n" \ +++ 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(TRAMPOLINE(func)) ":\n" \
SANITIZER_STRINGIFY(CFI_STARTPROC) "\n" \ SANITIZER_STRINGIFY(CFI_STARTPROC) "\n" \
- SANITIZER_STRINGIFY(ASM_TAIL_CALL) " __interceptor_" \ - SANITIZER_STRINGIFY(ASM_TAIL_CALL) " __interceptor_" \
@ -14,8 +16,10 @@ see https://reviews.llvm.org/D158491, still unreviewed upstream
SANITIZER_STRINGIFY(CFI_ENDPROC) "\n" \ SANITIZER_STRINGIFY(CFI_ENDPROC) "\n" \
".size " SANITIZER_STRINGIFY(TRAMPOLINE(func)) ", " \ ".size " SANITIZER_STRINGIFY(TRAMPOLINE(func)) ", " \
".-" SANITIZER_STRINGIFY(TRAMPOLINE(func)) "\n" \ ".-" SANITIZER_STRINGIFY(TRAMPOLINE(func)) "\n" \
--- a/compiler-rt/lib/sanitizer_common/sanitizer_asm.h Index: llvm-toolchain-snapshot_18~++20231206102350+b304873134e8/compiler-rt/lib/sanitizer_common/sanitizer_asm.h
+++ b/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 @@ @@ -44,6 +44,8 @@
#if defined(__x86_64__) || defined(__i386__) || defined(__sparc__) #if defined(__x86_64__) || defined(__i386__) || defined(__sparc__)