public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Wilco Dijkstra <wilco@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc/release/2.35/master] aarch64: correct CFI in rawmemchr (bug 31113)
Date: Wed, 10 Apr 2024 15:08:08 +0000 (GMT)	[thread overview]
Message-ID: <20240410150808.4CE2F3846077@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=9112cda4c62e8a410be775045d5d307ebb48f0fe

commit 9112cda4c62e8a410be775045d5d307ebb48f0fe
Author: Andreas Schwab <schwab@suse.de>
Date:   Thu Nov 23 18:23:46 2023 +0100

    aarch64: correct CFI in rawmemchr (bug 31113)
    
    The .cfi_return_column directive changes the return column for the whole
    FDE range.  But the actual intent is to tell the unwinder that the value
    in x30 (lr) now resides in x15 after the move, and that is expressed by
    the .cfi_register directive.
    
    (cherry picked from commit 3f798427884fa57770e8e2291cf58d5918254bb5)

Diff:
---
 sysdeps/aarch64/rawmemchr.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sysdeps/aarch64/rawmemchr.S b/sysdeps/aarch64/rawmemchr.S
index 55d9e34d4f..f90ce2bf86 100644
--- a/sysdeps/aarch64/rawmemchr.S
+++ b/sysdeps/aarch64/rawmemchr.S
@@ -31,7 +31,7 @@ ENTRY (__rawmemchr)
 
 L(do_strlen):
 	mov	x15, x30
-	cfi_return_column (x15)
+	cfi_register (x30, x15)
 	mov	x14, x0
 	bl	__strlen
 	add	x0, x14, x0

                 reply	other threads:[~2024-04-10 15:08 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240410150808.4CE2F3846077@sourceware.org \
    --to=wilco@sourceware.org \
    --cc=glibc-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).