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

	dynamic section is found.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index c2cc125..689bb9c 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -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.

diff --git a/binutils/readelf.c b/binutils/readelf.c
index e550f6f..5ea766d 100644 (file)
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -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;