From: Steven Rostedt <srost...@redhat.com>

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.

Change recordmcount.c to record both callers to __fentry__ and
mcount.

Cc: John Reiser <jrei...@bitwagon.com>
Cc: Andi Kleen <a...@firstfloor.org>
Signed-off-by: Steven Rostedt <rost...@goodmis.org>
---
 scripts/recordmcount.h |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/recordmcount.h b/scripts/recordmcount.h
index 54e35c1..9d1421e 100644
--- a/scripts/recordmcount.h
+++ b/scripts/recordmcount.h
@@ -261,11 +261,13 @@ static unsigned get_mcountsym(Elf_Sym const *const sym0,
                &sym0[Elf_r_sym(relp)];
        char const *symname = &str0[w(symp->st_name)];
        char const *mcount = gpfx == '_' ? "_mcount" : "mcount";
+       char const *fentry = "__fentry__";
 
        if (symname[0] == '.')
                ++symname;  /* ppc64 hack */
        if (strcmp(mcount, symname) == 0 ||
-           (altmcount && strcmp(altmcount, symname) == 0))
+           (altmcount && strcmp(altmcount, symname) == 0) ||
+           (strcmp(fentry, symname) == 0))
                mcountsym = Elf_r_sym(relp);
 
        return mcountsym;
-- 
1.7.10.4


Attachment: signature.asc
Description: This is a digitally signed message part

Reply via email to