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

Set ET_EXEC for -pie -Ttext-segment=

Browse source 
bfd/

	* elf.c (assign_file_positions_except_relocs): Set e_type in ELF
	header to ET_EXEC for -pie -Ttext-segment=.

2013-12-10  H.J. Lu  <hongjiu.lu@intel.com>

	* ld-pie/vaddr-0.d: New file.
	* ld-pie/vaddr-1.d: Likewise.
	* ld-pie/vaddr.s: Likewise.
This commit is contained in:
H.J. Lu 2013-12-12 07:41:27 -08:00
parent b15e5c540f
commit 58e7ebacdd
6 changed files with 60 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
bfd/ChangeLog
View file

@ -1,3 +1,8 @@
2013-12-12 H.J. Lu <hongjiu.lu@intel.com>
* elf.c (assign_file_positions_except_relocs): Set e_type in ELF
header to ET_EXEC for -pie -Ttext-segment=.
2013-12-08 Alan Modra <amodra@gmail.com> 2013-12-08 Alan Modra <amodra@gmail.com>
* elflink.c (_bfd_elf_add_default_symbol): Set dynamic_def * elflink.c (_bfd_elf_add_default_symbol): Set dynamic_def

21
bfd/elf.c
View file

@ -5152,6 +5152,27 @@ assign_file_positions_except_relocs (bfd *abfd,
return FALSE; return FALSE;
} }
/* Set e_type in ELF header to ET_EXEC for -pie -Ttext-segment=. */
if (link_info != NULL
&& link_info->executable
&& link_info->shared)
{
unsigned int num_segments = elf_elfheader (abfd)->e_phnum;
Elf_Internal_Phdr *segment = elf_tdata (abfd)->phdr;
Elf_Internal_Phdr *end_segment = &segment[num_segments];
/* Find the lowest p_vaddr in PT_LOAD segments. */
bfd_vma p_vaddr = (bfd_vma) -1;
for (; segment < end_segment; segment++)
if (segment->p_type == PT_LOAD && p_vaddr > segment->p_vaddr)
p_vaddr = segment->p_vaddr;
/* Set e_type to ET_EXEC if the lowest p_vaddr in PT_LOAD
segments is non-zero. */
if (p_vaddr)
i_ehdrp->e_type = ET_EXEC;
}
/* Write out the program headers. */ /* Write out the program headers. */
alloc = elf_program_header_size (abfd) / bed->s->sizeof_phdr; alloc = elf_program_header_size (abfd) / bed->s->sizeof_phdr;
if (bfd_seek (abfd, (bfd_signed_vma) bed->s->sizeof_ehdr, SEEK_SET) != 0 if (bfd_seek (abfd, (bfd_signed_vma) bed->s->sizeof_ehdr, SEEK_SET) != 0

6
ld/testsuite/ChangeLog
View file

@ -1,3 +1,9 @@
2013-12-12 H.J. Lu <hongjiu.lu@intel.com>
* ld-pie/vaddr-0.d: New file.
* ld-pie/vaddr-1.d: Likewise.
* ld-pie/vaddr.s: Likewise.
2013-12-11 Will Newton <will.newton@linaro.org> 2013-12-11 Will Newton <will.newton@linaro.org>
* ld-aarch64/ifunc-21.d: Make test more generic to support * ld-aarch64/ifunc-21.d: Make test more generic to support

9
ld/testsuite/ld-pie/vaddr-0.d Normal file
View file

@ -0,0 +1,9 @@
#source: vaddr.s
#name: zero p_vaddr
#ld: -pie
#readelf: -h
ELF Header:
#...
Type: DYN \(Shared object file\)
#pass

9
ld/testsuite/ld-pie/vaddr-1.d Normal file
View file

@ -0,0 +1,9 @@
#source: vaddr.s
#name: non-zero p_vaddr
#ld: -pie -Ttext-segment 0x7000000 -z max-page-size=0x200000
#readelf: -h
ELF Header:
#...
Type: EXEC \(Executable file\)
#pass

10
ld/testsuite/ld-pie/vaddr.s Normal file
View file

@ -0,0 +1,10 @@
.globl main
.globl start
.globl _start
.globl __start
.text
main:
start:
_start:
__start:
.byte 0