From patchwork Wed Nov 15 12:29:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ludwig Rydberg X-Patchwork-Id: 79937 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 C76543858C98 for ; Wed, 15 Nov 2023 12:30:50 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from smtp-out3.simply.com (smtp-out3.simply.com [94.231.106.210]) by sourceware.org (Postfix) with ESMTPS id 1508C3858023 for ; Wed, 15 Nov 2023 12:30:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1508C3858023 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gaisler.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gaisler.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 1508C3858023 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=94.231.106.210 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700051439; cv=none; b=b4O0yvjh/SsQZX2vAZNic+an0sKjPRnAP5/WPnzxAbhy+I/Pf1rBVQrP/4WeZVLeNzKOb7TBE8pIzqhMXKrOAjckKk3jojQiBvE5EI81GR5FdPUphlcjgJO5zbw6FtPpBaC+j8iium22LNgAhOL/tKjz8DXzircQmorYmjSNfmo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700051439; c=relaxed/simple; bh=QWc9EPKnpSsLNkJ84kzQ4W7493q+6sbfXo4CPCcoAJ4=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=jPUubCuMXWKCt4W3EvZZSX9Fwh2PPBdCsIYyYdEVDySwwzwjqQ345RKcllJC7NGX+sNd4XYqxJR0Rf6ssTbHCnHh8thDHDyriNbgmvXZ5dxltKkktvaxSjE+ZqM/+zbglNf3qTHI4Nn0hwTev24GGoMpSSjYzC+zIP3Lc5PPSeY= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from localhost (localhost [127.0.0.1]) by smtp.simply.com (Simply.com) with ESMTP id 4SVjDp5jRYz681H; Wed, 15 Nov 2023 13:30:34 +0100 (CET) Received: from ludwig.got.gaisler.com (h-98-128-223-123.NA.cust.bahnhof.se [98.128.223.123]) by smtp.simply.com (Simply.com) with ESMTPA id 4SVjDp3sn0z67y4; Wed, 15 Nov 2023 13:30:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gaisler.com; s=unoeuro; t=1700051434; bh=2FHrFbBbFL+X6tJ4W3YC3+G/IqS0aRgYBVGk7oTiUjo=; h=From:To:Cc:Subject:Date; b=Pg9mksxqiXiuxLdNIffS/d6G5U6+g2Xp5yXdPhnFTHLgqiIQuxyLOs8s7kVOe5awx QEZoMSMqHSn6GptlaHl7k3U5b90NnS3QdvxSBYBOOZwki+/BaR9mTdPIGDLOWSyWF9 kD/UOyrKS/IH9XDFPQFy0hfIGPOo+CUR/oeCs2J8= From: Ludwig Rydberg To: libc-alpha@sourceware.org Cc: adhemerval.zanella@linaro.org, software@gaisler.com, Andreas Larsson , Ludwig Rydberg Subject: [PATCH] sparc: Fix broken memset for sparc32 [BZ #31068] Date: Wed, 15 Nov 2023 13:29:43 +0100 Message-Id: <20231115122943.22799-1-ludwig.rydberg@gaisler.com> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 X-Spam-Status: No, score=-10.5 required=5.0 tests=BAYES_00, DKIM_INVALID, DKIM_SIGNED, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_DNSWL_LOW, SPF_HELO_PASS, 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 From: Andreas Larsson Fixes commit a61933fe27df ("sparc: Remove bzero optimization") that after moving code jumped to the wrong label 4. Verfied by successfully running string/test-memset on sparc32. Signed-off-by: Andreas Larsson Signed-off-by: Ludwig Rydberg Reviewed-by: Adhemerval Zanella --- sysdeps/sparc/sparc32/memset.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) base-commit: 8f22e36238c94e2a89da624e03c224895f9dd691 diff --git a/sysdeps/sparc/sparc32/memset.S b/sysdeps/sparc/sparc32/memset.S index ca29ff568501..1dc3a640e874 100644 --- a/sysdeps/sparc/sparc32/memset.S +++ b/sysdeps/sparc/sparc32/memset.S @@ -55,7 +55,7 @@ ENTRY(memset) andcc %o0, 3, %o2 bne 3f -4: andcc %o0, 4, %g0 +5: andcc %o0, 4, %g0 be 2f mov %g3, %g2 @@ -139,7 +139,7 @@ ENTRY(memset) stb %g3, [%o0 + 0x02] 2: sub %o2, 4, %o2 add %o1, %o2, %o1 - b 4b + b 5b sub %o0, %o2, %o0 END(memset) libc_hidden_builtin_def (memset)