Accepting request 1131293 from home:Andreas_Schwab:Factory

- aarch64-rawmemchr-unwind.patch: aarch64: correct CFI in rawmemchr
  (bsc#1217445, BZ #31113)

OBS-URL: https://build.opensuse.org/request/show/1131293
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=686

aarch64-rawmemchr-unwind.patch

@@ -0,0 +1,29 @@
+From 3f798427884fa57770e8e2291cf58d5918254bb5 Mon Sep 17 00:00:00 2001
+From: Andreas Schwab <schwab@suse.de>
+Date: Thu, 23 Nov 2023 18:23:46 +0100
+Subject: [PATCH] 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.
+---
+ 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 efc4b7007b..1fff094215 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
+-- 
+2.43.0
+

glibc.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Dec  5 11:52:03 UTC 2023 - Andreas Schwab <schwab@suse.de>
+
+- aarch64-rawmemchr-unwind.patch: aarch64: correct CFI in rawmemchr
+  (bsc#1217445, BZ #31113)
+
 -------------------------------------------------------------------
 Mon Dec  4 15:16:38 UTC 2023 - Andreas Schwab <schwab@suse.de>
 

glibc.spec

@@ -331,6 +331,8 @@ Patch1012:      setxid-propagate-glibc-tunables.patch
 Patch1013:      tunables-string-parsing.patch
 # PATCH-FIX-UPSTREAM add GB18030-2022 charmap and test the entire GB18030 charmap (BZ #30243)
 Patch1014:      gb18030-2022.patch
+# PATCH-FIX-UPSTREAM aarch64: correct CFI in rawmemchr (BZ #31113)
+Patch1015:      aarch64-rawmemchr-unwind.patch
 
 ###
 # Patches awaiting upstream approval
@@ -568,6 +570,7 @@ library in a cross compilation setting.
 %patch1012 -p1
 %patch1013 -p1
 %patch1014 -p1
+%patch1015 -p1
 %endif
 
 %patch2000 -p1