From patchwork Tue Dec 5 10:40:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Schwab X-Patchwork-Id: 81399 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 4635B3861811 for ; Tue, 5 Dec 2023 10:41:00 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by sourceware.org (Postfix) with ESMTPS id 5B0C33858424 for ; Tue, 5 Dec 2023 10:40:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5B0C33858424 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 5B0C33858424 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701772848; cv=none; b=k5qhKkYWamC0SGFFBQxnrF3w99MkOfd/n3saVj8M33ZZJRkhlSJEzAZIR9GeJvpC0eSSSH70/m01z2ue+Zop+hIJ6+HTd6K71RmEYLQgWsqGnRfH5Sv+UAFMbGTaqsLbXrjs2b38Y1SBjPqtCD5KRo4DM4tY3h8kzuh9yjLzEPg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701772848; c=relaxed/simple; bh=xJwZd4mTJ4JjWKv20De8kpeE4XPGR7nGYLnFwyRifKY=; h=DKIM-Signature:DKIM-Signature:From:To:Subject:Date:Message-ID: MIME-Version; b=Dx4SL8CH9f2X8YsHAlM+EotfVeawMocSR+r6dB1vYP5hvYP1VV32dn12jPzdUFDCoNd3rCgRJLowZpA3wEHfnG3OuIMdnnwsZ5GFR48adyfts/DTAYQ3Dt4JQYGJSkgZg1x45CoiYn6mWmwxnyIzhqhO6rfP+mz1A5L2EnzkoGY= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from hawking.nue2.suse.org (unknown [10.168.4.11]) by smtp-out2.suse.de (Postfix) with ESMTP id 562D51FB81 for ; Tue, 5 Dec 2023 10:40:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1701772844; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=I46GhvW6bfP064KGObmXajuv7EalWIOdImHuBwpJPSA=; b=dBs6kEupUqsS8XDe8HVQrkZDU2BjNGJkvZBUMbNhP+P9s1wBcs0GKc0SJgOKGNjXVthLWm BnIaB3ca/A+HKEQ37/SpyclVuNWv+Ee5+SFz/7gc8DDRI6r1cuIxiaFgLx+QIyPx169RWn uHkPYQzJBAn732CkTPWgOt39mFrcViA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1701772844; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=I46GhvW6bfP064KGObmXajuv7EalWIOdImHuBwpJPSA=; b=Uh9EnKB/0tdgxN/0BVb7yacxMrxz0/qir6aPqdRC9fLbbCrIom/zUhOK/7qamgNJhgj+pI 02uKQcL7fUeRD7Dg== Received: by hawking.nue2.suse.org (Postfix, from userid 17005) id 3DC2C4A04CB; Tue, 5 Dec 2023 11:40:44 +0100 (CET) From: Andreas Schwab To: libc-alpha@sourceware.org Subject: [PATCH] aarch64: correct CFI in rawmemchr (bug 31113) X-Yow: Now I'm having INSIPID THOUGHTS about the beautiful, round wives of HOLLYWOOD MOVIE MOGULS encased in PLEXIGLASS CARS and being approached by SMALL BOYS selling FRUIT.. Date: Tue, 05 Dec 2023 11:40:44 +0100 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Authentication-Results: smtp-out2.suse.de; none X-Spam-Score: 2.52 X-Spamd-Result: default: False [2.52 / 50.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_SPAM_LONG(2.65)[0.757]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_COUNT_ZERO(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; MID_RHS_MATCH_FROM(0.00)[]; BAYES_HAM(-0.03)[55.72%] X-Spam-Status: No, score=-9.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org 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