darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* readelf.c (process_program_headers): Use dynamic segment unless

Browse source 
dynamic section is found.
This commit is contained in:
Alan Modra 2007-10-24 02:27:15 +00:00
parent dc29b2f9c8
commit 20737c135d
2 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
binutils/ChangeLog
View file

@ -1,3 +1,9 @@
2007-10-24 Tristan Gingold <gingold@adacore.com>
Alan Modra <amodra@bigpond.net.au>
* readelf.c (process_program_headers): Use dynamic segment unless
dynamic section is found.
2007-10-16 Bob Wilson <bob.wilson@acm.org>
* doc/binutils.texi (objcopy, strip): Replace hyphens with em-dashes.

23
binutils/readelf.c
View file

@ -3530,6 +3530,11 @@ process_program_headers (FILE *file)
if (dynamic_addr)
error (_("more than one dynamic segment\n"));
/* By default, assume that the .dynamic section is the first
section in the DYNAMIC segment. */
dynamic_addr = segment->p_offset;
dynamic_size = segment->p_filesz;
/* Try to locate the .dynamic section. If there is
a section header table, we can easily locate it. */
if (section_headers != NULL)
@ -3544,23 +3549,21 @@ process_program_headers (FILE *file)
}
if (sec->sh_type == SHT_NOBITS)
break;
{
dynamic_size = 0;
break;
}
dynamic_addr = sec->sh_offset;
dynamic_size = sec->sh_size;
if (dynamic_addr < segment->p_offset
|| dynamic_addr > segment->p_offset + segment->p_filesz)
warn (_("the .dynamic section is not contained within the dynamic segment\n"));
warn (_("the .dynamic section is not contained"
" within the dynamic segment\n"));
else if (dynamic_addr > segment->p_offset)
warn (_("the .dynamic section is not the first section in the dynamic segment.\n"));
}
else
{
/* Otherwise, we can only assume that the .dynamic
section is the first section in the DYNAMIC segment. */
dynamic_addr = segment->p_offset;
dynamic_size = segment->p_filesz;
warn (_("the .dynamic section is not the first section"
" in the dynamic segment.\n"));
}
break;