This is an archive of the discontinued LLVM Phabricator instance.

Differential D142995

[hwasan] Add .Linterceptor_sigsetjmp
ClosedPublic

Authored by hjl.tools on Jan 31 2023, 10:20 AM.

Details

Reviewers
MaskRay
vitalybuka
Commits
rG742bcbf685bc: compiler-rt/lib: Add .Linterceptor_sigsetjmp
Summary

Older GNU assemblers generate R_X86_64_PC32 relocation against
defined non-weak global branch targets with default visibility. A
linker may issue an error when building a shared library. Add a local
alias, .Linterceptor_sigsetjmp, to interceptor_sigsetjmp to avoid
R_X86_64_PC32 relocation for "jmp interceptor_sigsetjmp" with older
GNU assemblers.

Fixes: https://github.com/llvm/llvm-project/issues/60426

Diff Detail

Event Timeline

hjl.tools created this revision.Jan 31 2023, 10:20 AM
Herald added a project: Restricted Project. · View Herald TranscriptJan 31 2023, 10:20 AM
Herald added subscribers: Enna1, pengfei. · View Herald Transcript
hjl.tools requested review of this revision.Jan 31 2023, 10:20 AM
Herald added a project: Restricted Project. · View Herald TranscriptJan 31 2023, 10:20 AM
Herald added a subscriber: Restricted Project. · View Herald Transcript
MaskRay added a comment.EditedJan 31 2023, 10:58 AM

Looks good. Shall we use a .L label so that the relocation references a STT_SECTION symbol instead of a new STB_LOCAL symbol?
Avoiding multiple STB_LOCAL symbols at the same location is usually a good idea.

Harbormaster completed remote builds in B211029: Diff 493662.Jan 31 2023, 11:28 AM
hjl.tools updated this revision to Diff 493716.Jan 31 2023, 1:14 PM
hjl.tools retitled this revision from [hwasan] Add __interceptor_sigsetjmp_internal to [hwasan] Add .Linterceptor_sigsetjmp.
hjl.tools edited the summary of this revision. (Show Details)
Harbormaster completed remote builds in B211060: Diff 493716.Jan 31 2023, 1:47 PM
MaskRay accepted this revision.Jan 31 2023, 1:58 PM
This revision is now accepted and ready to land.Jan 31 2023, 1:58 PM
vitalybuka accepted this revision.Jan 31 2023, 2:17 PM
Closed by commit rG742bcbf685bc: compiler-rt/lib: Add .Linterceptor_sigsetjmp (authored by hjl.tools). · Explain WhyJan 31 2023, 2:31 PM
This revision was automatically updated to reflect the committed changes.
hjl.tools added a commit: rG742bcbf685bc: compiler-rt/lib: Add .Linterceptor_sigsetjmp.

Revision Contents

PathSize
compiler-rt/
lib/
hwasan/
3 lines

Diff 493737

compiler-rt/lib/hwasan/hwasan_setjmp_x86_64.S

Show All 31 Lines
.file "hwasan_setjmp_x86_64.S" .file "hwasan_setjmp_x86_64.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
_CET_ENDBR _CET_ENDBR
xorl %esi, %esi xorl %esi, %esi
jmp __interceptor_sigsetjmp jmp .Linterceptor_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:
.Linterceptor_sigsetjmp:
CFI_STARTPROC CFI_STARTPROC
_CET_ENDBR _CET_ENDBR
// Save callee save registers. // Save callee save registers.
mov %rbx, (0*8)(%rdi) mov %rbx, (0*8)(%rdi)
mov %rbp, (1*8)(%rdi) mov %rbp, (1*8)(%rdi)
mov %r12, (2*8)(%rdi) mov %r12, (2*8)(%rdi)
mov %r13, (3*8)(%rdi) mov %r13, (3*8)(%rdi)
Show All 28 Lines