powerpc/boot: Fix crt0.S current address branch form
authorNicholas Piggin <npiggin@gmail.com>
Fri, 7 Apr 2023 04:09:24 +0000 (14:09 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Wed, 12 Apr 2023 00:58:10 +0000 (10:58 +1000)
Use the preferred form of branch-and-link for finding the current
address so objtool doesn't think it is an unannotated intra-function
call.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20230407040924.231023-1-npiggin@gmail.com
arch/powerpc/boot/crt0.S

index 4454472..121cab9 100644 (file)
@@ -51,7 +51,7 @@ _zimage_start:
 _zimage_start_lib:
        /* Work out the offset between the address we were linked at
           and the address where we're running. */
-       bl      .+4
+       bcl     20,31,.+4
 p_base:        mflr    r10             /* r10 now points to runtime addr of p_base */
 #ifndef __powerpc64__
        /* grab the link address of the dynamic section in r11 */
@@ -274,7 +274,7 @@ prom:
        mtsrr1  r10
 
        /* Load FW address, set LR to label 1, and jump to FW */
-       bl      0f
+       bcl     20,31,0f
 0:     mflr    r10
        addi    r11,r10,(1f-0b)
        mtlr    r11