Now that it's been stripped of using the old recordmcount ELF
wrapper get_mcountsym() is ready to be promoted out of the
double-included wrapper header.
Signed-off-by: Matt Helsley <mhels...@vmware.com>
---
tools/objtool/recordmcount.c | 16 ++++++++++++++++
tools/objtool/recordmcount.h | 19 -------------------
2 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index dafa6dd10d04..f72d313a2b51 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -422,6 +422,22 @@ static int is_mcounted_section_name(char const *const
txtname)
strcmp(".cpuidle.text", txtname) == 0;
}
+static unsigned get_mcountsym(struct reloc *reloc)
+{
+ struct symbol *sym = reloc->sym;
+ char const *symname = sym->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) ||
+ (strcmp(fentry, symname) == 0))
+ return GELF_R_INFO(reloc->sym->idx, reloc->type);
+ return 0;
+}
+
static const unsigned int missing_sym = (unsigned int)-1;
/* 32 bit and 64 bit are very similar */
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index cbf66b63ff82..a3fb62e88450 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -27,7 +27,6 @@
#undef find_section_sym_index
#undef has_rel_mcount
#undef tot_relsize
-#undef get_mcountsym
#undef do_func
#undef Elf_Addr
#undef Elf_Ehdr
@@ -50,7 +49,6 @@
# define has_rel_mcount has64_rel_mcount
# define tot_relsize tot64_relsize
# define do_func do64
-# define get_mcountsym get_mcountsym_64
# define is_fake_mcount is_fake_mcount64
# define fn_is_fake_mcount fn_is_fake_mcount64
# define MIPS_is_fake_mcount MIPS64_is_fake_mcount
@@ -75,7 +73,6 @@
# define has_rel_mcount has32_rel_mcount
# define tot_relsize tot32_relsize
# define do_func do32
-# define get_mcountsym get_mcountsym_32
# define is_fake_mcount is_fake_mcount32
# define fn_is_fake_mcount fn_is_fake_mcount32
# define MIPS_is_fake_mcount MIPS32_is_fake_mcount
@@ -234,22 +231,6 @@ static int append_func(Elf_Ehdr *const ehdr,
return elf_write(lf);
}
-static unsigned get_mcountsym(struct reloc *reloc)
-{
- struct symbol *sym = reloc->sym;
- char const *symname = sym->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) ||
- (strcmp(fentry, symname) == 0))
- return GELF_R_INFO(reloc->sym->idx, reloc->type);
- return 0;
-}
-
/*
* Look at the relocations in order to find the calls to mcount.
* Accumulate the section offsets that are found, and their relocation info,
--
2.20.1
