public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc/release/2.36/master] aarch64: correct CFI in rawmemchr (bug 31113)
@ 2024-04-10 14:11 Wilco Dijkstra
  0 siblings, 0 replies; only message in thread
From: Wilco Dijkstra @ 2024-04-10 14:11 UTC (permalink / raw)
  To: glibc-cvs

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=88e96e7b5fc8c80ef22b08022dd327a546066aae

commit 88e96e7b5fc8c80ef22b08022dd327a546066aae
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

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2024-04-10 14:11 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-10 14:11 [glibc/release/2.36/master] aarch64: correct CFI in rawmemchr (bug 31113) Wilco Dijkstra

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).