From 2e084502768cc845bacc2457c22d097f49808751 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Fri, 2 Oct 2015 16:31:36 +0200 Subject: unstrip: Update sh_info when SH_INFO_LINK_P not just when SHF_INFO_LINK set SHF_INFO_LINK is not consistently set when sh_info is actually a section index reference. Use SH_INFO_LINK_P to check whether to update the sh_info value. SH_INFO_LINK_P also checks the section type to know whether or not sh_info is meant as section index. Found by run-strip-strmerge.sh test with older binutils. Signed-off-by: Mark Wielaard --- src/ChangeLog | 5 +++++ src/unstrip.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 72bb0ab8..411c70bf 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2015-10-02 Mark Wielaard + + * unstrip.c (copy_elided_sections): Use SH_INFO_LINK_P, not just + SHF_INFO_LINK. + 2015-10-02 Mark Wielaard * strip.c (handle_elf): Don't move around allocated NOBITS sections. diff --git a/src/unstrip.c b/src/unstrip.c index d40df97d..d193708a 100644 --- a/src/unstrip.c +++ b/src/unstrip.c @@ -1526,7 +1526,7 @@ more sections in stripped file than debug file -- arguments reversed?")); if (sec->shdr.sh_link != SHN_UNDEF) shdr_mem.sh_link = ndx_section[sec->shdr.sh_link - 1]; - if (shdr_mem.sh_flags & SHF_INFO_LINK) + if (SH_INFO_LINK_P (&sec->shdr) && sec->shdr.sh_info != 0) shdr_mem.sh_info = ndx_section[sec->shdr.sh_info - 1]; if (strtab != NULL) -- cgit v1.2.3