From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 8E7673857C40; Fri, 2 Feb 2024 13:25:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8E7673857C40 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1706880341; bh=1n6UcRVgVDsBeqJLPaPyNC1R1gn7bdJVM+r819bjs1E=; h=From:To:Subject:Date:From; b=GW+XgZVLtCwrnGn6S3H0iHbC50FlgLe28Qyds61W2cWMa7WvdJPkyDjTcsQJYE4AX IcLziiXrRWVN/fOO2s4bo6LBpfZEBCppRh+3MkmWvi2QsKwXQAS9m/y1r70EyF5CGj SMocdUXpLcI7XpBiqepC9jGYeNCCMybzyPbH4kRA= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc/release/2.36/master] sparc: Fix broken memset for sparc32 [BZ #31068] X-Act-Checkin: glibc X-Git-Author: Andreas Larsson X-Git-Refname: refs/heads/release/2.36/master X-Git-Oldrev: c54d08756c052a744cef0be84621197e1a436f6d X-Git-Newrev: d5e88bbf596206ae8f24be90c078f08ca479d596 Message-Id: <20240202132541.8E7673857C40@sourceware.org> Date: Fri, 2 Feb 2024 13:25:41 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=d5e88bbf596206ae8f24be90c078f08ca479d596 commit d5e88bbf596206ae8f24be90c078f08ca479d596 Author: Andreas Larsson Date: Wed Nov 15 13:29:43 2023 +0100 sparc: Fix broken memset for sparc32 [BZ #31068] 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 (cherry picked from commit 578190b7e43305141512dee777e4a3b3e8159393) Diff: --- sysdeps/sparc/sparc32/memset.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sysdeps/sparc/sparc32/memset.S b/sysdeps/sparc/sparc32/memset.S index b1b67cb2d1..5154263317 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)