proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-06-13 16:00:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Drop mips D154390 patch, already upstream

Browse Source
This commit is contained in:
Gianfranco Costamagna 2024-08-01 12:15:06 +02:00
parent 7bbc73cbe1
commit e5e85cd194
2 changed files with 1 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
debian/patches/mips/D154390-pre-R6.diff vendored
View File

@ -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

2
debian/patches/series vendored
View File

@ -139,6 +139,7 @@ wasm/wasm-compiler-rt-default.diff
wasm/wasm-sysroot-usr.diff wasm/wasm-sysroot-usr.diff
revert-update-doc.diff revert-update-doc.diff
unwind-force-pthread-dl.diff unwind-force-pthread-dl.diff
force-sse2-compiler-rt.diff force-sse2-compiler-rt.diff
bolt-disable-emit-relocs.patch bolt-disable-emit-relocs.patch
@ -146,7 +147,6 @@ link-grpc.diff
libclang-major-version-only.diff libclang-major-version-only.diff
D148945-revert.diff D148945-revert.diff
arm32-defaults.diff arm32-defaults.diff
mips/D154390-pre-R6.diff
disable-openmp-per-target.diff disable-openmp-per-target.diff
libsanitizer-timebits.diff libsanitizer-timebits.diff
offload-disable-static-assert.diff offload-disable-static-assert.diff