History

ARM: 6511/1: ftrace: add ARM support for C version of recordmcount

Depending on the compiler version, ARM GCC calls the mcount function either __gnu_mcount_nc or mcount.

Rabin Vincent committed 15 years ago

Commit ed604531 parent cd3478f3 files · +8 −3Browse files

Showing the changes to scripts (2 of 3 files). Show all

Unified · Split

2 files
  1. scripts/recordmcount.c +4 −1
  2. scripts/recordmcount.h +3 −2
scripts/recordmcount.c+4−1
@@ -38,6 +38,7 @@ static void *ehdr_curr; /* current ElfXX_Ehdr * for resource cleanup */ · 37 unmodified lines
3838 static char gpfx; /* prefix for global symbol name (sometimes '_') */
3939 static struct stat sb; /* Remember .st_size, etc. */
4040 static jmp_buf jmpenv; /* setjmp/longjmp per-file error escape */
41+static const char *altmcount; /* alternate mcount symbol name */
4142
4243 /* setjmp() return values */
4344 enum {
@@ -299,7 +300,9 @@ do_file(char const *const fname) · 255 unmodified lines
299300 fail_file();
300301 } break;
301302 case EM_386: reltype = R_386_32; break;
302− case EM_ARM: reltype = R_ARM_ABS32; break;
303+ case EM_ARM: reltype = R_ARM_ABS32;
304+ altmcount = "__gnu_mcount_nc";
305+ break;
303306 case EM_IA_64: reltype = R_IA64_IMM64; gpfx = '_'; break;
304307 case EM_MIPS: /* reltype: e_class */ gpfx = '_'; break;
305308 case EM_PPC: reltype = R_PPC_ADDR32; gpfx = '_'; break;
scripts/recordmcount.h+3−2
@@ -275,11 +275,12 @@ static uint_t *sift_rel_mcount(uint_t *mlocp, · 274 unmodified lines
275275 Elf_Sym const *const symp =
276276 &sym0[Elf_r_sym(relp)];
277277 char const *symname = &str0[w(symp->st_name)];
278+ char const *mcount = '_' == gpfx ? "_mcount" : "mcount";
278279
279280 if ('.' == symname[0])
280281 ++symname; /* ppc64 hack */
281− if (0 == strcmp((('_' == gpfx) ? "_mcount" : "mcount"),
282− symname))
282+ if (0 == strcmp(mcount, symname) ||
283+ (altmcount && 0 == strcmp(altmcount, symname)))
283284 mcountsym = Elf_r_sym(relp);
284285 }
285286