MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2007-08-14 Jan Kratochvil <jan.kratochvil@redhat.com>

Browse Source 
* elfcode.h (NAME(_bfd_elf,bfd_from_remote_memory)): LOADBASE is now
	initialized only on the first PT_LOAD.  New variable LOADBASE_SET.
	Removed PF_R checking for IA-64 vDSOs as redundant now.
	Code advisory: Roland McGrath
This commit is contained in:
Jan Kratochvil 2007-08-14 08:04:47 +00:00
parent ac3eeb4911
commit 3fec76aafa
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bfd/ChangeLog
View File

@ -1,3 +1,10 @@
2007-08-14 Jan Kratochvil <jan.kratochvil@redhat.com>
* elfcode.h (NAME(_bfd_elf,bfd_from_remote_memory)): LOADBASE is now
initialized only on the first PT_LOAD. New variable LOADBASE_SET.
Removed PF_R checking for IA-64 vDSOs as redundant now.
Code advisory: Roland McGrath
2007-08-13 Richard Sandiford <richard@codesourcery.com> 2007-08-13 Richard Sandiford <richard@codesourcery.com>
* elfxx-mips.c (mips_elf_link_hash_table): Add computed_got_sizes. * elfxx-mips.c (mips_elf_link_hash_table): Add computed_got_sizes.

22
bfd/elfcode.h
View File

@ -1635,6 +1635,7 @@ NAME(_bfd_elf,bfd_from_remote_memory)
int err; int err;
unsigned int i; unsigned int i;
bfd_vma loadbase; bfd_vma loadbase;
bfd_boolean loadbase_set;
/* Read in the ELF header in external format. */ /* Read in the ELF header in external format. */
err = target_read_memory (ehdr_vma, (bfd_byte *) &x_ehdr, sizeof x_ehdr); err = target_read_memory (ehdr_vma, (bfd_byte *) &x_ehdr, sizeof x_ehdr);
@ -1711,13 +1712,11 @@ NAME(_bfd_elf,bfd_from_remote_memory)
contents_size = 0; contents_size = 0;
last_phdr = NULL; last_phdr = NULL;
loadbase = ehdr_vma; loadbase = ehdr_vma;
loadbase_set = FALSE;
for (i = 0; i < i_ehdr.e_phnum; ++i) for (i = 0; i < i_ehdr.e_phnum; ++i)
{ {
elf_swap_phdr_in (templ, &x_phdrs[i], &i_phdrs[i]); elf_swap_phdr_in (templ, &x_phdrs[i], &i_phdrs[i]);
/* IA-64 vDSO may have two mappings for one segment, where one mapping if (i_phdrs[i].p_type == PT_LOAD)
is executable only, and one is read only. We must not use the
executable one. */
if (i_phdrs[i].p_type == PT_LOAD && (i_phdrs[i].p_flags & PF_R))
{ {
bfd_vma segment_end; bfd_vma segment_end;
segment_end = (i_phdrs[i].p_offset + i_phdrs[i].p_filesz segment_end = (i_phdrs[i].p_offset + i_phdrs[i].p_filesz
@ -1725,8 +1724,14 @@ NAME(_bfd_elf,bfd_from_remote_memory)
if (segment_end > (bfd_vma) contents_size) if (segment_end > (bfd_vma) contents_size)
contents_size = segment_end; contents_size = segment_end;
if ((i_phdrs[i].p_offset & -i_phdrs[i].p_align) == 0) /* LOADADDR is the `Base address' from the gELF specification:
loadbase = ehdr_vma - (i_phdrs[i].p_vaddr & -i_phdrs[i].p_align); `lowest p_vaddr value for a PT_LOAD segment' is P_VADDR from the
first PT_LOAD as PT_LOADs are ordered by P_VADDR. */
if (!loadbase_set && (i_phdrs[i].p_offset & -i_phdrs[i].p_align) == 0)
{
loadbase = ehdr_vma - (i_phdrs[i].p_vaddr & -i_phdrs[i].p_align);
loadbase_set = TRUE;
}
last_phdr = &i_phdrs[i]; last_phdr = &i_phdrs[i];
} }
@ -1764,10 +1769,7 @@ NAME(_bfd_elf,bfd_from_remote_memory)
} }
for (i = 0; i < i_ehdr.e_phnum; ++i) for (i = 0; i < i_ehdr.e_phnum; ++i)
/* IA-64 vDSO may have two mappings for one segment, where one mapping if (i_phdrs[i].p_type == PT_LOAD)
is executable only, and one is read only. We must not use the
executable one. */
if (i_phdrs[i].p_type == PT_LOAD && (i_phdrs[i].p_flags & PF_R))
{ {
bfd_vma start = i_phdrs[i].p_offset & -i_phdrs[i].p_align; bfd_vma start = i_phdrs[i].p_offset & -i_phdrs[i].p_align;
bfd_vma end = (i_phdrs[i].p_offset + i_phdrs[i].p_filesz bfd_vma end = (i_phdrs[i].p_offset + i_phdrs[i].p_filesz