gdb/

	PR gdb/14494.
	* dwarf2read.c (dwarf2_locate_sections): Move variable aflag here.
	Move the SEC_HAS_CONTENTS check here - for any NAMES use.
	(dwarf2_locate_sections) <eh_frame>: Move the variable and check from
	here.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 12083ac03bf6409f012d32f795aee2c998459013..d74486ffb2aeb8d200d5fc7784779032311d7cfe 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2012-08-27  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+       PR gdb/14494.
+       * dwarf2read.c (dwarf2_locate_sections): Move variable aflag here.
+       Move the SEC_HAS_CONTENTS check here - for any NAMES use.
+       (dwarf2_locate_sections) <eh_frame>: Move the variable and check from
+       here.
+
 2012-08-22  Keith Seitz  <keiths@redhat.com>
 
        * defs.h: Include build-gnulib/config.h

diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index deee5a297c46ee646c424d5f6698741c9adc206e..48b8c08ae63204384fbe563ec2b5626a715945c2 100644 (file)
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -1691,13 +1691,17 @@ static void
 dwarf2_locate_sections (bfd *abfd, asection *sectp, void *vnames)
 {
   const struct dwarf2_debug_sections *names;
+  flagword aflag = bfd_get_section_flags (abfd, sectp);
 
   if (vnames == NULL)
     names = &dwarf2_elf_names;
   else
     names = (const struct dwarf2_debug_sections *) vnames;
 
-  if (section_is_p (sectp->name, &names->info))
+  if ((aflag & SEC_HAS_CONTENTS) == 0)
+    {
+    }
+  else if (section_is_p (sectp->name, &names->info))
     {
       dwarf2_per_objfile->info.asection = sectp;
       dwarf2_per_objfile->info.size = bfd_get_section_size (sectp);
@@ -1744,13 +1748,8 @@ dwarf2_locate_sections (bfd *abfd, asection *sectp, void *vnames)
     }
   else if (section_is_p (sectp->name, &names->eh_frame))
     {
-      flagword aflag = bfd_get_section_flags (abfd, sectp);
-
-      if (aflag & SEC_HAS_CONTENTS)
-        {
-         dwarf2_per_objfile->eh_frame.asection = sectp;
-          dwarf2_per_objfile->eh_frame.size = bfd_get_section_size (sectp);
-        }
+      dwarf2_per_objfile->eh_frame.asection = sectp;
+      dwarf2_per_objfile->eh_frame.size = bfd_get_section_size (sectp);
     }
   else if (section_is_p (sectp->name, &names->ranges))
     {