Clean up IDX_debug_* list.

diff --git a/libdw/ChangeLog b/libdw/ChangeLog
index 31e3e7d464c688685ed606a4511c4072e09ec525..12e70a7d9fb91cfb3a0b673bb845b1d6fe504b89 100644 (file)
--- a/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@ -1,5 +1,8 @@
 2010-06-01  Roland McGrath  <roland@redhat.com>
 
+       * libdwP.h: Remove unused IDX_debug_*names, add IDX_debug_types.
+       * dwarf_begin_elf.c (dwarf_scnnames): Likewise.
+
        * libdwP.h (CIE_VERSION): Remove unused macro.
 
        * dwarf_getsrclines.c: Fix version field test.

diff --git a/libdw/dwarf_begin_elf.c b/libdw/dwarf_begin_elf.c
index 391a8b8556ed9c9900c9d0fb6b8d27f91eeba7c6..c3a49654e75441a2e131c6fd4cb6ae60e8bf6af9 100644 (file)
--- a/libdw/dwarf_begin_elf.c
+++ b/libdw/dwarf_begin_elf.c
@@ -1,5 +1,5 @@
 /* Create descriptor from ELF descriptor for processing file.
-   Copyright (C) 2002, 2003, 2004, 2005, 2007, 2009 Red Hat, Inc.
+   Copyright (C) 2002-2010 Red Hat, Inc.
    This file is part of Red Hat elfutils.
    Written by Ulrich Drepper <drepper@redhat.com>, 2002.
 
@@ -66,6 +66,7 @@
 static const char dwarf_scnnames[IDX_last][17] =
 {
   [IDX_debug_info] = ".debug_info",
+  [IDX_debug_types] = ".debug_types",
   [IDX_debug_abbrev] = ".debug_abbrev",
   [IDX_debug_aranges] = ".debug_aranges",
   [IDX_debug_line] = ".debug_line",
@@ -73,10 +74,6 @@ static const char dwarf_scnnames[IDX_last][17] =
   [IDX_debug_loc] = ".debug_loc",
   [IDX_debug_pubnames] = ".debug_pubnames",
   [IDX_debug_str] = ".debug_str",
-  [IDX_debug_funcnames] = ".debug_funcnames",
-  [IDX_debug_typenames] = ".debug_typenames",
-  [IDX_debug_varnames] = ".debug_varnames",
-  [IDX_debug_weaknames] = ".debug_weaknames",
   [IDX_debug_macinfo] = ".debug_macinfo",
   [IDX_debug_ranges] = ".debug_ranges"
 };

diff --git a/libdw/libdwP.h b/libdw/libdwP.h
index 305ca2312cb65661622266c7b69a6df38aaf81c0..bfa8a4265307d7772c2230640f20fc502af2b686 100644 (file)
--- a/libdw/libdwP.h
+++ b/libdw/libdwP.h
@@ -83,6 +83,7 @@ struct loc_block_s
 enum
   {
     IDX_debug_info = 0,
+    IDX_debug_types,
     IDX_debug_abbrev,
     IDX_debug_aranges,
     IDX_debug_line,
@@ -90,10 +91,6 @@ enum
     IDX_debug_loc,
     IDX_debug_pubnames,
     IDX_debug_str,
-    IDX_debug_funcnames,
-    IDX_debug_typenames,
-    IDX_debug_varnames,
-    IDX_debug_weaknames,
     IDX_debug_macinfo,
     IDX_debug_ranges,
     IDX_last