about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@suse.de>2023-11-23 18:23:46 +0100
committerWilco Dijkstra <wilco.dijkstra@arm.com>2024-04-09 17:59:11 +0100
commitc3ac827c811ac6563d147d83adfeb9362e41ba99 (patch)
treea5d0f2a3d1f69558b32dde7a8466cde78f4a5a87
parenta4c93ae6d51349efe27dbdbbaa870bb54310375c (diff)
downloadglibc-c3ac827c811ac6563d147d83adfeb9362e41ba99.tar.gz
glibc-c3ac827c811ac6563d147d83adfeb9362e41ba99.tar.xz
glibc-c3ac827c811ac6563d147d83adfeb9362e41ba99.zip
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)
-rw-r--r--sysdeps/aarch64/rawmemchr.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/sysdeps/aarch64/rawmemchr.S b/sysdeps/aarch64/rawmemchr.S
index aa49892dcb..a92b8ea875 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