Unverified Commit 2f095504 authored by Nathan Chancellor's avatar Nathan Chancellor Committed by Palmer Dabbelt
Browse files

scripts/recordmcount.pl: Fix RISC-V regex for clang 

Clang can generate R_RISCV_CALL_PLT relocations to _mcount:

$ llvm-objdump -dr build/riscv/init/main.o | rg mcount
                000000000000000e:  R_RISCV_CALL_PLT     _mcount
                000000000000004e:  R_RISCV_CALL_PLT     _mcount

After this, the __start_mcount_loc section is properly generated and
function tracing still works.

Link: https://github.com/ClangBuiltLinux/linux/issues/1331


Signed-off-by: default avatarNathan Chancellor <nathan@kernel.org>
Reviewed-by: default avatarFangrui Song <maskray@google.com>
Signed-off-by: default avatarPalmer Dabbelt <palmerdabbelt@google.com>
parent 7f3d3490

scripts/recordmcount.pl

+1 −1
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ if ($arch eq "x86_64") { 
    $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s_mcount\$";

} elsif ($arch eq "riscv") {

    $function_regex = "^([0-9a-fA-F]+)\\s+<([^.0-9][0-9a-zA-Z_\\.]+)>:";

    $mcount_regex = "^\\s*([0-9a-fA-F]+):\\sR_RISCV_CALL\\s_mcount\$";

    $mcount_regex = "^\\s*([0-9a-fA-F]+):\\sR_RISCV_CALL(_PLT)?\\s_mcount\$";

    $type = ".quad";

    $alignment = 2;

} elsif ($arch eq "nds32") {