Commit a30d551f authored by Willy Tarreau's avatar Willy Tarreau Committed by Paul E. McKenney
Browse files

tools/nolibc: make argc 32-bit in riscv startup code 



The "ld a0, 0(sp)" instruction doesn't build on RISCV32 because that
would load a 64-bit value into a 32-bit register. But argc 32-bit,
not 64, so we ought to use "lw" here. Tested on both RISCV32 and
RISCV64.

Cc: Pranith Kumar <bobby.prani@gmail.com>
Signed-off-by: default avatarWilly Tarreau <w@1wt.eu>
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
parent 568035b0

tools/include/nolibc/arch-riscv.h

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ __asm__ (".section .text\n" 
    ".option norelax\n"

    "lla   gp, __global_pointer$\n"

    ".option pop\n"

    "ld    a0, 0(sp)\n"          // argc (a0) was in the stack

    "lw    a0, 0(sp)\n"          // argc (a0) was in the stack

    "add   a1, sp, "SZREG"\n"    // argv (a1) = sp

    "slli  a2, a0, "PTRLOG"\n"   // envp (a2) = SZREG*argc ...

    "add   a2, a2, "SZREG"\n"    //             + SZREG (skip null)