-
Notifications
You must be signed in to change notification settings - Fork 90
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
llvm: fix mips tail call in compiler-rt
- Loading branch information
Showing
3 changed files
with
59 additions
and
1 deletion.
There are no files selected for viewing
57 changes: 57 additions & 0 deletions
57
app-devel/llvm/01-runtime/patches/0006-debian-compiler-rt-mips-tail-call.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
see https://reviews.llvm.org/D158491, still unreviewed upstream | ||
|
||
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_" \ | ||
- 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 | ||
@@ -44,6 +44,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 | ||
@@ -53,6 +55,25 @@ | ||
# define ASM_TAIL_CALL tail | ||
#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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters