From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1039) id 4717A3858D33; Tue, 31 Jan 2023 22:57:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4717A3858D33 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1675205844; bh=1/tOOfl2Und8HArAz+p4YIh4elCceeHemofMe3VnYOE=; h=From:To:Subject:Date:From; b=FaiV84vKRxa45rw1+bGxqzGLelTwyIlnoBzAvn+PksLxSAs6Zw5xS9fN8NrGN/e2Q xod6c5Gj7MKj8of4EpPRW+ZNCw1hn8fv7A/Sg17KUbdvxRDmOK0kUd095eftesvCgr YmL7tNdk32fgQZjZM5WV02GLc1l23G5F7arLqla0= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: H.J. Lu To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-5610] libsanitizer: cherry-pick commit 742bcbf685bc from upstream X-Act-Checkin: gcc X-Git-Author: H.J. Lu X-Git-Refname: refs/heads/master X-Git-Oldrev: 94cacee20d817d0b937701b6759bb67dba3ee3f9 X-Git-Newrev: a9fbc6687faa09bf045c0fcee7960b7fef796fcc Message-Id: <20230131225724.4717A3858D33@sourceware.org> Date: Tue, 31 Jan 2023 22:57:24 +0000 (GMT) List-Id: https://gcc.gnu.org/g:a9fbc6687faa09bf045c0fcee7960b7fef796fcc commit r13-5610-ga9fbc6687faa09bf045c0fcee7960b7fef796fcc Author: H.J. Lu Date: Tue Jan 31 14:34:00 2023 -0800 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. Diff: --- 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