2018-09-12 Mark Wielaard <mark@klomp.org>
+ * eblsectionstripp.c (ebl_section_strip_p): Drop ehdr argument.
+ Use elf_getshdrstrndx.
+ * libebl.h (ebl_section_strip_p): Drop ehdr argument.
+
+2018-09-12 Mark Wielaard <mark@klomp.org>
+
* ebl-hooks.h (check_special_symbol): Drop ehdr argument.
* ebl_check_special_symbol.c (ebl_check_special_symbol): Likewise.
* eblopenbackend.c (default_check_special_symbol): Likewise.
bool
-ebl_section_strip_p (Ebl *ebl, const GElf_Ehdr *ehdr, const GElf_Shdr *shdr,
+ebl_section_strip_p (Ebl *ebl, const GElf_Shdr *shdr,
const char *name, bool remove_comment,
bool only_remove_debug)
{
GElf_Shdr *shdr_l = gelf_getshdr (scn_l, &shdr_mem_l);
if (shdr_l != NULL)
{
- const char *s_l = elf_strptr (ebl->elf, ehdr->e_shstrndx,
+ size_t shstrndx;
+ if (elf_getshdrstrndx (ebl->elf, &shstrndx) != 0)
+ return false;
+ const char *s_l = elf_strptr (ebl->elf, shstrndx,
shdr_l->sh_name);
if (s_l != NULL && ebl_debugscn_p (ebl, s_l))
return true;
extern bool ebl_relative_reloc_p (Ebl *ebl, int reloc);
/* Check whether section should be stripped. */
-extern bool ebl_section_strip_p (Ebl *ebl, const GElf_Ehdr *ehdr,
+extern bool ebl_section_strip_p (Ebl *ebl,
const GElf_Shdr *shdr, const char *name,
bool remove_comment, bool only_remove_debug);
2018-09-12 Mark Wielaard <mark@klomp.org>
+ * elfcmp.c (main): Call ebl_section_strip_p without ehdr.
+ * strip.c (handle_elf): Likewise.
+
+2018-09-12 Mark Wielaard <mark@klomp.org>
+
* elflint.c (check_symtab): Call ebl_check_special_symbol without
ehdr.
sname1 = elf_strptr (elf1, ehdr1->e_shstrndx, shdr1->sh_name);
}
while (scn1 != NULL
- && ebl_section_strip_p (ebl1, ehdr1, shdr1, sname1, true, false));
+ && ebl_section_strip_p (ebl1, shdr1, sname1, true, false));
GElf_Shdr shdr2_mem;
GElf_Shdr *shdr2;
sname2 = elf_strptr (elf2, ehdr2->e_shstrndx, shdr2->sh_name);
}
while (scn2 != NULL
- && ebl_section_strip_p (ebl2, ehdr2, shdr2, sname2, true, false));
+ && ebl_section_strip_p (ebl2, shdr2, sname2, true, false));
if (scn1 == NULL || scn2 == NULL)
break;
/* Check whether the section can be removed. Since we will create
a new .shstrtab assume it will be removed too. */
if (remove_shdrs ? !(shdr_info[cnt].shdr.sh_flags & SHF_ALLOC)
- : (ebl_section_strip_p (ebl, ehdr, &shdr_info[cnt].shdr,
+ : (ebl_section_strip_p (ebl, &shdr_info[cnt].shdr,
shdr_info[cnt].name, remove_comment,
remove_debug)
|| cnt == ehdr->e_shstrndx
original table in the debug file. Unless
it is a redundant data marker to a debug
(data only) section. */
- if (! (ebl_section_strip_p (ebl, ehdr,
+ if (! (ebl_section_strip_p (ebl,
&shdr_info[scnidx].shdr,
shdr_info[scnidx].name,
remove_comment,