From: Mark Wielaard Date: Mon, 26 May 2014 20:35:30 +0000 (+0200) Subject: unstrip: Allow prelinked, but non-split .bss section. X-Git-Tag: elfutils-0.160~23 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd1a0d1293e3cdc2a81370a39df5f55bf08bcbb6;p=thirdparty%2Felfutils.git unstrip: Allow prelinked, but non-split .bss section. If the section sh_size of the original and undo section are equal then match them and don't set split_bss. This is also what prelink's undo_sections allows. Signed-off-by: Mark Wielaard --- diff --git a/src/ChangeLog b/src/ChangeLog index 4067583ac..4062fc7f2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2014-05-26 Mark Wielaard + + * unstrip.c (find_alloc_sections_prelink): Allow non-split .bss + section when sh_size of the original and undo .bss section are equal. + 2014-05-26 Mark Wielaard * unstrip.c (options): Add --force, -F. diff --git a/src/unstrip.c b/src/unstrip.c index 65bb25169..f6af45002 100644 --- a/src/unstrip.c +++ b/src/unstrip.c @@ -1125,10 +1125,11 @@ find_alloc_sections_prelink (Elf *debug, Elf_Data *debug_shstrtab, && (sec->shdr.sh_type == undo_sec->shdr.sh_type || (sec->shdr.sh_type == SHT_PROGBITS && undo_sec->shdr.sh_type == SHT_NOBITS)) - && sec->shdr.sh_size < undo_sec->shdr.sh_size + && sec->shdr.sh_size <= undo_sec->shdr.sh_size && (!strcmp (sec->name, ".bss") || !strcmp (sec->name, ".sbss")) - && (split_bss = sec) > sections))) + && (sec->shdr.sh_size == undo_sec->shdr.sh_size + || (split_bss = sec) > sections)))) { sec->outscn = undo_sec->outscn; undo_sec = NULL;