lkml.org 
[lkml]   [2020]   [Apr]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[RFC][PATCH 11/36] objtool: mcount: Remove unused fname parameter
Date
The name of the object file being processed is unused in
leaf functions and only passed down to reach them so we
can remove it.

Signed-off-by: Matt Helsley <mhelsley@vmware.com>
---
tools/objtool/recordmcount.c | 4 ++--
tools/objtool/recordmcount.h | 19 ++++++++-----------
2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index 46a275a393a8..df16783434ae 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -586,7 +586,7 @@ static int do_file(char const *const fname)
reltype = R_MIPS_32;
is_fake_mcount32 = MIPS32_is_fake_mcount;
}
- if (do32(ehdr, fname, reltype) < 0)
+ if (do32(ehdr, reltype) < 0)
goto out;
break;
case ELFCLASS64: {
@@ -607,7 +607,7 @@ static int do_file(char const *const fname)
Elf64_r_info = MIPS64_r_info;
is_fake_mcount64 = MIPS64_is_fake_mcount;
}
- if (do64(ghdr, fname, reltype) < 0)
+ if (do64(ghdr, reltype) < 0)
goto out;
break;
}
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index 3c4807dca3d0..3250a461895d 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -466,8 +466,7 @@ static int find_secsym_ndx(unsigned const txtndx,
/* Evade ISO C restriction: no declaration after statement in has_rel_mcount. */
static char const * __has_rel_mcount(GElf_Shdr const *const relhdr, /* reltype */
Elf_Shdr const *const shdr0,
- char const *const shstrtab,
- char const *const fname)
+ char const *const shstrtab)
{
/* .sh_info depends on .sh_type == SHT_REL[,A] */
Elf_Shdr const *const txthdr = &shdr0[relhdr->sh_info];
@@ -481,25 +480,23 @@ static char const * __has_rel_mcount(GElf_Shdr const *const relhdr, /* reltype *

static char const *has_rel_mcount(GElf_Shdr const *const relhdr,
Elf_Shdr const *const shdr0,
- char const *const shstrtab,
- char const *const fname)
+ char const *const shstrtab)
{
if (relhdr->sh_type != SHT_REL && relhdr->sh_type != SHT_RELA)
return NULL;
- return __has_rel_mcount(relhdr, shdr0, shstrtab, fname);
+ return __has_rel_mcount(relhdr, shdr0, shstrtab);
}


static unsigned tot_relsize(Elf_Shdr const *const shdr0,
- const char *const shstrtab,
- const char *const fname)
+ const char *const shstrtab)
{
struct section *sec;
unsigned totrelsz = 0;
char const *txtname;

list_for_each_entry(sec, &lf->sections, list) {
- txtname = has_rel_mcount(&sec->sh, shdr0, shstrtab, fname);
+ txtname = has_rel_mcount(&sec->sh, shdr0, shstrtab);
if (txtname && is_mcounted_section_name(txtname))
totrelsz += sec->sh.sh_size;
}
@@ -508,7 +505,7 @@ static unsigned tot_relsize(Elf_Shdr const *const shdr0,


/* Overall supervision for Elf32 ET_REL file. */
-static int do_func(Elf_Ehdr *const ehdr, char const *const fname,
+static int do_func(Elf_Ehdr *const ehdr,
unsigned const reltype)
{
Elf_Shdr *const shdr0 = (Elf_Shdr *)(_w(ehdr->e_shoff)
@@ -538,7 +535,7 @@ static int do_func(Elf_Ehdr *const ehdr, char const *const fname,
if (find_section_by_name(lf, "__mcount_loc") != NULL)
return 0;

- totrelsz = tot_relsize(shdr0, shstrtab, fname);
+ totrelsz = tot_relsize(shdr0, shstrtab);
if (totrelsz == 0)
return 0;
mrel0 = umalloc(totrelsz);
@@ -559,7 +556,7 @@ static int do_func(Elf_Ehdr *const ehdr, char const *const fname,

relhdr = &sec->sh;
txtname = has_rel_mcount(relhdr, shdr0,
- shstrtab, fname);
+ shstrtab);
if (txtname && is_mcounted_section_name(txtname)) {
unsigned int recsym;
uint_t recval = 0;
--
2.20.1
\
 
 \ /
  Last update: 2020-04-10 21:37    [W:0.341 / U:0.812 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site