* dwarf.c (dwarf_select_sections_by_names): Handle pubtypes correctly.

	(debug_displays): Remove duplicate entry for debug_pubtypes.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 0f4c7db..ee7effe 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-08  Cary Coutant  <ccoutant@google.com>
+
+       * dwarf.c (dwarf_select_sections_by_names): Handle pubtypes correctly.
+       (debug_displays): Remove duplicate entry for debug_pubtypes.
+
 2009-12-03  David Daney  <ddaney@caviumnetworks.com>
            Adam Nemet  <adambnemet@gmail.com>
 

diff --git a/binutils/dwarf.c b/binutils/dwarf.c
index 7e6cccb..e2e85bc 100644 (file)
--- a/binutils/dwarf.c
+++ b/binutils/dwarf.c
@@ -4868,7 +4868,7 @@ dwarf_select_sections_by_names (const char *names)
       { "loc",  & do_debug_loc, 1 },
       { "macro", & do_debug_macinfo, 1 },
       { "pubnames", & do_debug_pubnames, 1 },
-      { "pubtypes", & do_debug_pubnames, 1 },
+      { "pubtypes", & do_debug_pubtypes, 1 },
       /* This entry is for compatability
         with earlier versions of readelf.  */
       { "ranges", & do_debug_aranges, 1 },
@@ -5009,8 +5009,6 @@ struct dwarf_section_display debug_displays[] =
     display_debug_lines,               &do_debug_lines,        1 },
   { { ".debug_pubnames",       ".zdebug_pubnames",     NULL,   NULL,   0,      0 },
     display_debug_pubnames,            &do_debug_pubnames,     0 },
-  { { ".debug_pubtypes",       ".zdebug_pubtypes",     NULL,   NULL,   0,      0 },
-    display_debug_pubnames,            &do_debug_pubtypes,     0 },
   { { ".eh_frame",             "",                     NULL,   NULL,   0,      0 },
     display_debug_frames,              &do_debug_frames,       1 },
   { { ".debug_macinfo",                ".zdebug_macinfo",      NULL,   NULL,   0,      0 },