This is a note to let you know that I've just added the patch titled
powerpc: boot: Remove leading zero in label in udelay()
to the 5.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
powerpc-boot-remove-leading-zero-in-label-in-udelay.patch
and it can be found in the queue-5.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From [email protected] Thu Sep 4 18:03:41 2025
From: Nathan Chancellor <[email protected]>
Date: Wed, 3 Sep 2025 14:11:58 -0700
Subject: powerpc: boot: Remove leading zero in label in udelay()
To: Greg Kroah-Hartman <[email protected]>, Sasha Levin
<[email protected]>
Cc: [email protected], Madhavan Srinivasan <[email protected]>, Michael
Ellerman <[email protected]>, Nicholas Piggin <[email protected]>, Christophe
Leroy <[email protected]>, [email protected], Nathan
Chancellor <[email protected]>
Message-ID: <[email protected]>
From: Nathan Chancellor <[email protected]>
When building powerpc configurations in linux-5.4.y with binutils 2.43
or newer, there is an assembler error in arch/powerpc/boot/util.S:
arch/powerpc/boot/util.S: Assembler messages:
arch/powerpc/boot/util.S:44: Error: junk at end of line, first unrecognized
character is `0'
arch/powerpc/boot/util.S:49: Error: syntax error; found `b', expected `,'
arch/powerpc/boot/util.S:49: Error: junk at end of line: `b'
binutils 2.43 contains stricter parsing of certain labels [1], namely
that leading zeros are no longer allowed. The GNU assembler
documentation already somewhat forbade this construct:
To define a local label, write a label of the form 'N:' (where N
represents any non-negative integer).
Eliminate the leading zero in the label to fix the syntax error. This is
only needed in linux-5.4.y because commit 8b14e1dff067 ("powerpc: Remove
support for PowerPC 601") removed this code altogether in 5.10.
Link:
https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=226749d5a6ff0d5c607d6428d6c81e1e7e7a994b
[1]
Signed-off-by: Nathan Chancellor <[email protected]>
Reviewed-by: Christophe Leroy <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
arch/powerpc/boot/util.S | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/arch/powerpc/boot/util.S
+++ b/arch/powerpc/boot/util.S
@@ -41,12 +41,12 @@ udelay:
srwi r4,r4,16
cmpwi 0,r4,1 /* 601 ? */
bne .Ludelay_not_601
-00: li r0,86 /* Instructions / microsecond? */
+0: li r0,86 /* Instructions / microsecond? */
mtctr r0
10: addi r0,r0,0 /* NOP */
bdnz 10b
subic. r3,r3,1
- bne 00b
+ bne 0b
blr
.Ludelay_not_601:
Patches currently in stable-queue which might be from [email protected] are
queue-5.4/powerpc-boot-remove-leading-zero-in-label-in-udelay.patch
