From a9fbc6687faa09bf045c0fcee7960b7fef796fcc Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Tue, 31 Jan 2023 14:34:00 -0800 Subject: [PATCH] libsanitizer: cherry-pick commit 742bcbf685bc from upstream cherry-pick: 742bcbf685bc compiler-rt/lib: Add .Linterceptor_sigsetjmp PR sanitizer/108106 * hwasan/hwasan_setjmp_x86_64.S (__interceptor_setjmp): Jump to .Linterceptor_sigsetjmp instead of __interceptor_sigsetjmp. (__interceptor_sigsetjmp): Add a local alias, .Linterceptor_sigsetjmp. --- libsanitizer/hwasan/hwasan_setjmp_x86_64.S | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libsanitizer/hwasan/hwasan_setjmp_x86_64.S b/libsanitizer/hwasan/hwasan_setjmp_x86_64.S index 7566c1ea0a5..a5a3858d94d 100644 --- a/libsanitizer/hwasan/hwasan_setjmp_x86_64.S +++ b/libsanitizer/hwasan/hwasan_setjmp_x86_64.S @@ -37,13 +37,14 @@ __interceptor_setjmp: CFI_STARTPROC _CET_ENDBR xorl %esi, %esi - jmp __interceptor_sigsetjmp + jmp .Linterceptor_sigsetjmp CFI_ENDPROC ASM_SIZE(__interceptor_setjmp) .global __interceptor_sigsetjmp ASM_TYPE_FUNCTION(__interceptor_sigsetjmp) __interceptor_sigsetjmp: +.Linterceptor_sigsetjmp: CFI_STARTPROC _CET_ENDBR