Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e96fc5b authored by Ulrich Weigand's avatar Ulrich Weigand Committed by Greg Kroah-Hartman
Browse files

scripts/recordmcount.pl: support data in text section on powerpc 



commit 2e50c4bef77511b42cc226865d6bc568fa7f8769 upstream.

If a text section starts out with a data blob before the first
function start label, disassembly parsing doing in recordmcount.pl
gets confused on powerpc, leading to creation of corrupted module
objects.

This was not a problem so far since the compiler would never create
such text sections.  However, this has changed with a recent change
in GCC 6 to support distances of > 2GB between a function and its
assoicated TOC in the ELFv2 ABI, exposing this problem.

There is already code in recordmcount.pl to handle such data blobs
on the sparc64 platform.  This patch uses the same method to handle
those on powerpc as well.

Acked-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarUlrich Weigand <ulrich.weigand@de.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent badc6884

scripts/recordmcount.pl

+2 −1
Original line number Diff line number Diff line
@@ -263,7 +263,8 @@ if ($arch eq "x86_64") { 


} elsif ($arch eq "powerpc") {

    $local_regex = "^[0-9a-fA-F]+\\s+t\\s+(\\.?\\S+)";

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

    # See comment in the sparc64 section for why we use '\w'.

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

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



    if ($bits == 64) {