From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1895) id 83029386F82F; Wed, 10 Apr 2024 16:10:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 83029386F82F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1712765442; bh=hPFbSTgQsWstfQCdDYC/0vSk/cr4WXr198gZsflulSw=; h=From:To:Subject:Date:From; b=WSSC4cz80LLjrhKnODp1xghVcCibYrPG6kLQC7+SboJWBdAey1o9ucl1fKSJS9E25 PvwBJy1WNWIJksL/fnK4zO+wA+B03DeS0GFsnZhxs+vkn5ROJb2mlosPNd6dc+8hH5 XumMsILOggjs1p4c07CTqnVj2Fz1BLtN3tHVM+K0= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Wilco Dijkstra To: glibc-cvs@sourceware.org Subject: [glibc/release/2.34/master] aarch64: correct CFI in rawmemchr (bug 31113) X-Act-Checkin: glibc X-Git-Author: Andreas Schwab X-Git-Refname: refs/heads/release/2.34/master X-Git-Oldrev: a4c93ae6d51349efe27dbdbbaa870bb54310375c X-Git-Newrev: c3ac827c811ac6563d147d83adfeb9362e41ba99 Message-Id: <20240410161042.83029386F82F@sourceware.org> Date: Wed, 10 Apr 2024 16:10:42 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=c3ac827c811ac6563d147d83adfeb9362e41ba99 commit c3ac827c811ac6563d147d83adfeb9362e41ba99 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. (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 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