FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Non-alloc sections don't belong in PT_LOAD segments

Browse source 
Taking them out showed a bug in the powerpc64 backend with .branch_lt
being removed from output_bfd but not from previously set up segment
section maps.  Removing the bfd sections meant their sh_flags (and
practically everything else) remaining zero, ie. not SHF_ALLOC,
triggering complaints about "`.branch_lt' can't be allocated in
segment".

include/elf/
	* internal.h (ELF_SECTION_IN_SEGMENT_1): Ensure PT_LOAD and
	similar segments only contain alloc sections.
ld/
	* emultempl/ppc64elf.em (gld${EMULATION_NAME}_after_allocation):
	Call gld${EMULATION_NAME}_map_segments regardless of need_laying_out.
ld/testsuite/
	* ld-powerpc/tocnovar.d: Revert last change.
This commit is contained in:
Alan Modra 2015-04-24 19:19:37 +09:30
parent b53b1bedbd
commit 44bd1acd55
6 changed files with 31 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/elf/ChangeLog
View file

@ -1,3 +1,8 @@
2015-04-24 Alan Modra <amodra@gmail.com>
* internal.h (ELF_SECTION_IN_SEGMENT_1): Ensure PT_LOAD and
similar segments only contain alloc sections.
2015-04-24 H.J. Lu <hongjiu.lu@intel.com> 2015-04-24 H.J. Lu <hongjiu.lu@intel.com>
PR binutils/18316 PR binutils/18316

7
include/elf/internal.h
View file

@ -325,6 +325,13 @@ struct elf_segment_map
|| (((sec_hdr)->sh_flags & SHF_TLS) == 0 \ || (((sec_hdr)->sh_flags & SHF_TLS) == 0 \
&& (segment)->p_type != PT_TLS \ && (segment)->p_type != PT_TLS \
&& (segment)->p_type != PT_PHDR)) \ && (segment)->p_type != PT_PHDR)) \
/* PT_LOAD and similar segments only have SHF_ALLOC sections. */ \
&& !(((sec_hdr)->sh_flags & SHF_ALLOC) == 0 \
&& ((segment)->p_type == PT_LOAD \
|| (segment)->p_type == PT_DYNAMIC \
|| (segment)->p_type == PT_GNU_EH_FRAME \
|| (segment)->p_type == PT_GNU_RELRO \
|| (segment)->p_type == PT_GNU_STACK)) \
/* Any section besides one of type SHT_NOBITS must have file \ /* Any section besides one of type SHT_NOBITS must have file \
offsets within the segment. */ \ offsets within the segment. */ \
&& ((sec_hdr)->sh_type == SHT_NOBITS \ && ((sec_hdr)->sh_type == SHT_NOBITS \

5
ld/ChangeLog
View file

@ -1,3 +1,8 @@
2015-04-24 Alan Modra <amodra@gmail.com>
* emultempl/ppc64elf.em (gld${EMULATION_NAME}_after_allocation):
Call gld${EMULATION_NAME}_map_segments regardless of need_laying_out.
2015-04-24 DJ Delorie <dj@redhat.com> 2015-04-24 DJ Delorie <dj@redhat.com>
* Makefile.am (msp430): Rename primary emulation to msp430elf. * Makefile.am (msp430): Rename primary emulation to msp430elf.

15
ld/emultempl/ppc64elf.em
View file

@ -546,13 +546,16 @@ gld${EMULATION_NAME}_after_allocation (void)
else if (ret > 0) else if (ret > 0)
need_laying_out = 1; need_laying_out = 1;
if (need_laying_out != -1) /* Call map_segments regardless of the state of need_laying_out.
{ need_laying_out set to -1 means we have just laid everything out,
gld${EMULATION_NAME}_map_segments (need_laying_out); but ppc64_elf_size_stubs strips .branch_lt and .eh_frame if
unneeded, after ppc_layout_sections_again. Another call removes
these sections from the segment map. Their presence is
innocuous except for confusing ELF_SECTION_IN_SEGMENT. */
gld${EMULATION_NAME}_map_segments (need_laying_out > 0);
if (!link_info.relocatable) if (need_laying_out != -1 && !link_info.relocatable)
ppc64_elf_set_toc (&link_info, link_info.output_bfd); ppc64_elf_set_toc (&link_info, link_info.output_bfd);
}
} }

4
ld/testsuite/ChangeLog
View file

@ -1,3 +1,7 @@
2015-04-24 Alan Modra <amodra@gmail.com>
* ld-powerpc/tocnovar.d: Revert last change.
2015-04-24 Richard Earnshaw <rearnsha@arm.com> 2015-04-24 Richard Earnshaw <rearnsha@arm.com>
* ld-arm/armthumb-lib.d: Regenerate expected output. * ld-arm/armthumb-lib.d: Regenerate expected output.

2
ld/testsuite/ld-powerpc/tocnovar.d
View file

@ -11,4 +11,4 @@
#... #...
+00 +\.text +00 +\.text
+01 +\.opd \.got +01 +\.opd \.got
+02 +\.opd \.got .* +02 +\.opd \.got