From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2138) id 9B7E93858D28; Tue, 5 Dec 2023 11:49:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9B7E93858D28 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1701776990; bh=+VJ+w2S2w8gaTmS6lXwO9aixDALSzZ3k8iMkRsGTx7M=; h=From:To:Subject:Date:From; b=XF9HB20Qh05pb5XQgH7+QhKI0ns/IgHaHtvPtvtSoi62YoLg75ebdfr3p+T3k2uTY TJ57XdfdfuMwQfPyKpp4PULDnWkVUoPenDiGldjjisBs28enyW2bjExHUjaOoRHNKj d9hjkYL4StqzKXDw54UVD74u/MaV99wn9SYFdXNE= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Andreas Schwab To: glibc-cvs@sourceware.org Subject: [glibc] aarch64: correct CFI in rawmemchr (bug 31113) X-Act-Checkin: glibc X-Git-Author: Andreas Schwab X-Git-Refname: refs/heads/master X-Git-Oldrev: 63d0a35d5f223a3f4b68190567b7d4d44545bce5 X-Git-Newrev: 3f798427884fa57770e8e2291cf58d5918254bb5 Message-Id: <20231205114950.9B7E93858D28@sourceware.org> Date: Tue, 5 Dec 2023 11:49:50 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=3f798427884fa57770e8e2291cf58d5918254bb5 commit 3f798427884fa57770e8e2291cf58d5918254bb5 Author: Andreas Schwab 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. 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 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