This is an archive of the discontinued LLVM Phabricator instance.

Differential D141656

[hwasan] Replace j __interceptor_sigsetjmp instead with tail for RISC-V
ClosedPublic

Authored by raj.khem on Jan 12 2023, 10:24 PM.

Details

Reviewers
vitalybuka
kito-cheng
jrtc27
MaskRay
Commits
rGdc9c41125caa: [hwasan] Replace j __interceptor_sigsetjmp instead with tail for RISC-V
Summary

on main branch sanitizers fail to build for RISCV64 using binutils 2.40 ( to be released ) ld.

riscv64-yoe-linux-ld: relocation R_RISCV_JAL against `__interceptor_sigsetjmp' w
hich may bind externally can not be used when making a shared object; recompile with -fPIC

clang-16: error: linker command failed with exit code 1 (use -v to see invocation)

Here we use tail macro to let linker do the relaxation.

Diff Detail

Event Timeline

raj.khem created this revision.Jan 12 2023, 10:24 PM
Herald added a project: Restricted Project. · View Herald TranscriptJan 12 2023, 10:24 PM
Herald added subscribers: Enna1, sunshaoce, VincentWu and 23 others. · View Herald Transcript
raj.khem requested review of this revision.Jan 12 2023, 10:24 PM
Herald added a project: Restricted Project. · View Herald TranscriptJan 12 2023, 10:24 PM
Herald added subscribers: Restricted Project, • pcwang-thead. · View Herald Transcript
Harbormaster completed remote builds in B207545: Diff 488866.Jan 12 2023, 10:43 PM
kito-cheng accepted this revision.Jan 13 2023, 3:10 AM

LGTM

This revision is now accepted and ready to land.Jan 13 2023, 3:10 AM
MaskRay accepted this revision.Jan 13 2023, 5:40 PM

on main branch sanitizers fail to build for RISCV64 using binutils 2.40 ( to be released ) ld.

ld.lld doesn't allow R_RISCV_JAL to a preemptible symbol either. https://sourceware.org/bugzilla/show_bug.cgi?id=28509

MaskRay retitled this revision from [PATCH] [RISC-V][HWASAN] Fix long call linker error with 'j' instruction to [hwasan] Replace j __interceptor_sigsetjmp instead with tail for RISC-V.Jan 13 2023, 5:42 PM
Closed by commit rGdc9c41125caa: [hwasan] Replace j __interceptor_sigsetjmp instead with tail for RISC-V (authored by raj.khem, committed by MaskRay). · Explain WhyJan 13 2023, 5:44 PM
This revision was automatically updated to reflect the committed changes.
MaskRay added a commit: rGdc9c41125caa: [hwasan] Replace j __interceptor_sigsetjmp instead with tail for RISC-V.

Revision Contents

PathSize
compiler-rt/
lib/
hwasan/
2 lines

Diff 488866

compiler-rt/lib/hwasan/hwasan_setjmp_riscv64.S

Show All 30 Lines
.section .text .section .text
.file "hwasan_setjmp_riscv64.S" .file "hwasan_setjmp_riscv64.S"
.global __interceptor_setjmp .global __interceptor_setjmp
ASM_TYPE_FUNCTION(__interceptor_setjmp) ASM_TYPE_FUNCTION(__interceptor_setjmp)
__interceptor_setjmp: __interceptor_setjmp:
CFI_STARTPROC CFI_STARTPROC
addi x11, x0, 0 addi x11, x0, 0
j __interceptor_sigsetjmp tail __interceptor_sigsetjmp
CFI_ENDPROC CFI_ENDPROC
ASM_SIZE(__interceptor_setjmp) ASM_SIZE(__interceptor_setjmp)
.global __interceptor_sigsetjmp .global __interceptor_sigsetjmp
ASM_TYPE_FUNCTION(__interceptor_sigsetjmp) ASM_TYPE_FUNCTION(__interceptor_sigsetjmp)
__interceptor_sigsetjmp: __interceptor_sigsetjmp:
CFI_STARTPROC CFI_STARTPROC
sd ra, 0<<3(x10) sd ra, 0<<3(x10)
▲ Show 20 Lines • Show All 50 Lines • Show Last 20 Lines