From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1895) id A22B23899419; Wed, 10 Apr 2024 16:37:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A22B23899419 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1712767067; bh=YUWuflYx91NjW+gmTmkdAARULdkuwiCtPmZea5iI7Lw=; h=From:To:Subject:Date:From; b=pw5SJxBX4lidwf9Iz2bG6/K38WwOd8ivK8PJpEU1wwJ6AnqAMAT2x06PSZpLxFaJ8 APQWvdP9SiBhiUdHCaC4hBZf/0PtXgscnsB+osrKFo/8LF7TzMszaKENWAEBuQUYpQ HnUCKfUjSCEWyA/I/dzOCE7Ytx3JNb0CZ0S6de3Q= 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.33/master] aarch64: correct CFI in rawmemchr (bug 31113) X-Act-Checkin: glibc X-Git-Author: Andreas Schwab X-Git-Refname: refs/heads/release/2.33/master X-Git-Oldrev: 062d8a648f6fd8389094008cca625ce5c8a62177 X-Git-Newrev: 4818620ee2f938120cc1fa5f868a9feedf138cdc Message-Id: <20240410163747.A22B23899419@sourceware.org> Date: Wed, 10 Apr 2024 16:37:47 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=4818620ee2f938120cc1fa5f868a9feedf138cdc commit 4818620ee2f938120cc1fa5f868a9feedf138cdc 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