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

Commit f02b625d authored by Jamie Iles's avatar Jamie Iles Committed by Steven Rostedt
Browse files

recordmcount.pl: Add support for __fentry__ 

With gcc 4.6.0 the -mfentry feature places the function profiling call
at the start of the function. When this is used, the call is to
__fentry__ and not mcount.  This is required for Ksplice as the C
version of recordmcount doesn't insert section symbols for the
__mcount_loc section so we fall back to the perl version.

Based on 48bb5dc6 (ftrace: Make
recordmcount.c handle __fentry__).
Link: http://lkml.kernel.org/r/1383648129-10724-1-git-send-email-jamie.iles@oracle.com



Signed-off-by: default avatarJamie Iles <jamie.iles@oracle.com>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent b5aa3a47

scripts/recordmcount.pl

+2 −2
Original line number Diff line number Diff line
@@ -214,13 +214,13 @@ $local_regex = "^[0-9a-fA-F]+\\s+t\\s+(\\S+)"; 
$weak_regex = "^[0-9a-fA-F]+\\s+([wW])\\s+(\\S+)";

$section_regex = "Disassembly of section\\s+(\\S+):";

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

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

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

$section_type = '@progbits';

$mcount_adjust = 0;

$type = ".long";



if ($arch eq "x86_64") {

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

    $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s(mcount|__fentry__)([+-]0x[0-9a-zA-Z]+)?\$";

    $type = ".quad";

    $alignment = 8;

    $mcount_adjust = -1;