]> git.ipfire.org Git - thirdparty/binutils-gdb.git/blobdiff - binutils/readelf.c
* tc-m68k.c: Include elf/m68k.h.
[thirdparty/binutils-gdb.git] / binutils / readelf.c
index da733654716f71b09d3d47c9fa3bb42d281c5499..549bf1a68b61cf070ea3d15ad145099ccc840ec4 100644 (file)
@@ -1,5 +1,5 @@
 /* readelf.c -- display contents of an ELF format file
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
 
    Originally developed by Eric Youngdale <eric@andante.jic.com>
    Modifications by Nick Clifton <nickc@cygnus.com>
@@ -32,6 +32,7 @@
 #include "elf/common.h"
 #include "elf/external.h"
 #include "elf/internal.h"
+#include "elf/dwarf2.h"
 
 /* The following headers use the elf/reloc-macros.h file to
    automatically generate relocation recognition functions
 #include "elf/sparc.h"
 #include "elf/m32r.h"
 #include "elf/d10v.h"
-/* start-sanitize-d30v */
 #include "elf/d30v.h"
-/* end-sanitize-d30v */
 #include "elf/sh.h"
 #include "elf/mn10200.h"
 #include "elf/mn10300.h"
 #include "elf/hppa.h"
 #include "elf/arc.h"
+#include "elf/fr30.h"
+#include "elf/mcore.h"
 
 #include "bucomm.h"
 #include "getopt.h"
@@ -75,9 +76,12 @@ unsigned int         rela_size;
 char *                 dynamic_strings;
 char *                 string_table;
 Elf_Internal_Sym *     dynamic_symbols;
+Elf_Internal_Syminfo * dynamic_syminfo;
+unsigned long          dynamic_syminfo_offset;
+unsigned int           dynamic_syminfo_nent;
 char                   program_interpreter [64];
-int                    dynamic_info [DT_JMPREL + 1];
-int                    version_info [16];
+int                    dynamic_info[DT_JMPREL + 1];
+int                    version_info[16];
 int                    loadaddr = 0;
 Elf_Internal_Ehdr       elf_header;
 Elf_Internal_Shdr *     section_headers;
@@ -92,49 +96,83 @@ int                         do_using_dynamic;
 int                    do_header;
 int                    do_dump;
 int                    do_version;
-
-static unsigned long int (* byte_get) PARAMS ((unsigned char *, int));
-
-#define NUM_DUMP_SECTS 100
-char                   dump_sects [NUM_DUMP_SECTS];
-
-#define HEX_DUMP       1
-#define DISASS_DUMP    2
+int                    do_histogram;
+int                    do_debugging;
+int                     do_debug_info;
+int                     do_debug_abbrevs;
+int                     do_debug_lines;
+int                     do_debug_pubnames;
+int                     do_debug_aranges;
+int                    binary_class;
+
+/* A dynamic array of flags indicating which sections require dumping.  */
+char *                 dump_sects = NULL;
+unsigned int           num_dump_sects = 0;
+
+#define HEX_DUMP       (1 << 0)
+#define DISASS_DUMP    (1 << 1)
+#define DEBUG_DUMP     (1 << 2)
 
 /* Forward declarations for dumb compilers.  */
-static const char * get_mips_dynamic_type PARAMS ((unsigned long type));
-static const char * get_dynamic_type PARAMS ((unsigned long type));
-static int    dump_relocations
-  PARAMS ((FILE *, unsigned long, unsigned long, Elf_Internal_Sym *, char *));
-static char * get_file_type     PARAMS ((unsigned e_type));
-static char * get_machine_name  PARAMS ((unsigned e_machine));
-static char * get_machine_data  PARAMS ((unsigned e_data));
-static char * get_machine_flags PARAMS ((unsigned, unsigned e_machine));
-static const char * get_mips_segment_type PARAMS ((unsigned long type));
-static const char * get_segment_type  PARAMS ((unsigned long p_type));
-static const char * get_mips_section_type_name PARAMS ((unsigned int sh_type));
-static const char * get_section_type_name PARAMS ((unsigned int sh_type));
-static char * get_symbol_binding PARAMS ((unsigned int binding));
-static char * get_symbol_type    PARAMS ((unsigned int type));
-static void   usage PARAMS ((void));
-static void   parse_args PARAMS ((int argc, char ** argv));
-static int    process_file_header PARAMS ((void));
-static int    process_program_headers PARAMS ((FILE *));
-static int    process_section_headers PARAMS ((FILE *));
-static void   dynamic_segment_mips_val PARAMS ((Elf_Internal_Dyn *entry));
-static int    process_dynamic_segment PARAMS ((FILE *));
-static int    process_symbol_table PARAMS ((FILE *));
-static int    process_section_contents PARAMS ((FILE *));
-static void   process_file PARAMS ((char * file_name));
-static int    process_relocs PARAMS ((FILE *));
-static int    process_version_sections PARAMS ((FILE *));
-static char * get_ver_flags PARAMS ((unsigned int flags));
-static char * get_symbol_index_type PARAMS ((unsigned int type));
-static int    get_section_headers PARAMS ((FILE * file));
-static int    get_file_header PARAMS ((FILE * file));
-static Elf_Internal_Sym * get_elf_symbols
-  PARAMS ((FILE * file, unsigned long offset, unsigned long number));
-static int *  get_dynamic_data PARAMS ((FILE * file, unsigned int number));
+static unsigned long (*   byte_get)                   PARAMS ((unsigned char *, int));
+static const char *       get_mips_dynamic_type       PARAMS ((unsigned long type));
+static const char *       get_dynamic_type            PARAMS ((unsigned long type));
+static int                dump_relocations            PARAMS ((FILE *, unsigned long, unsigned long, Elf_Internal_Sym *, char *));
+static char *             get_file_type               PARAMS ((unsigned e_type));
+static char *             get_machine_name            PARAMS ((unsigned e_machine));
+static char *             get_machine_data            PARAMS ((unsigned e_data));
+static char *             get_machine_flags           PARAMS ((unsigned, unsigned e_machine));
+static const char *       get_mips_segment_type       PARAMS ((unsigned long type));
+static const char *       get_segment_type            PARAMS ((unsigned long p_type));
+static const char *       get_mips_section_type_name  PARAMS ((unsigned int sh_type));
+static const char *       get_section_type_name       PARAMS ((unsigned int sh_type));
+static char *             get_symbol_binding          PARAMS ((unsigned int binding));
+static char *             get_symbol_type             PARAMS ((unsigned int type));
+static void               usage                       PARAMS ((void));
+static void               parse_args                  PARAMS ((int argc, char ** argv));
+static int                process_file_header         PARAMS ((void));
+static int                process_program_headers     PARAMS ((FILE *));
+static int                process_section_headers     PARAMS ((FILE *));
+static void               dynamic_segment_mips_val    PARAMS ((Elf_Internal_Dyn *entry));
+static int                process_dynamic_segment     PARAMS ((FILE *));
+static int                process_symbol_table        PARAMS ((FILE *));
+static int                process_section_contents    PARAMS ((FILE *));
+static void               process_file                PARAMS ((char * file_name));
+static int                process_relocs              PARAMS ((FILE *));
+static int                process_version_sections    PARAMS ((FILE *));
+static char *             get_ver_flags               PARAMS ((unsigned int flags));
+static char *             get_symbol_index_type       PARAMS ((unsigned int type));
+static int                get_section_headers         PARAMS ((FILE * file));
+static int                get_file_header             PARAMS ((FILE * file));
+static Elf_Internal_Sym * get_elf_symbols             PARAMS ((FILE * file, unsigned long offset, unsigned long number));
+static int *              get_dynamic_data            PARAMS ((FILE * file, unsigned int number));
+#ifdef SUPPORT_DISASSEMBLY
+static int               disassemble_section         PARAMS ((Elf32_Internal_Shdr *, FILE *));
+#endif
+static int               dump_section                PARAMS ((Elf32_Internal_Shdr *, FILE *));
+static int               display_debug_section       PARAMS ((Elf32_Internal_Shdr *, FILE *));
+static int                display_debug_info          PARAMS ((Elf32_Internal_Shdr *, unsigned char *, FILE *));
+static int                display_debug_not_supported PARAMS ((Elf32_Internal_Shdr *, unsigned char *, FILE *));
+static int                display_debug_lines         PARAMS ((Elf32_Internal_Shdr *, unsigned char *, FILE *));
+static int                display_debug_abbrev        PARAMS ((Elf32_Internal_Shdr *, unsigned char *, FILE *));
+static int                display_debug_aranges       PARAMS ((Elf32_Internal_Shdr *, unsigned char *, FILE *));
+static unsigned char *    process_abbrev_section      PARAMS ((unsigned char *, unsigned char *));
+static unsigned long      read_leb128                 PARAMS ((unsigned char *, int *, int));
+static int                process_extended_line_op    PARAMS ((unsigned char *, int));
+static void               reset_state_machine         PARAMS ((int));
+static char *             get_TAG_name                PARAMS ((unsigned long));
+static char *             get_AT_name                 PARAMS ((unsigned long));
+static char *             get_FORM_name               PARAMS ((unsigned long));
+static void               free_abbrevs                PARAMS ((void));
+static void               add_abbrev                  PARAMS ((unsigned long, unsigned long, int));
+static void               add_abbrev_attr             PARAMS ((unsigned long, unsigned long));
+static unsigned char *    read_and_display_attr       PARAMS ((unsigned long, unsigned long, unsigned char *, unsigned long));
+static unsigned char *    display_block               PARAMS ((unsigned char *, unsigned long));
+static void               decode_location_expression  PARAMS ((unsigned char *, unsigned int));
+static void              request_dump                PARAMS ((unsigned int, char));
+static const char *       get_elf_class               PARAMS ((unsigned char));
+static const char *       get_data_encoding           PARAMS ((unsigned char));
+static const char *       get_osabi_name              PARAMS ((unsigned char));
 
 typedef int Elf32_Word;
 
@@ -309,13 +347,14 @@ dump_relocations (file, rel_offset, rel_size, symtab, strtab)
   /* Compute number of relocations and read them in.  */
   switch (elf_header.e_machine)
     {
+      /* Targets that use REL relocations.  */
+    case EM_ARM:
     case EM_386:
     case EM_486:
     case EM_CYGNUS_M32R:
     case EM_CYGNUS_D10V:
     case EM_MIPS:
     case EM_MIPS_RS4_BE:
-    case EM_ARM:
       {
        Elf32_External_Rel * erels;
 
@@ -340,17 +379,18 @@ dump_relocations (file, rel_offset, rel_size, symtab, strtab)
       }
     break;
 
+      /* Targets that use RELA relocations.  */
     case EM_68K:
     case EM_SPARC:
     case EM_PPC:
     case EM_CYGNUS_V850:
-      /* start-sanitize-d30v */
     case EM_CYGNUS_D30V:
-      /* end-sanitize-d30v */
     case EM_CYGNUS_MN10200:
     case EM_CYGNUS_MN10300:
+    case EM_CYGNUS_FR30:
     case EM_SH:
     case EM_ALPHA:
+    case EM_MCORE:
       {
        Elf32_External_Rela * erelas;
 
@@ -383,10 +423,10 @@ dump_relocations (file, rel_offset, rel_size, symtab, strtab)
 
   if (is_rela)
     printf
-      (_("  Offset    Value Type            Symbol's Value  Symbol's Name          Addend\n"));
+      (_("  Offset    Info  Type            Symbol's Value  Symbol's Name          Addend\n"));
   else
     printf
-      (_("  Offset    Value Type            Symbol's Value  Symbol's Name\n"));
+      (_("  Offset    Info  Type            Symbol's Value  Symbol's Name\n"));
 
   for (i = 0; i < rel_size; i++)
     {
@@ -439,12 +479,10 @@ dump_relocations (file, rel_offset, rel_size, symtab, strtab)
          rtype = elf_d10v_reloc_type (ELF32_R_TYPE (info));
          break;
 
-         /* start-sanitize-d30v */
        case EM_CYGNUS_D30V:
          rtype = elf_d30v_reloc_type (ELF32_R_TYPE (info));
          break;
 
-         /* end-sanitize-d30v */
        case EM_SH:
          rtype = elf_sh_reloc_type (ELF32_R_TYPE (info));
          break;
@@ -457,6 +495,14 @@ dump_relocations (file, rel_offset, rel_size, symtab, strtab)
          rtype = elf_mn10200_reloc_type (ELF32_R_TYPE (info));
          break;
 
+       case EM_CYGNUS_FR30:
+         rtype = elf_fr30_reloc_type (ELF32_R_TYPE (info));
+         break;
+
+       case EM_MCORE:
+         rtype = elf_mcore_reloc_type (ELF32_R_TYPE (info));
+         break;
+
        case EM_PPC:
          rtype = elf_ppc_reloc_type (ELF32_R_TYPE (info));
          break;
@@ -484,7 +530,7 @@ dump_relocations (file, rel_offset, rel_size, symtab, strtab)
        }
 
       if (rtype == NULL)
-       printf (_("unrecognised: %-7x"), ELF32_R_TYPE (info));
+       printf (_("unrecognised: %-7lx"), ELF32_R_TYPE (info));
       else
        printf ("%-21.21s", rtype);
 
@@ -502,7 +548,7 @@ dump_relocations (file, rel_offset, rel_size, symtab, strtab)
            printf ("%-25.25s",
                    SECTION_NAME (section_headers + psym->st_shndx));
          else if (strtab == NULL)
-           printf (_("<string table index %3d>"), psym->st_name);
+           printf (_("<string table index %3ld>"), psym->st_name);
          else
            printf ("%-25.25s", strtab + psym->st_name);
 
@@ -580,59 +626,87 @@ get_dynamic_type (type)
 
   switch (type)
     {
-    case DT_NULL:      return _("NULL");
-    case DT_NEEDED:    return _("NEEDED");
-    case DT_PLTRELSZ:  return _("PLTRELSZ");
-    case DT_PLTGOT:    return _("PLTGOT");
-    case DT_HASH:      return _("HASH");
-    case DT_STRTAB:    return _("STRTAB");
-    case DT_SYMTAB:    return _("SYMTAB");
-    case DT_RELA:      return _("RELA");
-    case DT_RELASZ:    return _("RELASZ");
-    case DT_RELAENT:   return _("RELAENT");
-    case DT_STRSZ:     return _("STRSZ");
-    case DT_SYMENT:    return _("SYMENT");
-    case DT_INIT:      return _("INIT");
-    case DT_FINI:      return _("FINI");
-    case DT_SONAME:    return _("SONAME");
-    case DT_RPATH:     return _("RPATH");
-    case DT_SYMBOLIC:  return _("SYMBOLIC");
-    case DT_REL:       return _("REL");
-    case DT_RELSZ:     return _("RELSZ");
-    case DT_RELENT:    return _("RELENT");
-    case DT_PLTREL:    return _("PLTREL");
-    case DT_DEBUG:     return _("DEBUG");
-    case DT_TEXTREL:   return _("TEXTREL");
-    case DT_JMPREL:    return _("JMPREL");
-    case DT_VERDEF:    return _("VERDEF");
-    case DT_VERDEFNUM: return _("VERDEFNUM");
-    case DT_VERNEED:   return _("VERNEED");
-    case DT_VERNEEDNUM:        return _("VERNEEDNUM");
-    case DT_VERSYM:    return _("VERSYN");
-    case DT_AUXILIARY: return _("AUXILARY");
-    case DT_FILTER:    return _("FILTER");
-
+    case DT_NULL:      return "NULL";
+    case DT_NEEDED:    return "NEEDED";
+    case DT_PLTRELSZ:  return "PLTRELSZ";
+    case DT_PLTGOT:    return "PLTGOT";
+    case DT_HASH:      return "HASH";
+    case DT_STRTAB:    return "STRTAB";
+    case DT_SYMTAB:    return "SYMTAB";
+    case DT_RELA:      return "RELA";
+    case DT_RELASZ:    return "RELASZ";
+    case DT_RELAENT:   return "RELAENT";
+    case DT_STRSZ:     return "STRSZ";
+    case DT_SYMENT:    return "SYMENT";
+    case DT_INIT:      return "INIT";
+    case DT_FINI:      return "FINI";
+    case DT_SONAME:    return "SONAME";
+    case DT_RPATH:     return "RPATH";
+    case DT_SYMBOLIC:  return "SYMBOLIC";
+    case DT_REL:       return "REL";
+    case DT_RELSZ:     return "RELSZ";
+    case DT_RELENT:    return "RELENT";
+    case DT_PLTREL:    return "PLTREL";
+    case DT_DEBUG:     return "DEBUG";
+    case DT_TEXTREL:   return "TEXTREL";
+    case DT_JMPREL:    return "JMPREL";
+    case DT_BIND_NOW:   return "BIND_NOW";
+    case DT_INIT_ARRAY: return "INIT_ARRAY";
+    case DT_FINI_ARRAY: return "FINI_ARRAY";
+    case DT_INIT_ARRAYSZ: return "INIT_ARRAYSZ";
+    case DT_FINI_ARRAYSZ: return "FINI_ARRAYSZ";
+      
+    case DT_PLTPADSZ:  return "PLTPADSZ";
+    case DT_MOVEENT:   return "MOVEENT";
+    case DT_MOVESZ:    return "MOVESZ";
+    case DT_FEATURE_1: return "FEATURE_1";
+    case DT_POSFLAG_1: return "POSFLAG_1";
+    case DT_SYMINSZ:   return "SYMINSZ";
+    case DT_SYMINENT:  return "SYMINENT"; /* aka VALRNGHI */
+      
+    case DT_ADDRRNGLO:  return "ADDRRNGLO";
+    case DT_SYMINFO:   return "SYMINFO"; /* aka ADDRRNGHI */
+      
+    case DT_VERSYM:    return "VERSYM";
+      
+    case DT_RELACOUNT: return "RELACOUNT";
+    case DT_RELCOUNT:  return "RELCOUNT";
+    case DT_FLAGS_1:   return "FLAGS_1";
+    case DT_VERDEF:    return "VERDEF";
+    case DT_VERDEFNUM: return "VERDEFNUM";
+    case DT_VERNEED:   return "VERNEED";
+    case DT_VERNEEDNUM:        return "VERNEEDNUM";
+      
+    case DT_AUXILIARY: return "AUXILARY";
+    case DT_USED:      return "USED";
+    case DT_FILTER:    return "FILTER";
+      
     default:
       if ((type >= DT_LOPROC) && (type <= DT_HIPROC))
        {
-         const char *result = NULL;
+         const char * result;
+         
          switch (elf_header.e_machine)
            {
            case EM_MIPS:
            case EM_MIPS_RS4_BE:
              result = get_mips_dynamic_type (type);
-         default:
+             break;
+           default:
+             result = NULL;
+             break;
            }
 
-         if (result == NULL)
-           {
-             sprintf (buff, _("Processor Specific: (%x)"), type);
-             result = buff;
-           }
-         return result;
+         if (result != NULL)
+           return result;
+
+         sprintf (buff, _("Processor Specific: %lx"), type);
        }
+      else if ((type >= DT_LOOS) && (type <= DT_HIOS))
+       sprintf (buff, _("Operating System specific: %lx"), type);
       else
-       sprintf (buff, _("<unknown>: %x"), type);
+       sprintf (buff, _("<unknown>: %lx"), type);
+      
       return buff;
     }
 }
@@ -654,6 +728,8 @@ get_file_type (e_type)
     default:
       if ((e_type >= ET_LOPROC) && (e_type <= ET_HIPROC))
        sprintf (buff, _("Processor Specific: (%x)"), e_type);
+      else if ((e_type >= ET_LOOS) && (e_type <= ET_HIOS))
+       sprintf (buff, _("OS Specific: (%x)"), e_type);
       else
        sprintf (buff, _("<unknown>: %x"), e_type);
       return buff;
@@ -688,21 +764,30 @@ get_machine_name (e_machine)
     case EM_V800:              return "NEC V800";
     case EM_FR20:              return "Fujitsu FR20";
     case EM_RH32:              return "TRW RH32";
-    case EM_MMA:               return "Fujitsu MMA";
+    case EM_MCORE:             return "MCORE";
     case EM_ARM:               return "ARM";
     case EM_OLD_ALPHA:         return "Digital Alpha (old)";
     case EM_SH:                        return "Hitachi SH";
     case EM_SPARCV9:           return "Sparc v9";
+    case EM_TRICORE:           return "Siemens Tricore";
+    case EM_ARC:               return "Argonaut RISC Core";
+    case EM_H8_300:            return "Hitachi H8/300";
+    case EM_H8_300H:           return "Hitachi H8/300H";
+    case EM_H8S:               return "Hitachi H8S";
+    case EM_H8_500:            return "Hitachi H8/500";
+    case EM_IA_64:             return "Intel Merced";
+    case EM_MIPS_X:            return "Stanford MIPS-X";
+    case EM_COLDFIRE:          return "Motorola Coldfire";
+    case EM_68HC12:            return "Motorola M68HC12";
     case EM_ALPHA:             return "Alpha";
     case EM_CYGNUS_D10V:        return "d10v";
-      /* start-sanitize-d30v */
     case EM_CYGNUS_D30V:        return "d30v";
-      /* end-sanitize-d30v */
     case EM_CYGNUS_ARC:                return "Arc";
-    case EM_CYGNUS_M32R:       return "M32r";
-    case EM_CYGNUS_V850:       return "v850";
+    case EM_CYGNUS_M32R:       return "Mitsubishi M32r";
+    case EM_CYGNUS_V850:       return "NEC v850";
     case EM_CYGNUS_MN10300:    return "mn10300";
     case EM_CYGNUS_MN10200:    return "mn10200";
+    case EM_CYGNUS_FR30:       return "Fujitsu FR30";
 
     default:
       sprintf (buff, _("<unknown>: %x"), e_machine);
@@ -736,16 +821,28 @@ get_machine_flags (e_flags, e_machine)
            strcat (buf, ", relocatable-lib");
          break;
 
+       case EM_CYGNUS_V850:
+         switch (e_flags & EF_V850_ARCH)
+           {
+           case E_V850E_ARCH:
+             strcat (buf, ", v850e");
+             break;
+           case E_V850EA_ARCH:
+             strcat (buf, ", v850ea");
+             break;
+           case E_V850_ARCH:
+             strcat (buf, ", v850");
+             break;
+           default:
+             strcat (buf, ", unknown v850 architecture variant");
+             break;
+           }
+         break;
+
        case EM_CYGNUS_M32R:
          if ((e_flags & EF_M32R_ARCH) == E_M32R_ARCH)
            strcat (buf, ", m32r");
 
-         /* start-sanitize-m32rx */
-#ifdef E_M32RX_ARCH
-         if ((e_flags & EF_M32R_ARCH) == E_M32RX_ARCH)
-           strcat (buf, ", m32rx");
-#endif
-         /* end-sanitize-m32rx */
          break;
 
        case EM_MIPS:
@@ -834,7 +931,8 @@ get_segment_type (p_type)
     default:
       if ((p_type >= PT_LOPROC) && (p_type <= PT_HIPROC))
        {
-         const char *result;
+         const char * result;
+         
          switch (elf_header.e_machine)
            {
            case EM_MIPS:
@@ -845,18 +943,18 @@ get_segment_type (p_type)
              result = NULL;
              break;
            }
-         if (result == NULL)
-           {
-             sprintf (buff, "LOPROC+%d", p_type - PT_LOPROC);
-             result = buff;
-           }
-         return result;
+         
+         if (result != NULL)
+           return result;
+         
+         sprintf (buff, "LOPROC+%lx", p_type - PT_LOPROC);
        }
+      else if ((p_type >= PT_LOOS) && (p_type <= PT_HIOS))
+       sprintf (buff, "LOOS+%lx", p_type - PT_LOOS);
       else
-       {
-         sprintf (buff, _("<unknown>: %x"), p_type);
-         return buff;
-       }
+       sprintf (buff, _("<unknown>: %lx"), p_type);
+
+      return buff;
     }
 }
 
@@ -866,84 +964,45 @@ get_mips_section_type_name (sh_type)
 {
   switch (sh_type)
     {
-    case SHT_MIPS_LIBLIST:
-      return "MIPS_LIBLIST";
-    case SHT_MIPS_MSYM:
-      return "MIPS_MSYM";
-    case SHT_MIPS_CONFLICT:
-      return "MIPS_CONFLICT";
-    case SHT_MIPS_GPTAB:
-      return "MIPS_GPTAB";
-    case SHT_MIPS_UCODE:
-      return "MIPS_UCODE";
-    case SHT_MIPS_DEBUG:
-      return "MIPS_DEBUG";
-    case SHT_MIPS_REGINFO:
-      return "MIPS_REGINFO";
-    case SHT_MIPS_PACKAGE:
-      return "MIPS_PACKAGE";
-    case SHT_MIPS_PACKSYM:
-      return "MIPS_PACKSYM";
-    case SHT_MIPS_RELD:
-      return "MIPS_RELD";
-    case SHT_MIPS_IFACE:
-      return "MIPS_IFACE";
-    case SHT_MIPS_CONTENT:
-      return "MIPS_CONTENT";
-    case SHT_MIPS_OPTIONS:
-      return "MIPS_OPTIONS";
-    case SHT_MIPS_SHDR:
-      return "MIPS_SHDR";
-    case SHT_MIPS_FDESC:
-      return "MIPS_FDESC";
-    case SHT_MIPS_EXTSYM:
-      return "MIPS_EXTSYM";
-    case SHT_MIPS_DENSE:
-      return "MIPS_DENSE";
-    case SHT_MIPS_PDESC:
-      return "MIPS_PDESC";
-    case SHT_MIPS_LOCSYM:
-      return "MIPS_LOCSYM";
-    case SHT_MIPS_AUXSYM:
-      return "MIPS_AUXSYM";
-    case SHT_MIPS_OPTSYM:
-      return "MIPS_OPTSYM";
-    case SHT_MIPS_LOCSTR:
-      return "MIPS_LOCSTR";
-    case SHT_MIPS_LINE:
-      return "MIPS_LINE";
-    case SHT_MIPS_RFDESC:
-      return "MIPS_RFDESC";
-    case SHT_MIPS_DELTASYM:
-      return "MIPS_DELTASYM";
-    case SHT_MIPS_DELTAINST:
-      return "MIPS_DELTAINST";
-    case SHT_MIPS_DELTACLASS:
-      return "MIPS_DELTACLASS";
-    case SHT_MIPS_DWARF:
-      return "MIPS_DWARF";
-    case SHT_MIPS_DELTADECL:
-      return "MIPS_DELTADECL";
-    case SHT_MIPS_SYMBOL_LIB:
-      return "MIPS_SYMBOL_LIB";
-    case SHT_MIPS_EVENTS:
-      return "MIPS_EVENTS";
-    case SHT_MIPS_TRANSLATE:
-      return "MIPS_TRANSLATE";
-    case SHT_MIPS_PIXIE:
-      return "MIPS_PIXIE";
-    case SHT_MIPS_XLATE:
-      return "MIPS_XLATE";
-    case SHT_MIPS_XLATE_DEBUG:
-      return "MIPS_XLATE_DEBUG";
-    case SHT_MIPS_WHIRL:
-      return "MIPS_WHIRL";
-    case SHT_MIPS_EH_REGION:
-      return "MIPS_EH_REGION";
-    case SHT_MIPS_XLATE_OLD:
-      return "MIPS_XLATE_OLD";
-    case SHT_MIPS_PDR_EXCEPTION:
-      return "MIPS_PDR_EXCEPTION";
+    case SHT_MIPS_LIBLIST:       return "MIPS_LIBLIST";
+    case SHT_MIPS_MSYM:          return "MIPS_MSYM";
+    case SHT_MIPS_CONFLICT:      return "MIPS_CONFLICT";
+    case SHT_MIPS_GPTAB:         return "MIPS_GPTAB";
+    case SHT_MIPS_UCODE:         return "MIPS_UCODE";
+    case SHT_MIPS_DEBUG:         return "MIPS_DEBUG";
+    case SHT_MIPS_REGINFO:       return "MIPS_REGINFO";
+    case SHT_MIPS_PACKAGE:       return "MIPS_PACKAGE";
+    case SHT_MIPS_PACKSYM:       return "MIPS_PACKSYM";
+    case SHT_MIPS_RELD:          return "MIPS_RELD";
+    case SHT_MIPS_IFACE:         return "MIPS_IFACE";
+    case SHT_MIPS_CONTENT:       return "MIPS_CONTENT";
+    case SHT_MIPS_OPTIONS:       return "MIPS_OPTIONS";
+    case SHT_MIPS_SHDR:          return "MIPS_SHDR";
+    case SHT_MIPS_FDESC:         return "MIPS_FDESC";
+    case SHT_MIPS_EXTSYM:        return "MIPS_EXTSYM";
+    case SHT_MIPS_DENSE:         return "MIPS_DENSE";
+    case SHT_MIPS_PDESC:         return "MIPS_PDESC";
+    case SHT_MIPS_LOCSYM:        return "MIPS_LOCSYM";
+    case SHT_MIPS_AUXSYM:        return "MIPS_AUXSYM";
+    case SHT_MIPS_OPTSYM:        return "MIPS_OPTSYM";
+    case SHT_MIPS_LOCSTR:        return "MIPS_LOCSTR";
+    case SHT_MIPS_LINE:          return "MIPS_LINE";
+    case SHT_MIPS_RFDESC:        return "MIPS_RFDESC";
+    case SHT_MIPS_DELTASYM:      return "MIPS_DELTASYM";
+    case SHT_MIPS_DELTAINST:     return "MIPS_DELTAINST";
+    case SHT_MIPS_DELTACLASS:    return "MIPS_DELTACLASS";
+    case SHT_MIPS_DWARF:         return "MIPS_DWARF";
+    case SHT_MIPS_DELTADECL:     return "MIPS_DELTADECL";
+    case SHT_MIPS_SYMBOL_LIB:    return "MIPS_SYMBOL_LIB";
+    case SHT_MIPS_EVENTS:        return "MIPS_EVENTS";
+    case SHT_MIPS_TRANSLATE:     return "MIPS_TRANSLATE";
+    case SHT_MIPS_PIXIE:         return "MIPS_PIXIE";
+    case SHT_MIPS_XLATE:         return "MIPS_XLATE";
+    case SHT_MIPS_XLATE_DEBUG:   return "MIPS_XLATE_DEBUG";
+    case SHT_MIPS_WHIRL:         return "MIPS_WHIRL";
+    case SHT_MIPS_EH_REGION:     return "MIPS_EH_REGION";
+    case SHT_MIPS_XLATE_OLD:     return "MIPS_XLATE_OLD";
+    case SHT_MIPS_PDR_EXCEPTION: return "MIPS_PDR_EXCEPTION";
     default:
       break;
     }
@@ -981,7 +1040,7 @@ get_section_type_name (sh_type)
     default:
       if ((sh_type >= SHT_LOPROC) && (sh_type <= SHT_HIPROC))
        {
-         const char *result;
+         const char * result;
 
          switch (elf_header.e_machine)
            {
@@ -994,45 +1053,47 @@ get_section_type_name (sh_type)
              break;
            }
 
-         if (result == NULL)
-           {
-             sprintf (buff, _("SHT_LOPROC+%d"), sh_type - SHT_LOPROC);
-             result = buff;
-           }
-         return result;
+         if (result != NULL)
+           return result;
+
+         sprintf (buff, "SHT_LOPROC+%x", sh_type - SHT_LOPROC);
        }
+      else if ((sh_type >= SHT_LOOS) && (sh_type <= SHT_HIOS))
+       sprintf (buff, "SHT_LOOS+%x", sh_type - SHT_LOOS);
       else if ((sh_type >= SHT_LOUSER) && (sh_type <= SHT_HIUSER))
-       sprintf (buff, _("SHT_LOUSER+%d"), sh_type - SHT_LOUSER);
+       sprintf (buff, "SHT_LOUSER+%x", sh_type - SHT_LOUSER);
       else
        sprintf (buff, _("<unknown>: %x"), sh_type);
+      
       return buff;
     }
 }
 
 struct option options [] =
 {
-  {"all", no_argument, 0, 'a'},
-  {"file-header", no_argument, 0, 'h'},
-  {"program-headers", no_argument, 0, 'l'},
-  {"headers", no_argument, 0, 'e'},
-  {"segments", no_argument, 0, 'l'},
-  {"sections", no_argument, 0, 'S'},
-  {"section-headers", no_argument, 0, 'S'},
-  {"symbols", no_argument, 0, 's'},
-  {"relocs", no_argument, 0, 'r'},
-  {"dynamic", no_argument, 0, 'd'},
-  {"version-info", no_argument, 0, 'V'},
-  {"use-dynamic", no_argument, 0, 'D'},
-
-  {"hex-dump", required_argument, 0, 'x'},
+  {"all",              no_argument, 0, 'a'},
+  {"file-header",      no_argument, 0, 'h'},
+  {"program-headers",  no_argument, 0, 'l'},
+  {"headers",          no_argument, 0, 'e'},
+  {"histogram",        no_argument, & do_histogram, 1},
+  {"segments",         no_argument, 0, 'l'},
+  {"sections",         no_argument, 0, 'S'},
+  {"section-headers",  no_argument, 0, 'S'},
+  {"symbols",          no_argument, 0, 's'},
+  {"syms",             no_argument, 0, 's'},
+  {"relocs",           no_argument, 0, 'r'},
+  {"dynamic",          no_argument, 0, 'd'},
+  {"version-info",     no_argument, 0, 'V'},
+  {"use-dynamic",      no_argument, 0, 'D'},
+  {"hex-dump",         required_argument, 0, 'x'},
+  {"debug-dump",       optional_argument, 0, 'w'},
 #ifdef SUPPORT_DISASSEMBLY
   {"instruction-dump", required_argument, 0, 'i'},
 #endif
 
-  {"version", no_argument, 0, 'v'},
-  {"help", no_argument, 0, 'H'},
-
-  {0, no_argument, 0, 0}
+  {"version",          no_argument, 0, 'v'},
+  {"help",             no_argument, 0, 'H'},
+  {0,                  no_argument, 0, 0}
 };
 
 static void
@@ -1040,24 +1101,27 @@ usage ()
 {
   fprintf (stdout, _("Usage: readelf {options} elf-file(s)\n"));
   fprintf (stdout, _("  Options are:\n"));
-  fprintf (stdout, _("  -a or --all               Equivalent to: -h -l -S -s -r -d -V\n"));
+  fprintf (stdout, _("  -a or --all               Equivalent to: -h -l -S -s -r -d -V --histogram\n"));
   fprintf (stdout, _("  -h or --file-header       Display the ELF file header\n"));
   fprintf (stdout, _("  -l or --program-headers or --segments\n"));
   fprintf (stdout, _("                            Display the program headers\n"));
   fprintf (stdout, _("  -S or --section-headers or --sections\n"));
   fprintf (stdout, _("                            Display the sections' header\n"));
   fprintf (stdout, _("  -e or --headers           Equivalent to: -h -l -S\n"));
-  fprintf (stdout, _("  -s or --symbols           Display the symbol table\n"));
+  fprintf (stdout, _("  -s or --syms or --symbols Display the symbol table\n"));
   fprintf (stdout, _("  -r or --relocs            Display the relocations (if present)\n"));
   fprintf (stdout, _("  -d or --dynamic           Display the dynamic segment (if present)\n"));
   fprintf (stdout, _("  -V or --version-info      Display the version sections (if present)\n"));
   fprintf (stdout, _("  -D or --use-dynamic       Use the dynamic section info when displaying symbols\n"));
   fprintf (stdout, _("  -x <number> or --hex-dump=<number>\n"));
   fprintf (stdout, _("                            Dump the contents of section <number>\n"));
+  fprintf (stdout, _("  -w[liapr] or --debug-dump[=line,=info,=abbrev,=pubnames,=ranges]\n"));
+  fprintf (stdout, _("                            Display the contents of DWARF2 debug sections\n"));
 #ifdef SUPPORT_DISASSEMBLY
   fprintf (stdout, _("  -i <number> or --instruction-dump=<number>\n"));
   fprintf (stdout, _("                            Disassemble the contents of section <number>\n"));
 #endif
+  fprintf (stdout, _("        --histogram         Display histogram of bucket list lengths\n"));
   fprintf (stdout, _("  -v or --version           Display the version number of readelf\n"));
   fprintf (stdout, _("  -H or --help              Display this information\n"));
   fprintf (stdout, _("Report bugs to bug-gnu-utils@gnu.org\n"));
@@ -1065,6 +1129,37 @@ usage ()
   exit (0);
 }
 
+static void
+request_dump (section, type)
+     unsigned int section;
+     char         type;
+{
+  if (section >= num_dump_sects)
+    {
+      char * new_dump_sects;
+
+      new_dump_sects = (char *) calloc (section + 1, 1);
+
+      if (new_dump_sects == NULL)
+       error (_("Out of memory allocating dump request table."));
+      else
+       {
+         /* Copy current flag settings.  */
+         memcpy (new_dump_sects, dump_sects, num_dump_sects);
+
+         free (dump_sects);
+
+         dump_sects = new_dump_sects;
+         num_dump_sects = section + 1;
+       }
+    }
+
+  if (dump_sects)
+    dump_sects [section] |= type;
+
+  return;
+}
+
 static void
 parse_args (argc, argv)
      int argc;
@@ -1076,13 +1171,16 @@ parse_args (argc, argv)
     usage ();
 
   while ((c = getopt_long
-         (argc, argv, "ersahldSDx:i:vV", options, NULL)) != EOF)
+         (argc, argv, "ersahldSDw::x:i:vV", options, NULL)) != EOF)
     {
       char *    cp;
       int      section;
 
       switch (c)
        {
+       case 0:
+         /* Long options.  */
+         break;
        case 'H':
          usage ();
          break;
@@ -1095,6 +1193,7 @@ parse_args (argc, argv)
          do_sections ++;
          do_segments ++;
          do_version ++;
+         do_histogram ++;
          break;
        case 'e':
          do_header ++;
@@ -1125,19 +1224,59 @@ parse_args (argc, argv)
        case 'x':
          do_dump ++;
          section = strtoul (optarg, & cp, 0);
-         if (! * cp && section >= 0 && section < NUM_DUMP_SECTS)
+         if (! * cp && section >= 0)
            {
-             dump_sects [section] |= HEX_DUMP;
+             request_dump (section, HEX_DUMP);
              break;
            }
          goto oops;
+       case 'w':
+         do_dump ++;
+         if (optarg == 0)
+           do_debugging = 1;
+         else
+           {
+             do_debugging = 0;
+             switch (optarg[0])
+               {
+               case 'i':
+               case 'I':
+                 do_debug_info = 1;
+                 break;
+
+               case 'a':
+               case 'A':
+                 do_debug_abbrevs = 1;
+                 break;
+
+               case 'l':
+               case 'L':
+                 do_debug_lines = 1;
+                 break;
+
+               case 'p':
+               case 'P':
+                 do_debug_pubnames = 1;
+                 break;
+
+               case 'r':
+               case 'R':
+                 do_debug_aranges = 1;
+                 break;
+
+               default:
+                 warn (_("Unrecognised debug option '%s'\n"), optarg);
+                 break;
+               }
+           }
+         break;
 #ifdef SUPPORT_DISASSEMBLY
        case 'i':
          do_dump ++;
          section = strtoul (optarg, & cp, 0);
-         if (! * cp && section >= 0 && section < NUM_DUMP_SECTS)
+         if (! * cp && section >= 0)
            {
-             dump_sects [section] |= DISASS_DUMP;
+             request_dump (section, DISASS_DUMP);
              break;
            }
          goto oops;
@@ -1159,7 +1298,8 @@ parse_args (argc, argv)
     }
 
   if (!do_dynamic && !do_syms && !do_reloc && !do_sections
-      && !do_segments && !do_header && !do_dump && !do_version)
+      && !do_segments && !do_header && !do_dump && !do_version
+      && !do_histogram && !do_debugging)
     usage ();
   else if (argc < 3)
     {
@@ -1168,6 +1308,45 @@ parse_args (argc, argv)
     }
 }
 
+static const char *
+get_elf_class (elf_class)
+     unsigned char elf_class;
+{
+  switch (elf_class)
+    {
+    case ELFCLASSNONE: return _("none");
+    case ELFCLASS32:   return _("ELF32");
+    case ELFCLASS64:   return _("ELF64");
+    default:           return _("<unknown>");
+    }
+}
+
+static const char *
+get_data_encoding (encoding)
+     unsigned char encoding;
+{
+  switch (encoding)
+    {
+    case ELFDATANONE: return _("none");
+    case ELFDATA2LSB: return _("2's compilment, little endian");
+    case ELFDATA2MSB: return _("2's compilment, big endian");
+    default:          return _("<unknown>");
+    }
+}
+
+static const char *
+get_osabi_name (osabi)
+     unsigned char osabi;
+{
+  switch (osabi)
+    {
+    case ELFOSABI_SYSV:       return _("UNIX - System V");
+    case ELFOSABI_HPUX:       return _("UNIX - HP-UX");
+    case ELFOSABI_STANDALONE: return _("Standalone App");
+    default:                  return _("<unknown>");
+    }
+}
+
 /* Decode the data held in 'elf_header'.  */
 static int
 process_file_header ()
@@ -1182,12 +1361,6 @@ process_file_header ()
       return 0;
     }
 
-  if (elf_header.e_ident [EI_CLASS] != ELFCLASS32)
-    {
-      error (_("Not a 32 bit ELF file\n"));
-      return 0;
-    }
-
   if (do_header)
     {
       int i;
@@ -1197,6 +1370,18 @@ process_file_header ()
       for (i = 0; i < EI_NIDENT; i ++)
        printf ("%2.2x ", elf_header.e_ident [i]);
       printf ("\n");
+      printf (_("  Class:                             %s\n"),
+             get_elf_class (elf_header.e_ident [EI_CLASS]));
+      printf (_("  Data:                              %s\n"),
+             get_data_encoding (elf_header.e_ident [EI_DATA]));
+      printf (_("  Version:                           %d %s\n"),
+             elf_header.e_ident [EI_VERSION],
+             elf_header.e_ident [EI_VERSION] == EV_CURRENT ? "(current)" :
+             elf_header.e_ident [EI_VERSION] != EV_NONE ? "<unknown>" : "");
+      printf (_("  OS/ABI:                            %s\n"),
+             get_osabi_name (elf_header.e_ident [EI_OSABI]));
+      printf (_("  ABI Version:                       %d\n"),
+             elf_header.e_ident [EI_ABIVERSION]);
       printf (_("  Type:                              %s\n"),
              get_file_type (elf_header.e_type));
       printf (_("  Machine:                           %s\n"),
@@ -1228,6 +1413,16 @@ process_file_header ()
              (long) elf_header.e_shstrndx);
     }
 
+  /* Test class after dumping header so that at least the header can be
+     display on 64 bit binaries.  */
+  
+  binary_class = elf_header.e_ident [EI_CLASS];
+  if (binary_class != ELFCLASS32)
+    {
+      error (_("Not a 32 bit ELF file\n"));
+      return 0;
+    }
+
   return 1;
 }
 
@@ -1290,7 +1485,7 @@ process_program_headers (file)
       printf
        (_("\nProgram Header%s:\n"), elf_header.e_phnum > 1 ? "s" : "");
       printf
-       (_("  Type        Offset  VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align\n"));
+       (_("  Type        Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align\n"));
     }
 
   loadaddr = -1;
@@ -1303,7 +1498,7 @@ process_program_headers (file)
       if (do_segments)
        {
          printf ("  %-11.11s ", get_segment_type (segment->p_type));
-         printf ("0x%5.5lx ", (unsigned long) segment->p_offset);
+         printf ("0x%6.6lx ", (unsigned long) segment->p_offset);
          printf ("0x%8.8lx ", (unsigned long) segment->p_vaddr);
          printf ("0x%8.8lx ", (unsigned long) segment->p_paddr);
          printf ("0x%5.5lx ", (unsigned long) segment->p_filesz);
@@ -1499,8 +1694,8 @@ process_section_headers (file)
     }
 
   if (do_sections && !do_header)
-    printf (_("There are %d section headers, starting at offset %x:\n"),
-           elf_header.e_shnum, elf_header.e_shoff);
+    printf (_("There are %d section headers, starting at offset %lx:\n"),
+           elf_header.e_shnum, (unsigned long) elf_header.e_shoff);
 
   if (! get_section_headers (file))
     return 0;
@@ -1519,13 +1714,16 @@ process_section_headers (file)
     }
 
   /* Scan the sections for the dynamic symbol table
-     and dynamic string table */
+     and dynamic string table and debug sections. */
   dynamic_symbols = NULL;
   dynamic_strings = NULL;
+  dynamic_syminfo = NULL;
   for (i = 0, section = section_headers;
        i < elf_header.e_shnum;
        i ++, section ++)
     {
+      char * name = SECTION_NAME (section);
+
       if (section->sh_type == SHT_DYNSYM)
        {
          if (dynamic_symbols != NULL)
@@ -1535,10 +1733,11 @@ process_section_headers (file)
            }
 
          dynamic_symbols = get_elf_symbols
-           (file, section->sh_offset, section->sh_size / section->sh_entsize);
+           (file, section->sh_offset,
+            section->sh_size / section->sh_entsize);
        }
       else if (section->sh_type == SHT_STRTAB
-              && strcmp (SECTION_NAME (section), ".dynstr") == 0)
+              && strcmp (name, ".dynstr") == 0)
        {
          if (dynamic_strings != NULL)
            {
@@ -1549,6 +1748,21 @@ process_section_headers (file)
          GET_DATA_ALLOC (section->sh_offset, section->sh_size,
                          dynamic_strings, char *, "dynamic strings");
        }
+      else if ((do_debugging || do_debug_info || do_debug_abbrevs
+               || do_debug_lines || do_debug_pubnames || do_debug_aranges)
+              && strncmp (name, ".debug_", 7) == 0)
+       {
+         name += 7;
+
+         if (do_debugging
+             || (do_debug_info     && (strcmp (name, "info") == 0))
+             || (do_debug_abbrevs  && (strcmp (name, "abbrev") == 0))
+             || (do_debug_lines    && (strcmp (name, "line") == 0))
+             || (do_debug_pubnames && (strcmp (name, "pubnames") == 0))
+             || (do_debug_aranges  && (strcmp (name, "aranges") == 0))
+             )
+           request_dump (i, DEBUG_DUMP);
+       }
     }
 
   if (! do_sections)
@@ -1573,7 +1787,7 @@ process_section_headers (file)
               (unsigned long) section->sh_size,
               (unsigned long) section->sh_entsize);
 
-      printf (" %c%c%c %2ld %3lx %ld \n",
+      printf (" %c%c%c %2ld %3lx %ld\n",
              (section->sh_flags & SHF_WRITE ? 'W' : ' '),
              (section->sh_flags & SHF_ALLOC ? 'A' : ' '),
              (section->sh_flags & SHF_EXECINSTR ? 'X' : ' '),
@@ -1602,26 +1816,26 @@ process_relocs (file)
       rel_size   = 0;
       rel_offset = 0;
 
-      if (dynamic_info [DT_REL])
+      if (dynamic_info[DT_REL])
        {
-         rel_offset = dynamic_info [DT_REL];
-         rel_size   = dynamic_info [DT_RELSZ];
+         rel_offset = dynamic_info[DT_REL];
+         rel_size   = dynamic_info[DT_RELSZ];
        }
       else if (dynamic_info [DT_RELA])
        {
-         rel_offset = dynamic_info [DT_RELA];
-         rel_size   = dynamic_info [DT_RELASZ];
+         rel_offset = dynamic_info[DT_RELA];
+         rel_size   = dynamic_info[DT_RELASZ];
        }
-      else if (dynamic_info [DT_JMPREL])
+      else if (dynamic_info[DT_JMPREL])
        {
-         rel_offset = dynamic_info [DT_JMPREL];
-         rel_size   = dynamic_info [DT_PLTRELSZ];
+         rel_offset = dynamic_info[DT_JMPREL];
+         rel_size   = dynamic_info[DT_PLTRELSZ];
        }
 
       if (rel_size)
        {
          printf
-           (_("\nRelocation section at offset 0x%x contains %d bytes:\n"),
+           (_("\nRelocation section at offset 0x%lx contains %ld bytes:\n"),
             rel_offset, rel_size);
 
          dump_relocations (file, rel_offset - loadaddr, rel_size,
@@ -1661,8 +1875,8 @@ process_relocs (file)
              else
                printf ("'%s'", SECTION_NAME (section));
 
-             printf (_(" at offset 0x%x contains %d entries:\n"),
-                rel_offset, rel_size / section->sh_entsize);
+             printf (_(" at offset 0x%lx contains %lu entries:\n"),
+                rel_offset, (unsigned long) (rel_size / section->sh_entsize));
 
              symsec = section_headers + section->sh_link;
 
@@ -1696,10 +1910,53 @@ process_relocs (file)
 
 static void
 dynamic_segment_mips_val (entry)
-     Elf_Internal_Dyn *entry;
+     Elf_Internal_Dyn * entry;
 {
   switch (entry->d_tag)
     {
+    case DT_MIPS_FLAGS:
+      if (entry->d_un.d_val == 0)
+       printf ("NONE\n");
+      else
+       {
+         static const char * opts[] =
+         {
+           "QUICKSTART", "NOTPOT", "NO_LIBRARY_REPLACEMENT",
+           "NO_MOVE", "SGI_ONLY", "GUARANTEE_INIT", "DELTA_C_PLUS_PLUS",
+           "GUARANTEE_START_INIT", "PIXIE", "DEFAULT_DELAY_LOAD",
+           "REQUICKSTART", "REQUICKSTARTED", "CORD", "NO_UNRES_UNDEF",
+           "RLD_ORDER_SAFE"
+         };
+         unsigned int cnt;
+         int first = 1;
+         for (cnt = 0; cnt < NUM_ELEM (opts); ++ cnt)
+           if (entry->d_un.d_val & (1 << cnt))
+             {
+               printf ("%s%s", first ? "" : " ", opts[cnt]);
+               first = 0;
+             }
+         puts ("");
+       }
+      break;
+      
+    case DT_MIPS_IVERSION:
+      if (dynamic_strings != NULL)
+       printf ("Interface Version: %s\n",
+               dynamic_strings + entry->d_un.d_val);
+      else
+       printf ("%ld\n", (long) entry->d_un.d_ptr);
+      break;
+      
+    case DT_MIPS_TIME_STAMP:
+      {
+       char timebuf[20];
+       time_t time = entry->d_un.d_val;
+       strftime (timebuf, 20, "%Y-%m-%dT%H:%M:%S", gmtime (&time));
+       printf ("Time Stamp: %s\n", timebuf);
+      }
+      break;
+      
+    case DT_MIPS_RLD_VERSION:
     case DT_MIPS_LOCAL_GOTNO:
     case DT_MIPS_CONFLICTNO:
     case DT_MIPS_LIBLISTNO:
@@ -1711,12 +1968,12 @@ dynamic_segment_mips_val (entry)
     case DT_MIPS_DELTA_RELOC_NO:
     case DT_MIPS_DELTA_SYM_NO:
     case DT_MIPS_DELTA_CLASSSYM_NO:
-      if (do_dynamic)
-       printf ("%#ld\n", (long) entry->d_un.d_ptr);
+    case DT_MIPS_COMPACT_SIZE:
+      printf ("%ld\n", (long) entry->d_un.d_ptr);
       break;
+      
     default:
-      if (do_dynamic)
-       printf ("%#lx\n", (long) entry->d_un.d_ptr);
+      printf ("%#lx\n", (long) entry->d_un.d_ptr);
     }
 }
 
@@ -1739,7 +1996,7 @@ process_dynamic_segment (file)
 
   GET_DATA_ALLOC (dynamic_addr, dynamic_size,
                  edyn, Elf32_External_Dyn *, "dynamic segment");
-
+  
   /* SGI's ELF has more than one section in the DYNAMIC segment.  Determine
      how large .dynamic is now.  We can do this even before the byte
      swapping since the DT_NULL tag is recognizable.  */
@@ -1780,7 +2037,7 @@ process_dynamic_segment (file)
          if (entry->d_tag != DT_SYMTAB)
            continue;
 
-         dynamic_info [DT_SYMTAB] = entry->d_un.d_val;
+         dynamic_info[DT_SYMTAB] = entry->d_un.d_val;
 
          /* Since we do not know how big the symbol table is,
             we default to reading in the entire file (!) and
@@ -1817,7 +2074,7 @@ process_dynamic_segment (file)
          if (entry->d_tag != DT_STRTAB)
            continue;
 
-         dynamic_info [DT_STRTAB] = entry->d_un.d_val;
+         dynamic_info[DT_STRTAB] = entry->d_un.d_val;
 
          /* Since we do not know how big the string table is,
             we default to reading in the entire file (!) and
@@ -1843,6 +2100,55 @@ process_dynamic_segment (file)
        }
     }
 
+  /* And find the syminfo section if available.  */
+  if (dynamic_syminfo == NULL)
+    {
+      unsigned int syminsz = 0;
+
+      for (i = 0, entry = dynamic_segment;
+          i < dynamic_size;
+          ++i, ++ entry)
+       {
+         if (entry->d_tag == DT_SYMINENT)
+           {
+             /* Note: these braces are necessary to avoid a syntax
+                error from the SunOS4 C compiler.  */
+             assert (sizeof (Elf_External_Syminfo) == entry->d_un.d_val);
+           }
+         else if (entry->d_tag == DT_SYMINSZ)
+           syminsz = entry->d_un.d_val;
+         else if (entry->d_tag == DT_SYMINFO)
+           dynamic_syminfo_offset = entry->d_un.d_val - loadaddr;
+       }
+
+      if (dynamic_syminfo_offset != 0 && syminsz != 0)
+       {
+         Elf_External_Syminfo *extsyminfo;
+         Elf_Internal_Syminfo *syminfo;
+
+         /* There is a syminfo section.  Read the data.  */
+         GET_DATA_ALLOC (dynamic_syminfo_offset, syminsz, extsyminfo,
+                         Elf_External_Syminfo *, "symbol information");
+
+         dynamic_syminfo = (Elf_Internal_Syminfo *) malloc (syminsz);
+         if (dynamic_syminfo == NULL)
+           {
+             error (_("Out of memory\n"));
+             return 0;
+           }
+
+         dynamic_syminfo_nent = syminsz / sizeof (Elf_External_Syminfo);
+         for (i = 0, syminfo = dynamic_syminfo; i < dynamic_syminfo_nent;
+              ++i, ++syminfo)
+           {
+             syminfo->si_boundto = BYTE_GET (extsyminfo[i].si_boundto);
+             syminfo->si_flags = BYTE_GET (extsyminfo[i].si_flags);
+           }
+
+         free (extsyminfo);
+       }
+    }
+
   if (do_dynamic && dynamic_addr)
     printf (_("\nDynamic segment at offset 0x%x contains %d entries:\n"),
            dynamic_addr, dynamic_size);
@@ -1878,31 +2184,146 @@ process_dynamic_segment (file)
            }
          break;
 
+       case DT_FEATURE_1:
+         if (do_dynamic)
+           {
+             printf (_("Flags:"));
+             if (entry->d_un.d_val == 0)
+               printf (_(" None\n"));
+             else
+               {
+                 unsigned long int val = entry->d_un.d_val;
+                 if (val & DTF_1_PARINIT)
+                   {
+                     printf (" PARINIT");
+                     val ^= DTF_1_PARINIT;
+                   }
+                 if (val != 0)
+                   printf (" %lx", val);
+                 puts ("");
+               }
+           }
+         break;
+
+       case DT_POSFLAG_1:
+         if (do_dynamic)
+           {
+             printf (_("Flags:"));
+             if (entry->d_un.d_val == 0)
+               printf (_(" None\n"));
+             else
+               {
+                 unsigned long int val = entry->d_un.d_val;
+                 if (val & DF_P1_LAZYLOAD)
+                   {
+                     printf (" LAZYLOAD");
+                     val ^= DF_P1_LAZYLOAD;
+                   }
+                 if (val & DF_P1_GROUPPERM)
+                   {
+                     printf (" GROUPPERM");
+                     val ^= DF_P1_GROUPPERM;
+                   }
+                 if (val != 0)
+                   printf (" %lx", val);
+                 puts ("");
+               }
+           }
+         break;
+
+       case DT_FLAGS_1:
+         if (do_dynamic)
+           {
+             printf (_("Flags:"));
+             if (entry->d_un.d_val == 0)
+               printf (_(" None\n"));
+             else
+               {
+                 unsigned long int val = entry->d_un.d_val;
+                 if (val & DF_1_NOW)
+                   {
+                     printf (" NOW");
+                     val ^= DF_1_NOW;
+                   }
+                 if (val & DF_1_GLOBAL)
+                   {
+                     printf (" GLOBAL");
+                     val ^= DF_1_GLOBAL;
+                   }
+                 if (val & DF_1_GROUP)
+                   {
+                     printf (" GROUP");
+                     val ^= DF_1_GROUP;
+                   }
+                 if (val & DF_1_NODELETE)
+                   {
+                     printf (" NODELETE");
+                     val ^= DF_1_NODELETE;
+                   }
+                 if (val & DF_1_LOADFLTR)
+                   {
+                     printf (" LOADFLTR");
+                     val ^= DF_1_LOADFLTR;
+                   }
+                 if (val & DF_1_INITFIRST)
+                   {
+                     printf (" INITFIRST");
+                     val ^= DF_1_INITFIRST;
+                   }
+                 if (val & DF_1_NOOPEN)
+                   {
+                     printf (" NOOPEN");
+                     val ^= DF_1_NOOPEN;
+                   }
+                 if (val & DF_1_ORIGIN)
+                   {
+                     printf (" ORIGIN");
+                     val ^= DF_1_ORIGIN;
+                   }
+                 if (val & DF_1_DIRECT)
+                   {
+                     printf (" DIRECT");
+                     val ^= DF_1_DIRECT;
+                   }
+                 if (val & DF_1_TRANS)
+                   {
+                     printf (" TRANS");
+                     val ^= DF_1_TRANS;
+                   }
+                 if (val & DF_1_INTERPOSE)
+                   {
+                     printf (" INTERPOSE");
+                     val ^= DF_1_INTERPOSE;
+                   }
+                 if (val != 0)
+                   printf (" %lx", val);
+                 puts ("");
+               }
+           }
+         break;
+
+       case DT_PLTREL:
+         if (do_dynamic)
+           puts (get_dynamic_type (entry->d_un.d_val));
+         break;
+
        case DT_NULL    :
        case DT_NEEDED  :
-       case DT_PLTRELSZ:
        case DT_PLTGOT  :
        case DT_HASH    :
        case DT_STRTAB  :
        case DT_SYMTAB  :
        case DT_RELA    :
-       case DT_RELASZ  :
-       case DT_RELAENT :
-       case DT_STRSZ   :
-       case DT_SYMENT  :
        case DT_INIT    :
        case DT_FINI    :
        case DT_SONAME  :
        case DT_RPATH   :
        case DT_SYMBOLIC:
        case DT_REL     :
-       case DT_RELSZ   :
-       case DT_RELENT  :
-       case DT_PLTREL  :
        case DT_DEBUG   :
        case DT_TEXTREL :
        case DT_JMPREL  :
-         dynamic_info [entry->d_tag] = entry->d_un.d_val;
+         dynamic_info[entry->d_tag] = entry->d_un.d_val;
 
          if (do_dynamic)
            {
@@ -1943,26 +2364,76 @@ process_dynamic_segment (file)
            }
          break;
 
-       default:
-         if ((entry->d_tag >= DT_VERSYM) && (entry->d_tag <= DT_VERNEEDNUM))
+       case DT_PLTRELSZ:
+       case DT_RELASZ  :
+       case DT_STRSZ   :
+       case DT_RELSZ   :
+       case DT_RELAENT :
+       case DT_SYMENT  :
+       case DT_RELENT  :
+       case DT_PLTPADSZ:
+       case DT_MOVEENT :
+       case DT_MOVESZ  :
+       case DT_INIT_ARRAYSZ:
+       case DT_FINI_ARRAYSZ:
+         if (do_dynamic)
+           printf ("%lu (bytes)\n", (unsigned long) entry->d_un.d_val);
+         break;
+
+       case DT_VERDEFNUM:
+       case DT_VERNEEDNUM:
+       case DT_RELACOUNT:
+       case DT_RELCOUNT:
+         if (do_dynamic)
+           printf ("%lu\n", (unsigned long) entry->d_un.d_val);
+         break;
+
+       case DT_SYMINSZ:
+       case DT_SYMINENT:
+       case DT_SYMINFO:
+       case DT_USED:
+       case DT_INIT_ARRAY:
+       case DT_FINI_ARRAY:
+         if (do_dynamic)
            {
-             version_info [DT_VERSIONTAGIDX (entry->d_tag)] =
-               entry->d_un.d_val;
+             if (dynamic_strings != NULL && entry->d_tag == DT_USED)
+               {
+                 char * name;
 
-             if (do_dynamic)
-               printf ("%#lx\n", (long) entry->d_un.d_ptr);
+                 name = dynamic_strings + entry->d_un.d_val;
+
+                 if (* name)
+                   {
+                     printf (_("Not needed object: [%s]\n"), name);
+                     break;
+                   }
+               }
+             
+             printf ("%#lx\n", (long) entry->d_un.d_val);
            }
-         else
-           switch (elf_header.e_machine)
-             {
-             case EM_MIPS:
-             case EM_MIPS_RS4_BE:
-               dynamic_segment_mips_val (entry);
-               break;
-             default:
-               if (do_dynamic)
+         break;
+
+       case DT_BIND_NOW:
+         /* The value of this entry is ignored.  */
+         break;
+         
+       default:
+         if ((entry->d_tag >= DT_VERSYM) && (entry->d_tag <= DT_VERNEEDNUM))
+           version_info [DT_VERSIONTAGIDX (entry->d_tag)] =
+             entry->d_un.d_val;
+
+         if (do_dynamic)
+           {
+             switch (elf_header.e_machine)
+               {
+               case EM_MIPS:
+               case EM_MIPS_RS4_BE:
+                 dynamic_segment_mips_val (entry);
+                 break;
+               default:
                  printf ("%#lx\n", (long) entry->d_un.d_ptr);
-             }
+               }
+           }
          break;
        }
     }
@@ -2025,11 +2496,13 @@ process_version_sections (file)
            found = 1;
 
            printf
-             (_("\nVersion definition section '%s' contains %d entries:\n"),
+             (_("\nVersion definition section '%s' contains %ld entries:\n"),
               SECTION_NAME (section), section->sh_info);
 
-           printf (_("  Addr: %#08x  Offset: %#08x  Link: %x (%s)\n"),
-                   section->sh_addr, section->sh_offset, section->sh_link,
+           printf (_("  Addr: 0x"));
+           printf_vma (section->sh_addr);
+           printf (_("  Offset: %#08lx  Link: %lx (%s)\n"),
+                   section->sh_offset, section->sh_link,
                    SECTION_NAME (section_headers + section->sh_link));
 
            GET_DATA_ALLOC (section->sh_offset, section->sh_size,
@@ -2045,7 +2518,7 @@ process_version_sections (file)
                Elf_Internal_Verdaux   aux;
                int                    j;
                int                    isum;
-
+               
                vstart = ((char *) edefs) + idx;
 
                edef = (Elf_External_Verdef *) vstart;
@@ -2061,7 +2534,8 @@ process_version_sections (file)
                printf (_("  %#06x: Rev: %d  Flags: %s"),
                        idx, ent.vd_version, get_ver_flags (ent.vd_flags));
 
-               printf (_("  Index: %ld  Cnt: %ld  "), ent.vd_ndx, ent.vd_cnt);
+               printf (_("  Index: %d  Cnt: %d  "),
+                       ent.vd_ndx, ent.vd_cnt);
 
                vstart += ent.vd_aux;
 
@@ -2100,8 +2574,8 @@ process_version_sections (file)
 
            free (edefs);
          }
-       break;
-
+         break;
+         
        case SHT_GNU_verneed:
          {
            Elf_External_Verneed *  eneed;
@@ -2110,13 +2584,14 @@ process_version_sections (file)
 
            found = 1;
 
-           printf (_("\nVersion needs section '%s' contains %d entries:\n"),
+           printf (_("\nVersion needs section '%s' contains %ld entries:\n"),
                    SECTION_NAME (section), section->sh_info);
 
-           printf
-             (_(" Addr: %#08x  Offset: %#08x  Link to section: %d (%s)\n"),
-              section->sh_addr, section->sh_offset, section->sh_link,
-              SECTION_NAME (section_headers + section->sh_link));
+           printf (_(" Addr: 0x"));
+           printf_vma (section->sh_addr);
+           printf (_("  Offset: %#08lx  Link to section: %ld (%s)\n"),
+                   section->sh_offset, section->sh_link,
+                   SECTION_NAME (section_headers + section->sh_link));
 
            GET_DATA_ALLOC (section->sh_offset, section->sh_size,
                            eneed, Elf_External_Verneed *,
@@ -2180,10 +2655,10 @@ process_version_sections (file)
 
                idx += ent.vn_next;
              }
-
+           
            free (eneed);
          }
-       break;
+         break;
 
        case SHT_GNU_versym:
          {
@@ -2213,19 +2688,22 @@ process_version_sections (file)
            printf (_("\nVersion symbols section '%s' contains %d entries:\n"),
                    SECTION_NAME (section), total);
 
-           printf (_(" Addr: %#08x  Offset: %#08x  Link: %x (%s)\n"),
-                   section->sh_addr, section->sh_offset, section->sh_link,
+           printf (_(" Addr: "));
+           printf_vma (section->sh_addr);
+           printf (_("  Offset: %#08lx  Link: %lx (%s)\n"),
+                   section->sh_offset, section->sh_link,
                    SECTION_NAME (link_section));
 
            GET_DATA_ALLOC (version_info [DT_VERSIONTAGIDX (DT_VERSYM)]
                            - loadaddr,
                            total * sizeof (short), edata,
-                           char *, "version symbol data");
+                           unsigned char *, "version symbol data");
 
            data = (unsigned short *) malloc (total * sizeof (short));
 
            for (cnt = total; cnt --;)
-             data [cnt] = byte_get (edata + cnt * sizeof (short), sizeof (short));
+             data [cnt] = byte_get (edata + cnt * sizeof (short),
+                                    sizeof (short));
 
            free (edata);
 
@@ -2458,10 +2936,10 @@ process_version_sections (file)
            free (strtab);
            free (symbols);
          }
-       break;
-
+         break;
+       
        default:
-       break;
+         break;
        }
     }
 
@@ -2485,6 +2963,8 @@ get_symbol_binding (binding)
     default:
       if (binding >= STB_LOPROC && binding <= STB_HIPROC)
        sprintf (buff, _("<processor specific>: %d"), binding);
+      else if (binding >= STB_LOOS && binding <= STB_HIOS)
+       sprintf (buff, _("<OS specific>: %d"), binding);
       else
        sprintf (buff, _("<unknown>: %d"), binding);
       return buff;
@@ -2507,6 +2987,8 @@ get_symbol_type (type)
     default:
       if (type >= STT_LOPROC && type <= STT_HIPROC)
        sprintf (buff, _("<processor specific>: %d"), type);
+      else if (type >= STT_LOOS && type <= STT_HIOS)
+       sprintf (buff, _("<OS specific>: %d"), type);
       else
        sprintf (buff, _("<unknown>: %d"), type);
       return buff;
@@ -2527,6 +3009,8 @@ get_symbol_index_type (type)
        return "PRC";
       else if (type >= SHN_LORESERVE && type <= SHN_HIRESERVE)
        return "RSV";
+      else if (type >= SHN_LOOS && type <= SHN_HIOS)
+       return "OS ";
       else
        {
          static char buff [32];
@@ -2583,34 +3067,32 @@ process_symbol_table (file)
      FILE * file;
 {
   Elf32_Internal_Shdr *   section;
-
-  if (! do_syms)
+  char   nb [4];
+  char   nc [4];
+  int    nbuckets;
+  int    nchains;
+  int *  buckets = NULL;
+  int *  chains = NULL;
+
+  if (! do_syms && !do_histogram)
     return 1;
 
-  if (dynamic_info [DT_HASH] && do_using_dynamic && dynamic_strings != NULL)
+  if (dynamic_info[DT_HASH] && ((do_using_dynamic && dynamic_strings != NULL)
+                               || do_histogram))
     {
-      char   nb [4];
-      char   nc [4];
-      int    nbuckets;
-      int    nchains;
-      int *  buckets;
-      int *  chains;
-      int    hn;
-      int    si;
-
-      if (fseek (file, dynamic_info [DT_HASH] - loadaddr, SEEK_SET))
+      if (fseek (file, dynamic_info[DT_HASH] - loadaddr, SEEK_SET))
        {
          error (_("Unable to seek to start of dynamic information"));
          return 0;
        }
 
-      if (fread (nb, sizeof (nb), 1, file) != 1)
+      if (fread (nb, sizeof (nb), 1, file) != 1)
        {
          error (_("Failed to read in number of buckets\n"));
          return 0;
        }
 
-      if (fread (nc, sizeof (nc), 1, file) != 1)
+      if (fread (nc, sizeof (nc), 1, file) != 1)
        {
          error (_("Failed to read in number of chains\n"));
          return 0;
@@ -2624,6 +3106,13 @@ process_symbol_table (file)
 
       if (buckets == NULL || chains == NULL)
        return 0;
+    }
+
+  if (do_syms
+      && dynamic_info[DT_HASH] && do_using_dynamic && dynamic_strings != NULL)
+    {
+      int    hn;
+      int    si;
 
       printf (_("\nSymbol table for image:\n"));
       printf (_("  Num Buc:    Value  Size   Type   Bind Ot Ndx Name\n"));
@@ -2652,11 +3141,8 @@ process_symbol_table (file)
              printf (" %s\n", dynamic_strings + psym->st_name);
            }
        }
-
-      free (buckets);
-      free (chains);
     }
-  else if (!do_using_dynamic)
+  else if (do_syms && !do_using_dynamic)
     {
       unsigned int     i;
 
@@ -2674,9 +3160,9 @@ process_symbol_table (file)
              && section->sh_type != SHT_DYNSYM)
            continue;
 
-         printf (_("\nSymbol table '%s' contains %d entries:\n"),
+         printf (_("\nSymbol table '%s' contains %lu entries:\n"),
                  SECTION_NAME (section),
-                 section->sh_size / section->sh_entsize);
+                 (unsigned long) (section->sh_size / section->sh_entsize));
          fputs (_("  Num:    Value  Size Type    Bind   Ot  Ndx Name\n"),
                 stdout);
 
@@ -2732,236 +3218,1899 @@ process_symbol_table (file)
                  offset = version_info [DT_VERSIONTAGIDX (DT_VERSYM)]
                    - loadaddr;
 
-                 GET_DATA (offset + si * sizeof (vers_data), data,
-                           "version data");
+                 GET_DATA (offset + si * sizeof (vers_data), data,
+                           "version data");
+
+                 vers_data = byte_get (data, 2);
+
+                 is_nobits = psym->st_shndx < SHN_LORESERVE ?
+                   (section_headers [psym->st_shndx].sh_type == SHT_NOBITS)
+                   : 0;
+
+                 check_def = (psym->st_shndx != SHN_UNDEF);
+
+                 if ((vers_data & 0x8000) || vers_data > 1)
+                   {
+                     if (is_nobits || ! check_def)
+                       {
+                         Elf_External_Verneed  evn;
+                         Elf_Internal_Verneed  ivn;
+                         Elf_Internal_Vernaux  ivna;
+
+                         /* We must test both.  */
+                         offset = version_info
+                           [DT_VERSIONTAGIDX (DT_VERNEED)] - loadaddr;
+
+                         GET_DATA (offset, evn, "version need");
+
+                         ivn.vn_aux  = BYTE_GET (evn.vn_aux);
+                         ivn.vn_next = BYTE_GET (evn.vn_next);
+
+                         do
+                           {
+                             unsigned long  vna_off;
+
+                             vna_off = offset + ivn.vn_aux;
+
+                             do
+                               {
+                                 Elf_External_Vernaux  evna;
+
+                                 GET_DATA (vna_off, evna,
+                                           "version need aux (3)");
+
+                                 ivna.vna_other = BYTE_GET (evna.vna_other);
+                                 ivna.vna_next  = BYTE_GET (evna.vna_next);
+                                 ivna.vna_name  = BYTE_GET (evna.vna_name);
+
+                                 vna_off += ivna.vna_next;
+                               }
+                             while (ivna.vna_other != vers_data
+                                    && ivna.vna_next != 0);
+
+                             if (ivna.vna_other == vers_data)
+                               break;
+
+                             offset += ivn.vn_next;
+                           }
+                         while (ivn.vn_next != 0);
+
+                         if (ivna.vna_other == vers_data)
+                           {
+                             printf ("@%s (%d)",
+                                     strtab + ivna.vna_name, ivna.vna_other);
+                             check_def = 0;
+                           }
+                         else if (! is_nobits)
+                           error (_("bad dynamic symbol"));
+                         else
+                           check_def = 1;
+                       }
+
+                     if (check_def)
+                       {
+                         if (vers_data != 0x8001)
+                           {
+                             Elf_Internal_Verdef     ivd;
+                             Elf_Internal_Verdaux    ivda;
+                             Elf_External_Verdaux  evda;
+                             unsigned long           offset;
+
+                             offset =
+                               version_info [DT_VERSIONTAGIDX (DT_VERDEF)]
+                               - loadaddr;
+
+                             do
+                               {
+                                 Elf_External_Verdef   evd;
+
+                                 GET_DATA (offset, evd, "version def");
+
+                                 ivd.vd_ndx  = BYTE_GET (evd.vd_ndx);
+                                 ivd.vd_aux  = BYTE_GET (evd.vd_aux);
+                                 ivd.vd_next = BYTE_GET (evd.vd_next);
+
+                                 offset += ivd.vd_next;
+                               }
+                             while (ivd.vd_ndx != (vers_data & 0x7fff)
+                                    && ivd.vd_next != 0);
+
+                             offset -= ivd.vd_next;
+                             offset += ivd.vd_aux;
+
+                             GET_DATA (offset, evda, "version def aux");
+
+                             ivda.vda_name = BYTE_GET (evda.vda_name);
+
+                             if (psym->st_name != ivda.vda_name)
+                               printf ((vers_data & 0x8000)
+                                       ? "@%s" : "@@%s",
+                                       strtab + ivda.vda_name);
+                           }
+                       }
+                   }
+               }
+
+             putchar ('\n');
+           }
+
+         free (symtab);
+         if (strtab != string_table)
+           free (strtab);
+       }
+    }
+  else if (do_syms)
+    printf
+      (_("\nDynamic symbol information is not available for displaying symbols.\n"));
+
+  if (do_histogram && buckets != NULL)
+    {
+      int *lengths;
+      int *counts;
+      int hn;
+      int si;
+      int maxlength = 0;
+      int nzero_counts = 0;
+      int nsyms = 0;
+
+      printf (_("\nHistogram for bucket list length (total of %d buckets):\n"),
+             nbuckets);
+      printf (_(" Length  Number     %% of total  Coverage\n"));
+
+      lengths = (int *) calloc (nbuckets, sizeof (int));
+      if (lengths == NULL)
+       {
+         error (_("Out of memory"));
+         return 0;
+       }
+      for (hn = 0; hn < nbuckets; ++hn)
+       {
+         if (! buckets [hn])
+           continue;
+
+         for (si = buckets[hn]; si; si = chains[si])
+           {
+             ++nsyms;
+             if (maxlength < ++lengths[hn])
+               ++maxlength;
+           }
+       }
+
+      counts = (int *) calloc (maxlength + 1, sizeof (int));
+      if (counts == NULL)
+       {
+         error (_("Out of memory"));
+         return 0;
+       }
+
+      for (hn = 0; hn < nbuckets; ++hn)
+       ++ counts [lengths [hn]];
+
+      printf ("      0  %-10d (%5.1f%%)\n",
+             counts[0], (counts[0] * 100.0) / nbuckets);
+      for (si = 1; si <= maxlength; ++si)
+       {
+         nzero_counts += counts[si] * si;
+         printf ("%7d  %-10d (%5.1f%%)    %5.1f%%\n",
+                 si, counts[si], (counts[si] * 100.0) / nbuckets,
+                 (nzero_counts * 100.0) / nsyms);
+       }
+
+      free (counts);
+      free (lengths);
+    }
+
+  if (buckets != NULL)
+    {
+      free (buckets);
+      free (chains);
+    }
+
+  return 1;
+}
+
+static int
+process_syminfo (file)
+     FILE * file;
+{
+  int i;
+
+  if (dynamic_syminfo == NULL
+      || !do_dynamic)
+    /* No syminfo, this is ok.  */
+    return 1;
+
+  /* There better should be a dynamic symbol section.  */
+  if (dynamic_symbols == NULL || dynamic_strings == NULL)
+    return 0;
+
+  if (dynamic_addr)
+    printf (_("\nDynamic info segment at offset 0x%lx contains %d entries:\n"),
+           dynamic_syminfo_offset, dynamic_syminfo_nent);
+
+  printf (_(" Num: Name                           BoundTo     Flags\n"));
+  for (i = 0; i < dynamic_syminfo_nent; ++i)
+    {
+      unsigned short int flags = dynamic_syminfo[i].si_flags;
+
+      printf ("%4d: %-30s ", i,
+             dynamic_strings + dynamic_symbols[i].st_name);
+
+      switch (dynamic_syminfo[i].si_boundto)
+       {
+       case SYMINFO_BT_SELF:
+         fputs ("SELF       ", stdout);
+         break;
+       case SYMINFO_BT_PARENT:
+         fputs ("PARENT     ", stdout);
+         break;
+       default:
+         if (dynamic_syminfo[i].si_boundto > 0
+             && dynamic_syminfo[i].si_boundto < dynamic_size)
+           printf ("%-10s ",
+                   dynamic_strings
+                   + dynamic_segment[dynamic_syminfo[i].si_boundto].d_un.d_val);
+         else
+           printf ("%-10d ", dynamic_syminfo[i].si_boundto);
+         break;
+       }
+
+      if (flags & SYMINFO_FLG_DIRECT)
+       printf (" DIRECT");
+      if (flags & SYMINFO_FLG_PASSTHRU)
+       printf (" PASSTHRU");
+      if (flags & SYMINFO_FLG_COPY)
+       printf (" COPY");
+      if (flags & SYMINFO_FLG_LAZYLOAD)
+       printf (" LAZYLOAD");
+
+      puts ("");
+    }
+
+  return 1;
+}
+
+#ifdef SUPPORT_DISASSEMBLY
+static void
+disassemble_section (section, file)
+     Elf32_Internal_Shdr * section;
+     FILE * file;
+{
+  printf (_("\nAssembly dump of section %s\n"),
+         SECTION_NAME (section));
+
+  /* XXX -- to be done --- XXX */
+
+  return 1;
+}
+#endif
+
+static int
+dump_section (section, file)
+     Elf32_Internal_Shdr * section;
+     FILE * file;
+{
+  int             bytes;
+  int             addr;
+  unsigned char * data;
+  unsigned char * start;
+
+  bytes = section->sh_size;
+
+  if (bytes == 0)
+    {
+      printf (_("\nSection '%s' has no data to dump.\n"),
+             SECTION_NAME (section));
+      return 0;
+    }
+  else
+    printf (_("\nHex dump of section '%s':\n"), SECTION_NAME (section));
+
+  addr = section->sh_addr;
+
+  GET_DATA_ALLOC (section->sh_offset, bytes, start, unsigned char *,
+                 "section data");
+
+  data = start;
+
+  while (bytes)
+    {
+      int j;
+      int k;
+      int lbytes;
+
+      lbytes = (bytes > 16 ? 16 : bytes);
+
+      printf ("  0x%8.8x ", addr);
+
+      switch (elf_header.e_ident [EI_DATA])
+       {
+       case ELFDATA2LSB:
+         for (j = 15; j >= 0; j --)
+           {
+             if (j < lbytes)
+               printf ("%2.2x", data [j]);
+             else
+               printf ("  ");
+
+             if (!(j & 0x3))
+               printf (" ");
+           }
+         break;
+
+       case ELFDATA2MSB:
+         for (j = 0; j < 16; j++)
+           {
+             if (j < lbytes)
+               printf ("%2.2x", data [j]);
+             else
+               printf ("  ");
+
+             if ((j & 3) == 3)
+               printf (" ");
+           }
+         break;
+       }
+
+      for (j = 0; j < lbytes; j++)
+       {
+         k = data [j];
+         if (k >= ' ' && k < 0x80)
+           printf ("%c", k);
+         else
+           printf (".");
+       }
+
+      putchar ('\n');
+
+      data  += lbytes;
+      addr  += lbytes;
+      bytes -= lbytes;
+    }
+
+  free (start);
+
+  return 1;
+}
+
+
+static unsigned long int
+read_leb128 (data, length_return, sign)
+     unsigned char * data;
+     int *           length_return;
+     int             sign;
+{
+  unsigned long int result = 0;
+  unsigned int      num_read = 0;
+  int               shift = 0;
+  unsigned char     byte;
+
+  do
+    {
+      byte = * data ++;
+      num_read ++;
+
+      result |= (byte & 0x7f) << shift;
+
+      shift += 7;
+
+    }
+  while (byte & 0x80);
+
+  if (length_return != NULL)
+    * length_return = num_read;
+
+  if (sign && (shift < 32) && (byte & 0x40))
+    result |= -1 << shift;
+
+  return result;
+}
+
+typedef struct State_Machine_Registers
+{
+  unsigned long        address;
+  unsigned int  file;
+  unsigned int  line;
+  unsigned int  column;
+  int           is_stmt;
+  int           basic_block;
+  int          end_sequence;
+/* This variable hold the number of the last entry seen
+   in the File Table.  */
+  unsigned int  last_file_entry;
+} SMR;
+
+static SMR state_machine_regs;
+
+static void
+reset_state_machine (is_stmt)
+     int is_stmt;
+{
+  state_machine_regs.address = 0;
+  state_machine_regs.file = 1;
+  state_machine_regs.line = 1;
+  state_machine_regs.column = 0;
+  state_machine_regs.is_stmt = is_stmt;
+  state_machine_regs.basic_block = 0;
+  state_machine_regs.end_sequence = 0;
+  state_machine_regs.last_file_entry = 0;
+}
+
+/* Handled an extend line op.  Returns true if this is the end
+   of sequence.  */
+static int
+process_extended_line_op (data, is_stmt)
+     unsigned char * data;
+     int is_stmt;
+{
+  unsigned char   op_code;
+  int             bytes_read;
+  unsigned int    len;
+  unsigned char * name;
+  unsigned long   adr;
+  
+  len = read_leb128 (data, & bytes_read, 0);
+  data += bytes_read;
+
+  if (len == 0)
+    {
+      warn (_("badly formed extended line op encountered!"));
+      return bytes_read;
+    }
+
+  len += bytes_read;
+  op_code = * data ++;
+
+  printf (_("  Extended opcode %d: "), op_code);
+  
+  switch (op_code)
+    {
+    case DW_LNE_end_sequence:
+      printf (_("End of Sequence\n\n"));
+      reset_state_machine (is_stmt);
+      break;
+
+    case DW_LNE_set_address:
+      /* XXX - assumption here that address size is 4! */
+      adr = byte_get (data, 4);
+      printf (_("set Address to 0x%lx\n"), adr);
+      state_machine_regs.address = adr;
+      break;
+
+    case DW_LNE_define_file:
+      printf (_("  define new File Table entry\n"));
+      printf (_("  Entry\tDir\tTime\tSize\tName\n"));
+        
+      printf (_("   %d\t"), ++ state_machine_regs.last_file_entry);
+      name = data;
+      data += strlen (data) + 1;
+      printf (_("%lu\t"), read_leb128 (data, & bytes_read, 0));
+      data += bytes_read;
+      printf (_("%lu\t"), read_leb128 (data, & bytes_read, 0));
+      data += bytes_read;
+      printf (_("%lu\t"), read_leb128 (data, & bytes_read, 0));
+      printf (_("%s\n\n"), name);
+      break;
+
+    default:
+      printf (_("UNKNOWN: length %d\n"), len - bytes_read);
+      break;
+    }
+
+  return len;
+}
+
+
+static int
+display_debug_lines (section, start, file)
+     Elf32_Internal_Shdr * section;
+     unsigned char *       start;
+     FILE *                file;
+{
+  DWARF2_External_LineInfo * external;
+  DWARF2_Internal_LineInfo   info;
+  unsigned char *            standard_opcodes;
+  unsigned char *            data = start;
+  unsigned char *            end  = start + section->sh_size;
+  unsigned char *            end_of_sequence;
+  int                        i;
+
+  printf (_("\nDump of debug contents of section %s:\n\n"),
+         SECTION_NAME (section));
+
+  while (data < end)
+    {
+      external = (DWARF2_External_LineInfo *) data;
+
+      /* Check the length of the block.  */
+      info.li_length = BYTE_GET (external->li_length);
+      if (info.li_length > section->sh_size)
+       {
+         warn
+           (_("The line info appears to be corrupt - the section is too small\n"));
+         return 0;
+       }
+      
+      /* Check its version number.  */
+      info.li_version = BYTE_GET (external->li_version);
+      if (info.li_version != 2)
+       {
+         warn (_("Only DWARF version 2 line info is currently supported.\n"));
+         return 0;
+       }
+      
+      info.li_prologue_length = BYTE_GET (external->li_prologue_length);
+      info.li_min_insn_length = BYTE_GET (external->li_min_insn_length);
+      info.li_default_is_stmt = BYTE_GET (external->li_default_is_stmt);
+      info.li_line_base       = BYTE_GET (external->li_line_base);
+      info.li_line_range      = BYTE_GET (external->li_line_range);
+      info.li_opcode_base     = BYTE_GET (external->li_opcode_base);
+      
+      /* Sign extend the line base field.  */
+      info.li_line_base <<= 24;
+      info.li_line_base >>= 24;
+      
+      printf (_("  Length:                      %ld\n"), info.li_length);
+      printf (_("  DWARF Version:               %d\n"), info.li_version);
+      printf (_("  Prolgue Length:              %d\n"), info.li_prologue_length);
+      printf (_("  Minimum Instruction Length:  %d\n"), info.li_min_insn_length);
+      printf (_("  Initial value of 'is_stmt':  %d\n"), info.li_default_is_stmt);
+      printf (_("  Line Base:                   %d\n"), info.li_line_base);
+      printf (_("  Line Range:                  %d\n"), info.li_line_range);
+      printf (_("  Opcode Base:                 %d\n"), info.li_opcode_base);
+
+      end_of_sequence = data + info.li_length + sizeof (info.li_length);
+
+      reset_state_machine (info.li_default_is_stmt);
+      
+      /* Display the contents of the Opcodes table.  */
+      standard_opcodes = data + sizeof (* external);
+      
+      printf (_("\n Opcodes:\n"));
+      
+      for (i = 1; i < info.li_opcode_base; i++)
+       printf (_("  Opcode %d has %d args\n"), i, standard_opcodes[i]);
+      
+      /* Display the contents of the Directory table.  */
+      data = standard_opcodes + info.li_opcode_base - 1;
+      
+      if (* data == 0)
+       printf (_("\n The Directory Table is empty.\n"));
+      else
+       {
+         printf (_("\n The Directory Table:\n"));
+         
+         while (* data != 0)
+           {
+             printf (_("  %s\n"), data);
+             
+             data += strlen (data) + 1;
+           }
+       }
+      
+      /* Skip the NUL at the end of the table.  */
+      data ++;
+      
+      /* Display the contents of the File Name table.  */
+      if (* data == 0)
+       printf (_("\n The File Name Table is empty.\n"));
+      else
+       {
+         printf (_("\n The File Name Table:\n"));
+         printf (_("  Entry\tDir\tTime\tSize\tName\n"));
+         
+         while (* data != 0)
+           {
+             char * name;
+             int bytes_read;
+             
+             printf (_("  %d\t"), ++ state_machine_regs.last_file_entry);
+             name = data;
+             
+             data += strlen (data) + 1;
+             
+             printf (_("%lu\t"), read_leb128 (data, & bytes_read, 0));
+             data += bytes_read;
+             printf (_("%lu\t"), read_leb128 (data, & bytes_read, 0));
+             data += bytes_read;
+             printf (_("%lu\t"), read_leb128 (data, & bytes_read, 0));
+             data += bytes_read;
+             printf (_("%s\n"), name);
+           }
+       }
+      
+      /* Skip the NUL at the end of the table.  */
+      data ++;
+      
+      /* Now display the statements.  */
+      printf (_("\n Line Number Statements:\n"));
+      
+      
+      while (data < end_of_sequence)
+       {
+         unsigned char op_code;
+         int           adv;
+         int           bytes_read;
+         
+         op_code = * data ++;
+         
+         switch (op_code)
+           {
+           case DW_LNS_extended_op:
+             data += process_extended_line_op (data, info.li_default_is_stmt);
+             break;
+             
+           case DW_LNS_copy:
+             printf (_("  Copy\n"));
+             break;
+             
+           case DW_LNS_advance_pc:
+             adv = info.li_min_insn_length * read_leb128 (data, & bytes_read, 0);
+             data += bytes_read;
+             state_machine_regs.address += adv;
+             printf (_("  Advance PC by %d to %lx\n"), adv,
+                     state_machine_regs.address);
+             break;
+             
+           case DW_LNS_advance_line:
+             adv = read_leb128 (data, & bytes_read, 1);
+             data += bytes_read;
+             state_machine_regs.line += adv;
+             printf (_("  Advance Line by %d to %d\n"), adv,
+                     state_machine_regs.line);
+             break;
+             
+           case DW_LNS_set_file:
+             adv = read_leb128 (data, & bytes_read, 0);
+             data += bytes_read;
+             printf (_("  Set File Name to entry %d in the File Name Table\n"),
+                     adv);
+             state_machine_regs.file = adv;
+             break;
+             
+           case DW_LNS_set_column:
+             adv = read_leb128 (data, & bytes_read, 0);
+             data += bytes_read;
+             printf (_("  Set column to %d\n"), adv);
+             state_machine_regs.column = adv;
+             break;
+             
+           case DW_LNS_negate_stmt:
+             adv = state_machine_regs.is_stmt;
+             adv = ! adv;
+             printf (_("  Set is_stmt to %d\n"), adv);
+             state_machine_regs.is_stmt = adv;
+             break;
+             
+           case DW_LNS_set_basic_block:
+             printf (_("  Set basic block\n"));
+             state_machine_regs.basic_block = 1;
+             break;
+             
+           case DW_LNS_const_add_pc:
+             adv = (255 - info.li_opcode_base) / info.li_line_range;
+             state_machine_regs.address += adv;
+             printf (_("  Advance PC by constant %d to 0x%lx\n"), adv,
+                     state_machine_regs.address);
+             break;
+             
+           case DW_LNS_fixed_advance_pc:
+             adv = byte_get (data, 2);
+             data += 2;
+             state_machine_regs.address += adv;
+             printf (_("  Advance PC by fixed size amount %d to 0x%lx\n"),
+                     adv, state_machine_regs.address);
+             break;
+             
+           default:
+             op_code -= info.li_opcode_base;
+             adv      = (op_code / info.li_line_range) * info.li_min_insn_length;
+             state_machine_regs.address += adv;
+             printf (_("  Special opcode %d: advance Address by %d to 0x%lx"),
+                     op_code, adv, state_machine_regs.address);
+             adv    += (op_code % info.li_line_range) + info.li_line_base;
+             state_machine_regs.line += adv;
+             printf (_(" and Line by %d to %d\n"),
+                     adv, state_machine_regs.line);
+             break;
+           }
+       }
+      printf ("\n");
+    }
+  
+  return 1;
+}
+
+static int
+display_debug_pubnames (section, start, file)
+     Elf32_Internal_Shdr * section;
+     unsigned char *       start;
+     FILE *                file;
+{
+  DWARF2_External_PubNames * external;
+  DWARF2_Internal_PubNames   pubnames;
+  unsigned char *            end;
+
+  end = start + section->sh_size;
+
+  printf (_("Contents of the %s section:\n\n"), SECTION_NAME (section));
+
+  while (start < end)
+    {
+      unsigned char * data;
+      unsigned long   offset;
+
+      external = (DWARF2_External_PubNames *) start;
+
+      pubnames.pn_length  = BYTE_GET (external->pn_length);
+      pubnames.pn_version = BYTE_GET (external->pn_version);
+      pubnames.pn_offset  = BYTE_GET (external->pn_offset);
+      pubnames.pn_size    = BYTE_GET (external->pn_size);
+
+      data   = start + sizeof (* external);
+      start += pubnames.pn_length + sizeof (external->pn_length);
+
+      if (pubnames.pn_version != 2)
+       {
+         warn (_("Only DWARF 2 pubnames are currently supported"));
+         continue;
+       }
+
+      printf (_("  Length:                              %ld\n"),
+             pubnames.pn_length);
+      printf (_("  Version:                             %d\n"),
+             pubnames.pn_version);
+      printf (_("  Offset into .debug_info section:     %ld\n"),
+             pubnames.pn_offset);
+      printf (_("  Size of area in .debug_info section: %ld\n"),
+             pubnames.pn_size);
+
+      printf (_("\n    Offset\tName\n"));
+
+      do
+       {
+         offset = byte_get (data, 4);
+
+         if (offset != 0)
+           {
+             data += 4;
+             printf ("    %ld\t\t%s\n", offset, data);
+             data += strlen (data) + 1;
+           }
+       }
+      while (offset != 0);
+    }
+
+  printf ("\n");
+  return 1;
+}
+
+static char *
+get_TAG_name (tag)
+     unsigned long tag;
+{
+  switch (tag)
+    {
+    case DW_TAG_padding: return "DW_TAG_padding";
+    case DW_TAG_array_type: return "DW_TAG_array_type";
+    case DW_TAG_class_type: return "DW_TAG_class_type";
+    case DW_TAG_entry_point: return "DW_TAG_entry_point";
+    case DW_TAG_enumeration_type: return "DW_TAG_enumeration_type";
+    case DW_TAG_formal_parameter: return "DW_TAG_formal_parameter";
+    case DW_TAG_imported_declaration: return "DW_TAG_imported_declaration";
+    case DW_TAG_label: return "DW_TAG_label";
+    case DW_TAG_lexical_block: return "DW_TAG_lexical_block";
+    case DW_TAG_member: return "DW_TAG_member";
+    case DW_TAG_pointer_type: return "DW_TAG_pointer_type";
+    case DW_TAG_reference_type: return "DW_TAG_reference_type";
+    case DW_TAG_compile_unit: return "DW_TAG_compile_unit";
+    case DW_TAG_string_type: return "DW_TAG_string_type";
+    case DW_TAG_structure_type: return "DW_TAG_structure_type";
+    case DW_TAG_subroutine_type: return "DW_TAG_subroutine_type";
+    case DW_TAG_typedef: return "DW_TAG_typedef";
+    case DW_TAG_union_type: return "DW_TAG_union_type";
+    case DW_TAG_unspecified_parameters: return "DW_TAG_unspecified_parameters";
+    case DW_TAG_variant: return "DW_TAG_variant";
+    case DW_TAG_common_block: return "DW_TAG_common_block";
+    case DW_TAG_common_inclusion: return "DW_TAG_common_inclusion";
+    case DW_TAG_inheritance: return "DW_TAG_inheritance";
+    case DW_TAG_inlined_subroutine: return "DW_TAG_inlined_subroutine";
+    case DW_TAG_module: return "DW_TAG_module";
+    case DW_TAG_ptr_to_member_type: return "DW_TAG_ptr_to_member_type";
+    case DW_TAG_set_type: return "DW_TAG_set_type";
+    case DW_TAG_subrange_type: return "DW_TAG_subrange_type";
+    case DW_TAG_with_stmt: return "DW_TAG_with_stmt";
+    case DW_TAG_access_declaration: return "DW_TAG_access_declaration";
+    case DW_TAG_base_type: return "DW_TAG_base_type";
+    case DW_TAG_catch_block: return "DW_TAG_catch_block";
+    case DW_TAG_const_type: return "DW_TAG_const_type";
+    case DW_TAG_constant: return "DW_TAG_constant";
+    case DW_TAG_enumerator: return "DW_TAG_enumerator";
+    case DW_TAG_file_type: return "DW_TAG_file_type";
+    case DW_TAG_friend: return "DW_TAG_friend";
+    case DW_TAG_namelist: return "DW_TAG_namelist";
+    case DW_TAG_namelist_item: return "DW_TAG_namelist_item";
+    case DW_TAG_packed_type: return "DW_TAG_packed_type";
+    case DW_TAG_subprogram: return "DW_TAG_subprogram";
+    case DW_TAG_template_type_param: return "DW_TAG_template_type_param";
+    case DW_TAG_template_value_param: return "DW_TAG_template_value_param";
+    case DW_TAG_thrown_type: return "DW_TAG_thrown_type";
+    case DW_TAG_try_block: return "DW_TAG_try_block";
+    case DW_TAG_variant_part: return "DW_TAG_variant_part";
+    case DW_TAG_variable: return "DW_TAG_variable";
+    case DW_TAG_volatile_type: return "DW_TAG_volatile_type";
+    case DW_TAG_MIPS_loop: return "DW_TAG_MIPS_loop";
+    case DW_TAG_format_label: return "DW_TAG_format_label";
+    case DW_TAG_function_template: return "DW_TAG_function_template";
+    case DW_TAG_class_template: return "DW_TAG_class_template";
+    default:
+      {
+       static char buffer [100];
+
+       sprintf (buffer, _("Unknown TAG value: %lx"), tag);
+       return buffer;
+      }
+    }
+}
+
+static char *
+get_AT_name (attribute)
+     unsigned long attribute;
+{
+  switch (attribute)
+    {
+    case DW_AT_sibling: return "DW_AT_sibling";
+    case DW_AT_location: return "DW_AT_location";
+    case DW_AT_name: return "DW_AT_name";
+    case DW_AT_ordering: return "DW_AT_ordering";
+    case DW_AT_subscr_data: return "DW_AT_subscr_data";
+    case DW_AT_byte_size: return "DW_AT_byte_size";
+    case DW_AT_bit_offset: return "DW_AT_bit_offset";
+    case DW_AT_bit_size: return "DW_AT_bit_size";
+    case DW_AT_element_list: return "DW_AT_element_list";
+    case DW_AT_stmt_list: return "DW_AT_stmt_list";
+    case DW_AT_low_pc: return "DW_AT_low_pc";
+    case DW_AT_high_pc: return "DW_AT_high_pc";
+    case DW_AT_language: return "DW_AT_language";
+    case DW_AT_member: return "DW_AT_member";
+    case DW_AT_discr: return "DW_AT_discr";
+    case DW_AT_discr_value: return "DW_AT_discr_value";
+    case DW_AT_visibility: return "DW_AT_visibility";
+    case DW_AT_import: return "DW_AT_import";
+    case DW_AT_string_length: return "DW_AT_string_length";
+    case DW_AT_common_reference: return "DW_AT_common_reference";
+    case DW_AT_comp_dir: return "DW_AT_comp_dir";
+    case DW_AT_const_value: return "DW_AT_const_value";
+    case DW_AT_containing_type: return "DW_AT_containing_type";
+    case DW_AT_default_value: return "DW_AT_default_value";
+    case DW_AT_inline: return "DW_AT_inline";
+    case DW_AT_is_optional: return "DW_AT_is_optional";
+    case DW_AT_lower_bound: return "DW_AT_lower_bound";
+    case DW_AT_producer: return "DW_AT_producer";
+    case DW_AT_prototyped: return "DW_AT_prototyped";
+    case DW_AT_return_addr: return "DW_AT_return_addr";
+    case DW_AT_start_scope: return "DW_AT_start_scope";
+    case DW_AT_stride_size: return "DW_AT_stride_size";
+    case DW_AT_upper_bound: return "DW_AT_upper_bound";
+    case DW_AT_abstract_origin: return "DW_AT_abstract_origin";
+    case DW_AT_accessibility: return "DW_AT_accessibility";
+    case DW_AT_address_class: return "DW_AT_address_class";
+    case DW_AT_artificial: return "DW_AT_artificial";
+    case DW_AT_base_types: return "DW_AT_base_types";
+    case DW_AT_calling_convention: return "DW_AT_calling_convention";
+    case DW_AT_count: return "DW_AT_count";
+    case DW_AT_data_member_location: return "DW_AT_data_member_location";
+    case DW_AT_decl_column: return "DW_AT_decl_column";
+    case DW_AT_decl_file: return "DW_AT_decl_file";
+    case DW_AT_decl_line: return "DW_AT_decl_line";
+    case DW_AT_declaration: return "DW_AT_declaration";
+    case DW_AT_discr_list: return "DW_AT_discr_list";
+    case DW_AT_encoding: return "DW_AT_encoding";
+    case DW_AT_external: return "DW_AT_external";
+    case DW_AT_frame_base: return "DW_AT_frame_base";
+    case DW_AT_friend: return "DW_AT_friend";
+    case DW_AT_identifier_case: return "DW_AT_identifier_case";
+    case DW_AT_macro_info: return "DW_AT_macro_info";
+    case DW_AT_namelist_items: return "DW_AT_namelist_items";
+    case DW_AT_priority: return "DW_AT_priority";
+    case DW_AT_segment: return "DW_AT_segment";
+    case DW_AT_specification: return "DW_AT_specification";
+    case DW_AT_static_link: return "DW_AT_static_link";
+    case DW_AT_type: return "DW_AT_type";
+    case DW_AT_use_location: return "DW_AT_use_location";
+    case DW_AT_variable_parameter: return "DW_AT_variable_parameter";
+    case DW_AT_virtuality: return "DW_AT_virtuality";
+    case DW_AT_vtable_elem_location: return "DW_AT_vtable_elem_location";
+    case DW_AT_MIPS_fde: return "DW_AT_MIPS_fde";
+    case DW_AT_MIPS_loop_begin: return "DW_AT_MIPS_loop_begin";
+    case DW_AT_MIPS_tail_loop_begin: return "DW_AT_MIPS_tail_loop_begin";
+    case DW_AT_MIPS_epilog_begin: return "DW_AT_MIPS_epilog_begin";
+    case DW_AT_MIPS_loop_unroll_factor: return "DW_AT_MIPS_loop_unroll_factor";
+    case DW_AT_MIPS_software_pipeline_depth: return "DW_AT_MIPS_software_pipeline_depth";
+    case DW_AT_MIPS_linkage_name: return "DW_AT_MIPS_linkage_name";
+    case DW_AT_MIPS_stride: return "DW_AT_MIPS_stride";
+    case DW_AT_MIPS_abstract_name: return "DW_AT_MIPS_abstract_name";
+    case DW_AT_MIPS_clone_origin: return "DW_AT_MIPS_clone_origin";
+    case DW_AT_MIPS_has_inlines: return "DW_AT_MIPS_has_inlines";
+    case DW_AT_sf_names: return "DW_AT_sf_names";
+    case DW_AT_src_info: return "DW_AT_src_info";
+    case DW_AT_mac_info: return "DW_AT_mac_info";
+    case DW_AT_src_coords: return "DW_AT_src_coords";
+    case DW_AT_body_begin: return "DW_AT_body_begin";
+    case DW_AT_body_end: return "DW_AT_body_end";
+    default:
+      {
+       static char buffer [100];
+
+       sprintf (buffer, _("Unknown AT value: %lx"), attribute);
+       return buffer;
+      }
+    }
+}
+
+static char *
+get_FORM_name (form)
+     unsigned long form;
+{
+  switch (form)
+    {
+    case DW_FORM_addr: return "DW_FORM_addr";
+    case DW_FORM_block2: return "DW_FORM_block2";
+    case DW_FORM_block4: return "DW_FORM_block4";
+    case DW_FORM_data2: return "DW_FORM_data2";
+    case DW_FORM_data4: return "DW_FORM_data4";
+    case DW_FORM_data8: return "DW_FORM_data8";
+    case DW_FORM_string: return "DW_FORM_string";
+    case DW_FORM_block: return "DW_FORM_block";
+    case DW_FORM_block1: return "DW_FORM_block1";
+    case DW_FORM_data1: return "DW_FORM_data1";
+    case DW_FORM_flag: return "DW_FORM_flag";
+    case DW_FORM_sdata: return "DW_FORM_sdata";
+    case DW_FORM_strp: return "DW_FORM_strp";
+    case DW_FORM_udata: return "DW_FORM_udata";
+    case DW_FORM_ref_addr: return "DW_FORM_ref_addr";
+    case DW_FORM_ref1: return "DW_FORM_ref1";
+    case DW_FORM_ref2: return "DW_FORM_ref2";
+    case DW_FORM_ref4: return "DW_FORM_ref4";
+    case DW_FORM_ref8: return "DW_FORM_ref8";
+    case DW_FORM_ref_udata: return "DW_FORM_ref_udata";
+    case DW_FORM_indirect: return "DW_FORM_indirect";
+    default:
+      {
+       static char buffer [100];
+
+       sprintf (buffer, _("Unknown FORM value: %lx"), form);
+       return buffer;
+      }
+    }
+}
+
+/* FIXME:  There are better and more effiecint ways to handle
+   these structures.  For now though, I just want something that
+   is simple to implement.  */
+typedef struct abbrev_attr
+{
+  unsigned long        attribute;
+  unsigned long        form;
+  struct abbrev_attr * next;
+}
+abbrev_attr;
+
+typedef struct abbrev_entry
+{
+  unsigned long          entry;
+  unsigned long          tag;
+  int                    children;
+  struct abbrev_attr *   first_attr;
+  struct abbrev_attr *   last_attr;
+  struct abbrev_entry *  next;
+}
+abbrev_entry;
+
+static abbrev_entry * first_abbrev = NULL;
+static abbrev_entry * last_abbrev = NULL;
+
+static void
+free_abbrevs PARAMS ((void))
+{
+  abbrev_entry * abbrev;
+
+  for (abbrev = first_abbrev; abbrev;)
+    {
+      abbrev_entry * next = abbrev->next;
+      abbrev_attr  * attr;
+
+      for (attr = abbrev->first_attr; attr;)
+       {
+         abbrev_attr * next = attr->next;
+
+         free (attr);
+         attr = next;
+       }
+
+      free (abbrev);
+      abbrev = next;
+    }
+
+  last_abbrev = first_abbrev = NULL;
+}
+
+static void
+add_abbrev (number, tag, children)
+     unsigned long number;
+     unsigned long tag;
+     int           children;
+{
+  abbrev_entry * entry;
+
+  entry = (abbrev_entry *) malloc (sizeof (* entry));
+
+  if (entry == NULL)
+    /* ugg */
+    return;
+
+  entry->entry      = number;
+  entry->tag        = tag;
+  entry->children   = children;
+  entry->first_attr = NULL;
+  entry->last_attr  = NULL;
+  entry->next       = NULL;
+
+  if (first_abbrev == NULL)
+    first_abbrev = entry;
+  else
+    last_abbrev->next = entry;
+
+  last_abbrev = entry;
+}
+
+static void
+add_abbrev_attr (attribute, form)
+     unsigned long attribute;
+     unsigned long form;
+{
+  abbrev_attr * attr;
+
+  attr = (abbrev_attr *) malloc (sizeof (* attr));
+
+  if (attr == NULL)
+    /* ugg */
+    return;
+
+  attr->attribute = attribute;
+  attr->form      = form;
+  attr->next      = NULL;
+
+  if (last_abbrev->first_attr == NULL)
+    last_abbrev->first_attr = attr;
+  else
+    last_abbrev->last_attr->next = attr;
+
+  last_abbrev->last_attr = attr;
+}
+
+/* Processes the (partial) contents of a .debug_abbrev section.
+   Returns NULL if the end of the section was encountered.
+   Returns the address after the last byte read if the end of
+   an abbreviation set was found.  */
+
+static unsigned char *
+process_abbrev_section (start, end)
+     unsigned char * start;
+     unsigned char * end;
+{
+  if (first_abbrev != NULL)
+    return NULL;
+
+  while (start < end)
+    {
+      int           bytes_read;
+      unsigned long entry;
+      unsigned long tag;
+      unsigned long attribute;
+      int           children;
+
+      entry = read_leb128 (start, & bytes_read, 0);
+      start += bytes_read;
+
+      if (entry == 0)
+       return start;
+
+      tag = read_leb128 (start, & bytes_read, 0);
+      start += bytes_read;
+
+      children = * start ++;
+
+      add_abbrev (entry, tag, children);
+
+      do
+       {
+         unsigned long form;
+
+         attribute = read_leb128 (start, & bytes_read, 0);
+         start += bytes_read;
+
+         form = read_leb128 (start, & bytes_read, 0);
+         start += bytes_read;
+
+         if (attribute != 0)
+           add_abbrev_attr (attribute, form);
+       }
+      while (attribute != 0);
+    }
+
+  return NULL;
+}
+
+
+static int
+display_debug_abbrev (section, start, file)
+     Elf32_Internal_Shdr * section;
+     unsigned char *       start;
+     FILE *                file;
+{
+  abbrev_entry * entry;
+  unsigned char * end = start + section->sh_size;
+
+  printf (_("Contents of the %s section:\n\n"), SECTION_NAME (section));
+
+  do
+    {
+      start = process_abbrev_section (start, end);
+
+      printf (_("  Number TAG\n"));
+
+      for (entry = first_abbrev; entry; entry = entry->next)
+       {
+         abbrev_attr * attr;
+
+         printf (_("   %ld      %s    [%s]\n"),
+                 entry->entry,
+                 get_TAG_name (entry->tag),
+                 entry->children ? _("has children") : _("no children"));
+
+         for (attr = entry->first_attr; attr; attr = attr->next)
+           {
+             printf (_("    %-18s %s\n"),
+                     get_AT_name (attr->attribute),
+                     get_FORM_name (attr->form));
+           }
+       }
+    }
+  while (start);
+
+  printf ("\n");
+
+  return 1;
+}
+
+
+static unsigned char *
+display_block (data, length)
+     unsigned char * data;
+     unsigned long   length;
+{
+  printf (_(" %lu byte block: "), length);
+
+  while (length --)
+    printf ("%lx ", byte_get (data ++, 1));
+
+  return data;
+}
+
+static void
+decode_location_expression (data, pointer_size)
+     unsigned char * data;
+     unsigned int    pointer_size;
+{
+  unsigned char op;
+  int           bytes_read;
+
+  op = * data ++;
+
+  switch (op)
+    {
+    case DW_OP_addr:   printf ("DW_OP_addr: %lx", byte_get (data, pointer_size)); break;
+    case DW_OP_deref:  printf ("DW_OP_deref"); break;
+    case DW_OP_const1u:        printf ("DW_OP_const1u: %lu", byte_get (data, 1)); break;
+    case DW_OP_const1s:        printf ("DW_OP_const1s: %ld", (long) byte_get (data, 1)); break;
+    case DW_OP_const2u:        printf ("DW_OP_const2u: %lu", byte_get (data, 2)); break;
+    case DW_OP_const2s:        printf ("DW_OP_const2s: %ld", (long) byte_get (data, 2)); break;
+    case DW_OP_const4u:        printf ("DW_OP_const4u: %lu", byte_get (data, 4)); break;
+    case DW_OP_const4s:        printf ("DW_OP_const4s: %ld", (long) byte_get (data, 4)); break;
+    case DW_OP_const8u:        printf ("DW_OP_const8u: %lu %lu", byte_get (data, 4), byte_get (data + 4, 4)); break;
+    case DW_OP_const8s:        printf ("DW_OP_const8s: %ld %ld", byte_get (data, 4), byte_get (data + 4, 4)); break;
+    case DW_OP_constu: printf ("DW_OP_constu: %lu", read_leb128 (data, NULL, 0)); break;
+    case DW_OP_consts: printf ("DW_OP_consts: %ld", read_leb128 (data, NULL, 1)); break;
+    case DW_OP_dup:    printf ("DW_OP_dup"); break;
+    case DW_OP_drop:   printf ("DW_OP_drop"); break;
+    case DW_OP_over:   printf ("DW_OP_over"); break;
+    case DW_OP_pick:   printf ("DW_OP_pick: %ld", byte_get (data, 1)); break;
+    case DW_OP_swap:   printf ("DW_OP_swap"); break;
+    case DW_OP_rot:    printf ("DW_OP_rot"); break;
+    case DW_OP_xderef: printf ("DW_OP_xderef"); break;
+    case DW_OP_abs:    printf ("DW_OP_abs"); break;
+    case DW_OP_and:    printf ("DW_OP_and"); break;
+    case DW_OP_div:    printf ("DW_OP_div"); break;
+    case DW_OP_minus:  printf ("DW_OP_minus"); break;
+    case DW_OP_mod:    printf ("DW_OP_mod"); break;
+    case DW_OP_mul:    printf ("DW_OP_mul"); break;
+    case DW_OP_neg:    printf ("DW_OP_neg"); break;
+    case DW_OP_not:    printf ("DW_OP_not"); break;
+    case DW_OP_or:     printf ("DW_OP_or"); break;
+    case DW_OP_plus:   printf ("DW_OP_plus"); break;
+    case DW_OP_plus_uconst:    printf ("DW_OP_plus_uconst: %lu", read_leb128 (data, NULL, 0)); break;
+    case DW_OP_shl:    printf ("DW_OP_shl"); break;
+    case DW_OP_shr:    printf ("DW_OP_shr"); break;
+    case DW_OP_shra:   printf ("DW_OP_shra"); break;
+    case DW_OP_xor:    printf ("DW_OP_xor"); break;
+    case DW_OP_bra:    printf ("DW_OP_bra: %ld", byte_get (data, 2)); break;
+    case DW_OP_eq:     printf ("DW_OP_eq"); break;
+    case DW_OP_ge:     printf ("DW_OP_ge"); break;
+    case DW_OP_gt:     printf ("DW_OP_gt"); break;
+    case DW_OP_le:     printf ("DW_OP_le"); break;
+    case DW_OP_lt:     printf ("DW_OP_lt"); break;
+    case DW_OP_ne:     printf ("DW_OP_ne"); break;
+    case DW_OP_skip:   printf ("DW_OP_skip: %ld", byte_get (data, 2)); break;
+    case DW_OP_lit0:   printf ("DW_OP_lit0"); break;
+    case DW_OP_lit1:   printf ("DW_OP_lit1"); break;
+    case DW_OP_lit2:   printf ("DW_OP_lit2"); break;
+    case DW_OP_lit3:   printf ("DW_OP_lit3"); break;
+    case DW_OP_lit4:   printf ("DW_OP_lit4"); break;
+    case DW_OP_lit5:   printf ("DW_OP_lit5"); break;
+    case DW_OP_lit6:   printf ("DW_OP_lit6"); break;
+    case DW_OP_lit7:   printf ("DW_OP_lit7"); break;
+    case DW_OP_lit8:   printf ("DW_OP_lit8"); break;
+    case DW_OP_lit9:   printf ("DW_OP_lit9"); break;
+    case DW_OP_lit10:  printf ("DW_OP_lit10"); break;
+    case DW_OP_lit11:  printf ("DW_OP_lit11"); break;
+    case DW_OP_lit12:  printf ("DW_OP_lit12"); break;
+    case DW_OP_lit13:  printf ("DW_OP_lit13"); break;
+    case DW_OP_lit14:  printf ("DW_OP_lit14"); break;
+    case DW_OP_lit15:  printf ("DW_OP_lit15"); break;
+    case DW_OP_lit16:  printf ("DW_OP_lit16"); break;
+    case DW_OP_lit17:  printf ("DW_OP_lit17"); break;
+    case DW_OP_lit18:  printf ("DW_OP_lit18"); break;
+    case DW_OP_lit19:  printf ("DW_OP_lit19"); break;
+    case DW_OP_lit20:  printf ("DW_OP_lit20"); break;
+    case DW_OP_lit21:  printf ("DW_OP_lit21"); break;
+    case DW_OP_lit22:  printf ("DW_OP_lit22"); break;
+    case DW_OP_lit23:  printf ("DW_OP_lit23"); break;
+    case DW_OP_lit24:  printf ("DW_OP_lit24"); break;
+    case DW_OP_lit25:  printf ("DW_OP_lit25"); break;
+    case DW_OP_lit26:  printf ("DW_OP_lit26"); break;
+    case DW_OP_lit27:  printf ("DW_OP_lit27"); break;
+    case DW_OP_lit28:  printf ("DW_OP_lit28"); break;
+    case DW_OP_lit29:  printf ("DW_OP_lit29"); break;
+    case DW_OP_lit30:  printf ("DW_OP_lit30"); break;
+    case DW_OP_lit31:  printf ("DW_OP_lit31"); break;
+    case DW_OP_reg0:   printf ("DW_OP_reg0"); break;
+    case DW_OP_reg1:   printf ("DW_OP_reg1"); break;
+    case DW_OP_reg2:   printf ("DW_OP_reg2"); break;
+    case DW_OP_reg3:   printf ("DW_OP_reg3"); break;
+    case DW_OP_reg4:   printf ("DW_OP_reg4"); break;
+    case DW_OP_reg5:   printf ("DW_OP_reg5"); break;
+    case DW_OP_reg6:   printf ("DW_OP_reg6"); break;
+    case DW_OP_reg7:   printf ("DW_OP_reg7"); break;
+    case DW_OP_reg8:   printf ("DW_OP_reg8"); break;
+    case DW_OP_reg9:   printf ("DW_OP_reg9"); break;
+    case DW_OP_reg10:  printf ("DW_OP_reg10"); break;
+    case DW_OP_reg11:  printf ("DW_OP_reg11"); break;
+    case DW_OP_reg12:  printf ("DW_OP_reg12"); break;
+    case DW_OP_reg13:  printf ("DW_OP_reg13"); break;
+    case DW_OP_reg14:  printf ("DW_OP_reg14"); break;
+    case DW_OP_reg15:  printf ("DW_OP_reg15"); break;
+    case DW_OP_reg16:  printf ("DW_OP_reg16"); break;
+    case DW_OP_reg17:  printf ("DW_OP_reg17"); break;
+    case DW_OP_reg18:  printf ("DW_OP_reg18"); break;
+    case DW_OP_reg19:  printf ("DW_OP_reg19"); break;
+    case DW_OP_reg20:  printf ("DW_OP_reg20"); break;
+    case DW_OP_reg21:  printf ("DW_OP_reg21"); break;
+    case DW_OP_reg22:  printf ("DW_OP_reg22"); break;
+    case DW_OP_reg23:  printf ("DW_OP_reg23"); break;
+    case DW_OP_reg24:  printf ("DW_OP_reg24"); break;
+    case DW_OP_reg25:  printf ("DW_OP_reg25"); break;
+    case DW_OP_reg26:  printf ("DW_OP_reg26"); break;
+    case DW_OP_reg27:  printf ("DW_OP_reg27"); break;
+    case DW_OP_reg28:  printf ("DW_OP_reg28"); break;
+    case DW_OP_reg29:  printf ("DW_OP_reg29"); break;
+    case DW_OP_reg30:  printf ("DW_OP_reg30"); break;
+    case DW_OP_reg31:  printf ("DW_OP_reg31"); break;
+    case DW_OP_breg0:  printf ("DW_OP_breg0: %ld", read_leb128 (data, NULL, 1)); break;
+    case DW_OP_breg1:  printf ("DW_OP_breg1: %ld", read_leb128 (data, NULL, 1)); break;
+    case DW_OP_breg2:  printf ("DW_OP_breg2: %ld", read_leb128 (data, NULL, 1)); break;
+    case DW_OP_breg3:  printf ("DW_OP_breg3: %ld", read_leb128 (data, NULL, 1)); break;
+    case DW_OP_breg4:  printf ("DW_OP_breg4: %ld", read_leb128 (data, NULL, 1)); break;
+    case DW_OP_breg5:  printf ("DW_OP_breg5: %ld", read_leb128 (data, NULL, 1)); break;
+    case DW_OP_breg6:  printf ("DW_OP_breg6: %ld", read_leb128 (data, NULL, 1)); break;
+    case DW_OP_breg7:  printf ("DW_OP_breg7: %ld", read_leb128 (data, NULL, 1)); break;
+    case DW_OP_breg8:  printf ("DW_OP_breg8: %ld", read_leb128 (data, NULL, 1)); break;
+    case DW_OP_breg9:  printf ("DW_OP_breg9: %ld", read_leb128 (data, NULL, 1)); break;
+    case DW_OP_breg10: printf ("DW_OP_breg10: %ld", read_leb128 (data, NULL, 1)); break;
+    case DW_OP_breg11: printf ("DW_OP_breg11: %ld", read_leb128 (data, NULL, 1)); break;
+    case DW_OP_breg12: printf ("DW_OP_breg12: %ld", read_leb128 (data, NULL, 1)); break;
+    case DW_OP_breg13: printf ("DW_OP_breg13: %ld", read_leb128 (data, NULL, 1)); break;
+    case DW_OP_breg14: printf ("DW_OP_breg14: %ld", read_leb128 (data, NULL, 1)); break;
+    case DW_OP_breg15: printf ("DW_OP_breg15: %ld", read_leb128 (data, NULL, 1)); break;
+    case DW_OP_breg16: printf ("DW_OP_breg16: %ld", read_leb128 (data, NULL, 1)); break;
+    case DW_OP_breg17: printf ("DW_OP_breg17: %ld", read_leb128 (data, NULL, 1)); break;
+    case DW_OP_breg18: printf ("DW_OP_breg18: %ld", read_leb128 (data, NULL, 1)); break;
+    case DW_OP_breg19: printf ("DW_OP_breg19: %ld", read_leb128 (data, NULL, 1)); break;
+    case DW_OP_breg20: printf ("DW_OP_breg20: %ld", read_leb128 (data, NULL, 1)); break;
+    case DW_OP_breg21: printf ("DW_OP_breg21: %ld", read_leb128 (data, NULL, 1)); break;
+    case DW_OP_breg22: printf ("DW_OP_breg22: %ld", read_leb128 (data, NULL, 1)); break;
+    case DW_OP_breg23: printf ("DW_OP_breg23: %ld", read_leb128 (data, NULL, 1)); break;
+    case DW_OP_breg24: printf ("DW_OP_breg24: %ld", read_leb128 (data, NULL, 1)); break;
+    case DW_OP_breg25: printf ("DW_OP_breg25: %ld", read_leb128 (data, NULL, 1)); break;
+    case DW_OP_breg26: printf ("DW_OP_breg26: %ld", read_leb128 (data, NULL, 1)); break;
+    case DW_OP_breg27: printf ("DW_OP_breg27: %ld", read_leb128 (data, NULL, 1)); break;
+    case DW_OP_breg28: printf ("DW_OP_breg28: %ld", read_leb128 (data, NULL, 1)); break;
+    case DW_OP_breg29: printf ("DW_OP_breg29: %ld", read_leb128 (data, NULL, 1)); break;
+    case DW_OP_breg30: printf ("DW_OP_breg30: %ld", read_leb128 (data, NULL, 1)); break;
+    case DW_OP_breg31: printf ("DW_OP_breg31: %ld", read_leb128 (data, NULL, 1)); break;
+    case DW_OP_regx:   printf ("DW_OP_regx: %lu", read_leb128 (data, NULL, 0)); break;
+    case DW_OP_fbreg:  printf ("DW_OP_fbreg: %ld", read_leb128 (data, NULL, 1)); break;
+    case DW_OP_bregx:  printf ("DW_OP_bregx: %lu %ld", read_leb128 (data, & bytes_read, 0), read_leb128 (data + bytes_read, NULL, 1)); break;
+    case DW_OP_piece:  printf ("DW_OP_piece: %lu", read_leb128 (data, NULL, 0)); break;
+    case DW_OP_deref_size:     printf ("DW_OP_deref_size: %ld", byte_get (data, 1)); break;
+    case DW_OP_xderef_size:    printf ("DW_OP_xderef_size: %ld", byte_get (data, 1)); break;
+    case DW_OP_nop:    printf ("DW_OP_nop"); break;
+
+    default:
+      if (op >= DW_OP_lo_user
+         && op <= DW_OP_hi_user)
+       printf (_("(User defined location op)"));
+      else
+       printf (_("(Unknown location op)"));
+      break;
+    }
+}
+
+
+static unsigned char *
+read_and_display_attr (attribute, form, data, pointer_size)
+     unsigned long   attribute;
+     unsigned long   form;
+     unsigned char * data;
+     unsigned long   pointer_size;
+{
+  unsigned long   uvalue;
+  unsigned char * block_start;
+  int             bytes_read;
+  int            is_ref = 0;
+
+  printf ("     %-18s:", get_AT_name (attribute));
+
+  switch (form)
+    {
+    case DW_FORM_ref_addr:
+    case DW_FORM_ref1:
+    case DW_FORM_ref2:
+    case DW_FORM_ref4:
+    case DW_FORM_ref8:
+    case DW_FORM_ref_udata:
+      is_ref = 1;
+    }
+
+  switch (form)
+    {
+    case DW_FORM_ref_addr:
+    case DW_FORM_addr:
+      uvalue = byte_get (data, pointer_size);
+      printf (is_ref ? " <%x>" : " %#x", uvalue);
+      data += pointer_size;
+      break;
+
+    case DW_FORM_ref1:
+    case DW_FORM_flag:
+    case DW_FORM_data1:
+      uvalue = byte_get (data ++, 1);
+      printf (is_ref ? " <%x>" : " %d", uvalue);
+      break;
+
+    case DW_FORM_ref2:
+    case DW_FORM_data2:
+      uvalue = byte_get (data, 2);
+      data += 2;
+      printf (is_ref ? " <%x>" : " %d", uvalue);
+      break;
+
+    case DW_FORM_ref4:
+    case DW_FORM_data4:
+      uvalue = byte_get (data, 4);
+      data += 4;
+      printf (is_ref ? " <%x>" : " %d", uvalue);
+      break;
+
+    case DW_FORM_ref8:
+    case DW_FORM_data8:
+      uvalue = byte_get (data, 4);
+      printf (" %lx", uvalue);
+      printf (" %lx", byte_get (data + 4, 4));
+      data += 8;
+      break;
+
+    case DW_FORM_string:
+      printf (" %s", data);
+      data += strlen (data) + 1;
+      break;
+
+    case DW_FORM_sdata:
+      uvalue = read_leb128 (data, & bytes_read, 1);
+      data += bytes_read;
+      printf (" %ld", (long) uvalue);
+      break;
+
+    case DW_FORM_ref_udata:
+    case DW_FORM_udata:
+      uvalue = read_leb128 (data, & bytes_read, 0);
+      data += bytes_read;
+      printf (is_ref ? " <%lx>" : " %ld", uvalue);
+      break;
+
+    case DW_FORM_block:
+      uvalue = read_leb128 (data, & bytes_read, 0);
+      block_start = data + bytes_read;
+      data = display_block (block_start, uvalue);
+      uvalue = * block_start;
+      break;
+
+    case DW_FORM_block1:
+      uvalue = byte_get (data, 1);
+      block_start = data + 1;
+      data = display_block (block_start, uvalue);
+      uvalue = * block_start;
+      break;
+
+    case DW_FORM_block2:
+      uvalue = byte_get (data, 2);
+      block_start = data + 2;
+      data = display_block (block_start, uvalue);
+      uvalue = * block_start;
+      break;
+
+    case DW_FORM_block4:
+      uvalue = byte_get (data, 4);
+      block_start = data + 4;
+      data = display_block (block_start, uvalue);
+      uvalue = * block_start;
+      break;
+
+    case DW_FORM_strp:
+    case DW_FORM_indirect:
+      warn (_("Unable to handle FORM: %d"), form);
+      break;
+
+    default:
+      warn (_("Unrecognised form: %d"), form);
+      break;
+    }
+
+  /* For some attributes we can display futher information.  */
+
+  printf ("\t");
+
+  switch (attribute)
+    {
+    case DW_AT_inline:
+      switch (uvalue)
+       {
+       case DW_INL_not_inlined:          printf (_("(not inlined)")); break;
+       case DW_INL_inlined:              printf (_("(inlined)")); break;
+       case DW_INL_declared_not_inlined: printf (_("(declared as inline but ignored)")); break;
+       case DW_INL_declared_inlined:     printf (_("(declared as inline and inlined)")); break;
+       default: printf (_("  (Unknown inline attribute value: %lx)"), uvalue); break;
+       }
+      break;
+
+    case DW_AT_frame_base:
+      if (uvalue >= DW_OP_reg0 && uvalue <= DW_OP_reg31)
+       printf ("(reg %ld)", uvalue - DW_OP_reg0);
+      break;
+
+    case DW_AT_language:
+      switch (uvalue)
+       {
+       case DW_LANG_C:              printf ("(non-ANSI C)"); break;
+       case DW_LANG_C89:            printf ("(ANSI C)"); break;
+       case DW_LANG_C_plus_plus:    printf ("(C++)"); break;
+       case DW_LANG_Fortran77:      printf ("(FORTRAN 77)"); break;
+       case DW_LANG_Fortran90:      printf ("(Fortran 90)"); break;
+       case DW_LANG_Modula2:        printf ("(Modula 2)"); break;
+       case DW_LANG_Pascal83:       printf ("(ANSI Pascal)"); break;
+       case DW_LANG_Ada83:          printf ("(Ada)"); break;
+       case DW_LANG_Cobol74:        printf ("(Cobol 74)"); break;
+       case DW_LANG_Cobol85:        printf ("(Cobol 85)"); break;
+       case DW_LANG_Mips_Assembler: printf ("(MIPS assembler)"); break;
+       default:                     printf ("(Unknown: %lx)", uvalue); break;
+       }
+      break;
+
+    case DW_AT_encoding:
+      switch (uvalue)
+       {
+       case DW_ATE_void:            printf ("(void)"); break;
+       case DW_ATE_address:         printf ("(machine address)"); break;
+       case DW_ATE_boolean:         printf ("(boolean)"); break;
+       case DW_ATE_complex_float:   printf ("(complex float)"); break;
+       case DW_ATE_float:           printf ("(float)"); break;
+       case DW_ATE_signed:          printf ("(signed)"); break;
+       case DW_ATE_signed_char:     printf ("(signed char)"); break;
+       case DW_ATE_unsigned:        printf ("(unsigned)"); break;
+       case DW_ATE_unsigned_char:   printf ("(unsigned char)"); break;
+       default:
+         if (uvalue >= DW_ATE_lo_user
+             && uvalue <= DW_ATE_hi_user)
+           printf ("(user defined type)");
+         else
+           printf ("(unknown type)");
+         break;
+       }
+      break;
+
+    case DW_AT_accessibility:
+      switch (uvalue)
+       {
+       case DW_ACCESS_public:          printf ("(public)"); break;
+       case DW_ACCESS_protected:       printf ("(protected)"); break;
+       case DW_ACCESS_private:         printf ("(private)"); break;
+       default:                        printf ("(unknown accessibility)"); break;
+       }
+      break;
+
+    case DW_AT_visibility:
+      switch (uvalue)
+       {
+       case DW_VIS_local:      printf ("(local)"); break;
+       case DW_VIS_exported:   printf ("(exported)"); break;
+       case DW_VIS_qualified:  printf ("(qualified)"); break;
+       default:                printf ("(unknown visibility)"); break;
+       }
+      break;
 
-                 vers_data = byte_get (data, 2);
+    case DW_AT_virtuality:
+      switch (uvalue)
+       {
+       case DW_VIRTUALITY_none:        printf ("(none)"); break;
+       case DW_VIRTUALITY_virtual:     printf ("(virtual)"); break;
+       case DW_VIRTUALITY_pure_virtual:printf ("(pure_virtual)"); break;
+       default:                        printf ("(unknown virtuality)"); break;
+       }
+      break;
 
-                 is_nobits = psym->st_shndx < SHN_LORESERVE ?
-                   (section_headers [psym->st_shndx].sh_type == SHT_NOBITS)
-                   : 0;
+    case DW_AT_identifier_case:
+      switch (uvalue)
+       {
+       case DW_ID_case_sensitive:      printf ("(case_sensitive)"); break;
+       case DW_ID_up_case:             printf ("(up_case)"); break;
+       case DW_ID_down_case:           printf ("(down_case)"); break;
+       case DW_ID_case_insensitive:    printf ("(case_insensitive)"); break;
+       default:                        printf ("(unknown case)"); break;
+       }
+      break;
 
-                 check_def = (psym->st_shndx != SHN_UNDEF);
+    case DW_AT_calling_convention:
+      switch (uvalue)
+       {
+       case DW_CC_normal:      printf ("(normal)"); break;
+       case DW_CC_program:     printf ("(program)"); break;
+       case DW_CC_nocall:      printf ("(nocall)"); break;
+       default:
+         if (uvalue >= DW_CC_lo_user
+             && uvalue <= DW_CC_hi_user)
+           printf ("(user defined)");
+         else
+           printf ("(unknown convention)");
+       }
+      break;
 
-                 if ((vers_data & 0x8000) || vers_data > 1)
-                   {
-                     if (is_nobits || ! check_def)
-                       {
-                         Elf_External_Verneed  evn;
-                         Elf_Internal_Verneed  ivn;
-                         Elf_Internal_Vernaux  ivna;
+    case DW_AT_location:
+    case DW_AT_data_member_location:
+    case DW_AT_vtable_elem_location:
+      printf ("(");
+      decode_location_expression (block_start, pointer_size);
+      printf (")");
+      break;
 
-                         /* We must test both.  */
-                         offset = version_info
-                           [DT_VERSIONTAGIDX (DT_VERNEED)] - loadaddr;
+    default:
+      break;
+    }
 
-                         GET_DATA (offset, evn, "version need");
+  printf ("\n");
+  return data;
+}
 
-                         ivn.vn_aux  = BYTE_GET (evn.vn_aux);
-                         ivn.vn_next = BYTE_GET (evn.vn_next);
+static int
+display_debug_info (section, start, file)
+     Elf32_Internal_Shdr * section;
+     unsigned char *       start;
+     FILE *                file;
+{
+  unsigned char * end = start + section->sh_size;
+  unsigned char * section_begin = start;
 
-                         do
-                           {
-                             unsigned long  vna_off;
+  printf (_("The section %s contains:\n\n"), SECTION_NAME (section));
 
-                             vna_off = offset + ivn.vn_aux;
+  while (start < end)
+    {
+      DWARF2_External_CompUnit * external;
+      DWARF2_Internal_CompUnit   compunit;
+      unsigned char *            tags;
+      int                        i;
+      int                       level;
 
-                             do
-                               {
-                                 Elf_External_Vernaux  evna;
+      external = (DWARF2_External_CompUnit *) start;
 
-                                 GET_DATA (vna_off, evna,
-                                           "version need aux (3)");
+      compunit.cu_length        = BYTE_GET (external->cu_length);
+      compunit.cu_version       = BYTE_GET (external->cu_version);
+      compunit.cu_abbrev_offset = BYTE_GET (external->cu_abbrev_offset);
+      compunit.cu_pointer_size  = BYTE_GET (external->cu_pointer_size);
 
-                                 ivna.vna_other = BYTE_GET (evna.vna_other);
-                                 ivna.vna_next  = BYTE_GET (evna.vna_next);
-                                 ivna.vna_name  = BYTE_GET (evna.vna_name);
+      tags = start + sizeof (* external);
+      start += compunit.cu_length + sizeof (external->cu_length);
 
-                                 vna_off += ivna.vna_next;
-                               }
-                             while (ivna.vna_other != vers_data
-                                    && ivna.vna_next != 0);
+      if (compunit.cu_version != 2)
+       {
+         warn (_("Only version 2 DWARF debug information is currently supported.\n"));
+         continue;
+       }
 
-                             if (ivna.vna_other == vers_data)
-                               break;
+      printf (_("  Compilation Unit:\n"));
+      printf (_("   Length:        %ld\n"), compunit.cu_length);
+      printf (_("   Version:       %d\n"), compunit.cu_version);
+      printf (_("   Abbrev Offset: %ld\n"), compunit.cu_abbrev_offset);
+      printf (_("   Pointer Size:  %d\n"), compunit.cu_pointer_size);
 
-                             offset += ivn.vn_next;
-                           }
-                         while (ivn.vn_next != 0);
+      if (first_abbrev != NULL)
+       free_abbrevs ();
 
-                         if (ivna.vna_other == vers_data)
-                           {
-                             printf ("@%s (%d)",
-                                     strtab + ivna.vna_name, ivna.vna_other);
-                             check_def = 0;
-                           }
-                         else if (! is_nobits)
-                           error (_("bad dynamic symbol"));
-                         else
-                           check_def = 1;
-                       }
+      /* Read in the abbrevs used by this compilation unit.  */
 
-                     if (check_def)
-                       {
-                         if (vers_data != 0x8001)
-                           {
-                             Elf_Internal_Verdef     ivd;
-                             Elf_Internal_Verdaux    ivda;
-                             Elf_External_Verdaux  evda;
-                             unsigned long           offset;
+      {
+       Elf32_Internal_Shdr * sec;
+       unsigned char *       begin;
 
-                             offset =
-                               version_info [DT_VERSIONTAGIDX (DT_VERDEF)]
-                               - loadaddr;
+       /* Locate the .debug_abbrev section and process it.  */
+       for (i = 0, sec = section_headers;
+            i < elf_header.e_shnum;
+            i ++, sec ++)
+         if (strcmp (SECTION_NAME (sec), ".debug_abbrev") == 0)
+           break;
 
-                             do
-                               {
-                                 Elf_External_Verdef   evd;
+       if (i == -1 || sec->sh_size == 0)
+         {
+           warn (_("Unable to locate .debug_abbrev section!\n"));
+           return 0;
+         }
 
-                                 GET_DATA (offset, evd, "version def");
+       GET_DATA_ALLOC (sec->sh_offset, sec->sh_size, begin, unsigned char *,
+                       "debug_abbrev section data");
 
-                                 ivd.vd_ndx  = BYTE_GET (evd.vd_ndx);
-                                 ivd.vd_aux  = BYTE_GET (evd.vd_aux);
-                                 ivd.vd_next = BYTE_GET (evd.vd_next);
+       process_abbrev_section (begin + compunit.cu_abbrev_offset,
+                               begin + sec->sh_size);
 
-                                 offset += ivd.vd_next;
-                               }
-                             while (ivd.vd_ndx != (vers_data & 0x7fff)
-                                    && ivd.vd_next != 0);
+       free (begin);
+      }
 
-                             offset -= ivd.vd_next;
-                             offset += ivd.vd_aux;
+      level = 0;
+      while (tags < start)
+       {
+         int            bytes_read;
+         int            abbrev_number;
+         abbrev_entry * entry;
+         abbrev_attr  * attr;
 
-                             GET_DATA (offset, evda, "version def aux");
+         abbrev_number = read_leb128 (tags, & bytes_read, 0);
+         tags += bytes_read;
 
-                             ivda.vda_name = BYTE_GET (evda.vda_name);
+         /* A null DIE marks the end of a list of children.  */
+         if (abbrev_number == 0)
+           {
+             --level;
+             continue;
+           }
 
-                             if (psym->st_name != ivda.vda_name)
-                               printf ((vers_data & 0x8000)
-                                       ? "@%s" : "@@%s",
-                                       strtab + ivda.vda_name);
-                           }
-                       }
-                   }
-               }
+         /* Scan through the abbreviation list until we reach the
+            correct entry.  */
+         for (entry = first_abbrev;
+              entry && entry->entry != abbrev_number;
+              entry = entry->next)
+           continue;
 
-             putchar ('\n');
+         if (entry == NULL)
+           {
+             warn (_("Unable to locate entry %d in the abbreviation table\n"),
+                   abbrev_number);
+             return 0;
            }
 
-         free (symtab);
-         if (strtab != string_table)
-           free (strtab);
+         printf (_(" <%d><%x>: Abbrev Number: %d (%s)\n"),
+                 level, tags - section_begin - bytes_read,
+                 abbrev_number,
+                 get_TAG_name (entry->tag));
+
+         for (attr = entry->first_attr; attr; attr = attr->next)
+           tags = read_and_display_attr (attr->attribute,
+                                         attr->form,
+                                         tags,
+                                         compunit.cu_pointer_size);
+
+         if (entry->children)
+           ++level;
        }
     }
-  else
-    printf
-      (_("\nDynamic symbol information is not available for displaying symbols.\n"));
+
+  printf ("\n");
 
   return 1;
 }
 
 static int
-process_section_contents (file)
-     FILE * file;
+display_debug_aranges (section, start, file)
+     Elf32_Internal_Shdr * section;
+     unsigned char *       start;
+     FILE *                file;
 {
-  Elf32_Internal_Shdr *    section;
-  unsigned int  i;
+  unsigned char * end = start + section->sh_size;
 
-  if (! do_dump)
-    return 1;
+  printf (_("The section %s contains:\n\n"), SECTION_NAME (section));
 
-  for (i = 0, section = section_headers;
-       i < elf_header.e_shnum;
-       i ++, section ++)
+  while (start < end)
     {
-#ifdef SUPPORT_DISASSEMBLY
-      /* See if we need an assembly dump of this section */
+      DWARF2_External_ARange * external;
+      DWARF2_Internal_ARange   arange;
+      unsigned char *          ranges;
+      unsigned long            length;
+      unsigned long            address;
+
+      external = (DWARF2_External_ARange *) start;
+
+      arange.ar_length       = BYTE_GET (external->ar_length);
+      arange.ar_version      = BYTE_GET (external->ar_version);
+      arange.ar_info_offset  = BYTE_GET (external->ar_info_offset);
+      arange.ar_pointer_size = BYTE_GET (external->ar_pointer_size);
+      arange.ar_segment_size = BYTE_GET (external->ar_segment_size);
+
+      printf (_("  Length:                   %ld\n"), arange.ar_length);
+      printf (_("  Version:                  %d\n"), arange.ar_version);
+      printf (_("  Offset into .debug_info:  %lx\n"), arange.ar_info_offset);
+      printf (_("  Pointer Size:             %d\n"), arange.ar_pointer_size);
+      printf (_("  Segment Size:             %d\n"), arange.ar_segment_size);
+
+      printf (_("\n    Address  Length\n"));
 
-      if ((i < NUM_DUMP_SECTS) && (dump_sects[i] & DISASS_DUMP))
+      ranges = start + sizeof (* external);
+
+      for (;;)
        {
-         printf (_("\nAssembly dump of section %s\n"),
-                 SECTION_NAME (section));
+         address = byte_get (ranges, arange.ar_pointer_size);
+
+         if (address == 0)
+           break;
+
+         ranges += arange.ar_pointer_size;
+
+         length  = byte_get (ranges, arange.ar_pointer_size);
 
-         /* XXX -- to be done --- XXX */
+         ranges += arange.ar_pointer_size;
+
+         printf ("    %8.8lx %lu\n", address, length);
        }
-#endif
-      /* See if we need a hex dump of this section.  */
-      if ((i < NUM_DUMP_SECTS) && (dump_sects[i] & HEX_DUMP))
-       {
-         int             bytes;
-         int             addr;
-         unsigned char * data;
-         char *          start;
 
-         printf (_("\nHex dump of section '%s':\n"), SECTION_NAME (section));
+      start += arange.ar_length + sizeof (external->ar_length);
+    }
+
+  printf ("\n");
 
-         bytes = section->sh_size;
-         addr  = section->sh_addr;
+  return 1;
+}
 
-         GET_DATA_ALLOC (section->sh_offset, bytes, start, char *,
-                         "section data");
 
-         data = start;
+static int
+display_debug_not_supported (section, start, file)
+     Elf32_Internal_Shdr * section;
+     unsigned char *       start;
+     FILE *                file;
+{
+  printf (_("Displaying the debug contents of section %s is not yet supported.\n"),
+           SECTION_NAME (section));
 
-         while (bytes)
-           {
-             int j;
-             int k;
-             int lbytes;
+  return 1;
+}
 
-             lbytes = (bytes > 16 ? 16 : bytes);
+  /* A structure containing the name of a debug section and a pointer
+     to a function that can decode it.  */
+struct
+{
+  char * name;
+  int (* display) PARAMS((Elf32_Internal_Shdr *, unsigned char *, FILE *));
+}
+debug_displays[] =
+{
+  { ".debug_info",        display_debug_info },
+  { ".debug_abbrev",      display_debug_abbrev },
+  { ".debug_line",        display_debug_lines },
+  { ".debug_aranges",     display_debug_aranges },
+  { ".debug_pubnames",    display_debug_pubnames },
+  { ".debug_macinfo",     display_debug_not_supported },
+  { ".debug_frame",       display_debug_not_supported },
+  { ".debug_str",         display_debug_not_supported },
+  { ".debug_static_func", display_debug_not_supported },
+  { ".debug_static_vars", display_debug_not_supported },
+  { ".debug_types",       display_debug_not_supported },
+  { ".debug_weaknames",   display_debug_not_supported }
+};
 
-             printf ("  0x%8.8x ", addr);
+static int
+display_debug_section (section, file)
+     Elf32_Internal_Shdr * section;
+     FILE * file;
+{
+  char *          name = SECTION_NAME (section);
+  bfd_size_type   length;
+  unsigned char * start;
+  int             i;
 
-             switch (elf_header.e_ident [EI_DATA])
-               {
-               case ELFDATA2LSB:
-                 for (j = 15; j >= 0; j --)
-                   {
-                     if (j < lbytes)
-                       printf ("%2.2x", data [j]);
-                     else
-                       printf ("  ");
+  length = section->sh_size;
+  if (length == 0)
+    {
+      printf (_("\nSection '%s' has no debugging data.\n"), name);
+      return 0;
+    }
 
-                     if (!(j & 0x3))
-                       printf (" ");
-                   }
-                 break;
+  GET_DATA_ALLOC (section->sh_offset, length, start, unsigned char *,
+                 "debug section data");
 
-               case ELFDATA2MSB:
-                 for (j = 0; j < 16; j++)
-                   {
-                     if (j < lbytes)
-                       printf ("%2.2x", data [j]);
-                     else
-                       printf ("  ");
+  /* See if we know how to display the contents of this section.  */
+  for (i = NUM_ELEM (debug_displays); i--;)
+    if (strcmp (debug_displays[i].name, name) == 0)
+      {
+       debug_displays[i].display (section, start, file);
+       break;
+      }
 
-                     if ((j & 3) == 3)
-                       printf (" ");
-                   }
-                 break;
-               }
+  if (i == -1)
+    printf (_("Unrecognised debug section: %s\n"), name);
 
-             for (j = 0; j < lbytes; j++)
-               {
-                 k = data [j];
-                 if (k >= ' ' && k < 0x80)
-                   printf ("%c", k);
-                 else
-                   printf (".");
-               }
+  free (start);
 
-             putchar ('\n');
+  /* If we loaded in the abbrev section at some point,
+     we must release it here.  */
+  if (first_abbrev != NULL)
+    free_abbrevs ();
 
-             data  += lbytes;
-             addr  += lbytes;
-             bytes -= lbytes;
-           }
+  return 1;
+}
 
-         free (start);
-       }
+static int
+process_section_contents (file)
+     FILE * file;
+{
+  Elf32_Internal_Shdr *    section;
+  unsigned int  i;
+
+  if (! do_dump)
+    return 1;
+
+  for (i = 0, section = section_headers;
+       i < elf_header.e_shnum
+       && i < num_dump_sects;
+       i ++, section ++)
+    {
+#ifdef SUPPORT_DISASSEMBLY
+      if (dump_sects[i] & DISASS_DUMP)
+       disassemble_section (section, file);
+#endif
+      if (dump_sects[i] & HEX_DUMP)
+       dump_section (section, file);
+
+      if (dump_sects[i] & DEBUG_DUMP)
+       display_debug_section (section, file);
     }
 
+  if (i < num_dump_sects)
+    warn (_("Some sections were not dumped because they do not exist!\n"));
+
   return 1;
 }
 
@@ -2991,10 +5140,12 @@ static int
 process_mips_specific (file)
      FILE *file;
 {
-  Elf_Internal_Dyn *    entry;
+  Elf_Internal_Dyn *entry;
   size_t liblist_offset = 0;
   size_t liblistno = 0;
+  size_t conflictsno = 0;
   size_t options_offset = 0;
+  size_t conflicts_offset = 0;
 
   /* We have a lot of special sections.  Thanks SGI!  */
   if (dynamic_segment == NULL)
@@ -3013,6 +5164,12 @@ process_mips_specific (file)
       case DT_MIPS_OPTIONS:
        options_offset = entry->d_un.d_val - loadaddr;
        break;
+      case DT_MIPS_CONFLICT:
+       conflicts_offset = entry->d_un.d_val - loadaddr;
+       break;
+      case DT_MIPS_CONFLICTNO:
+       conflictsno = entry->d_un.d_val;
+       break;
       default:
        break;
       }
@@ -3026,14 +5183,14 @@ process_mips_specific (file)
                      elib, Elf32_External_Lib *, "liblist");
 
       printf ("\nSection '.liblist' contains %d entries:\n", liblistno);
-      fputs ("     Library              Time Stamp       Checksum   Version Flags\n",
+      fputs ("     Library              Time Stamp          Checksum   Version Flags\n",
             stdout);
 
       for (cnt = 0; cnt < liblistno; ++cnt)
        {
          Elf32_Lib liblist;
          time_t time;
-         char timebuf[17];
+         char timebuf[20];
 
          liblist.l_name = BYTE_GET (elib[cnt].l_name);
          time = BYTE_GET (elib[cnt].l_time_stamp);
@@ -3041,11 +5198,45 @@ process_mips_specific (file)
          liblist.l_version = BYTE_GET (elib[cnt].l_version);
          liblist.l_flags = BYTE_GET (elib[cnt].l_flags);
 
-         strftime (timebuf, 17, "%Y-%m-%dT%H:%M", gmtime (&time));
+         strftime (timebuf, 20, "%Y-%m-%dT%H:%M:%S", gmtime (&time));
 
-         printf ("%3d: %-20s %s %#10lx %-7ld %#lx\n", cnt,
+         printf ("%3d: %-20s %s %#10lx %-7ld", cnt,
                  dynamic_strings + liblist.l_name, timebuf,
-                 liblist.l_checksum, liblist.l_version, liblist.l_flags);
+                 liblist.l_checksum, liblist.l_version);
+
+         if (liblist.l_flags == 0)
+           puts (" NONE");
+         else
+           {
+             static const struct
+             {
+               const char *name;
+               int bit;
+             } l_flags_vals[] =
+               {
+                 { " EXACT_MATCH", LL_EXACT_MATCH },
+                 { " IGNORE_INT_VER", LL_IGNORE_INT_VER },
+                 { " REQUIRE_MINOR", LL_REQUIRE_MINOR },
+                 { " EXPORTS", LL_EXPORTS },
+                 { " DELAY_LOAD", LL_DELAY_LOAD },
+                 { " DELTA", LL_DELTA }
+               };
+             int flags = liblist.l_flags;
+             int fcnt;
+
+             for (fcnt = 0;
+                  fcnt < sizeof (l_flags_vals) / sizeof (l_flags_vals[0]);
+                  ++fcnt)
+               if ((flags & l_flags_vals[fcnt].bit) != 0)
+                 {
+                   fputs (l_flags_vals[fcnt].name, stdout);
+                   flags ^= l_flags_vals[fcnt].bit;
+                 }
+             if (flags != 0)
+               printf (" %#x", (unsigned int) flags);
+
+             puts ("");
+           }
        }
 
       free (elib);
@@ -3105,7 +5296,7 @@ process_mips_specific (file)
            {
            case ODK_NULL:
              /* This shouldn't happen.  */
-             printf (" NULL       %d %x", option->section, option->info);
+             printf (" NULL       %d %lx", option->section, option->info);
              break;
            case ODK_REGINFO:
              printf (" REGINFO    ");
@@ -3123,8 +5314,9 @@ process_mips_specific (file)
                  reginfo.ri_cprmask[3] = BYTE_GET (ereg->ri_cprmask[3]);
                  reginfo.ri_gp_value = BYTE_GET (ereg->ri_gp_value);
 
-                 printf ("GPR %08lx  GP %ld\n",
-                         reginfo.ri_gprmask, reginfo.ri_gp_value);
+                 printf ("GPR %08lx  GP 0x%lx\n",
+                         reginfo.ri_gprmask,
+                         (unsigned long) reginfo.ri_gp_value);
                  printf ("            CPR0 %08lx  CPR1 %08lx  CPR2 %08lx  CPR3 %08lx\n",
                          reginfo.ri_cprmask[0], reginfo.ri_cprmask[1],
                          reginfo.ri_cprmask[2], reginfo.ri_cprmask[3]);
@@ -3143,8 +5335,11 @@ process_mips_specific (file)
                  reginfo.ri_cprmask[3] = BYTE_GET (ereg->ri_cprmask[3]);
                  reginfo.ri_gp_value = BYTE_GET (ereg->ri_gp_value);
 
-                 printf ("GPR %08lx  GP %ld\n",
-                         reginfo.ri_gprmask, reginfo.ri_gp_value);
+                 printf ("GPR %08lx  GP 0x",
+                         reginfo.ri_gprmask);
+                 printf_vma (reginfo.ri_gp_value);
+                 printf ("\n");
+
                  printf ("            CPR0 %08lx  CPR1 %08lx  CPR2 %08lx  CPR3 %08lx\n",
                          reginfo.ri_cprmask[0], reginfo.ri_cprmask[1],
                          reginfo.ri_cprmask[2], reginfo.ri_cprmask[3]);
@@ -3210,18 +5405,18 @@ process_mips_specific (file)
                fputs (" R4KEOP_CLEAN", stdout);
              break;
            case ODK_GP_GROUP:
-             printf (" GP_GROUP  %#06x  self-contained %#06x",
+             printf (" GP_GROUP  %#06lx  self-contained %#06lx",
                      option->info & OGP_GROUP,
                      (option->info & OGP_SELF) >> 16);
              break;
            case ODK_IDENT:
-             printf (" IDENT     %#06x  self-contained %#06x",
+             printf (" IDENT     %#06lx  self-contained %#06lx",
                      option->info & OGP_GROUP,
                      (option->info & OGP_SELF) >> 16);
              break;
            default:
              /* This shouldn't happen.  */
-             printf (" %3d ???     %d %x",
+             printf (" %3d ???     %d %lx",
                      option->kind, option->section, option->info);
              break;
            }
@@ -3241,6 +5436,59 @@ process_mips_specific (file)
       free (eopt);
     }
 
+  if (conflicts_offset != 0 && conflictsno != 0)
+    {
+      Elf32_External_Conflict *econf32;
+      Elf64_External_Conflict *econf64;
+      Elf32_Conflict *iconf;
+      size_t cnt;
+
+      if (dynamic_symbols == NULL)
+       {
+         error (_("conflict list with without table"));
+         return 0;
+       }
+
+      iconf = (Elf32_Conflict *) malloc (conflictsno * sizeof (*iconf));
+      if (iconf == NULL)
+       {
+         error (_("Out of memory"));
+         return 0;
+       }
+
+      if (binary_class == ELFCLASS32)
+       {
+         GET_DATA_ALLOC (conflicts_offset, conflictsno * sizeof (*econf32),
+                         econf32, Elf32_External_Conflict *, "conflict");
+
+         for (cnt = 0; cnt < conflictsno; ++cnt)
+           iconf[cnt] = BYTE_GET (econf32[cnt]);
+       }
+      else
+       {
+         GET_DATA_ALLOC (conflicts_offset, conflictsno * sizeof (*econf64),
+                         econf64, Elf64_External_Conflict *, "conflict");
+
+         for (cnt = 0; cnt < conflictsno; ++cnt)
+           iconf[cnt] = BYTE_GET (econf64[cnt]);
+       }
+
+      printf (_("\nSection '.conflict' contains %d entries:\n"), conflictsno);
+      puts (_("  Num:    Index       Value  Name"));
+
+      for (cnt = 0; cnt < conflictsno; ++cnt)
+       {
+         Elf_Internal_Sym *psym = &dynamic_symbols[iconf[cnt]];
+
+         printf ("%5u: %8lu  %#10lx  %s\n",
+                 cnt, iconf[cnt], (unsigned long) psym->st_value,
+                 dynamic_strings + psym->st_name);
+       }
+
+
+      free (iconf);
+    }
+
   return 1;
 }
 
@@ -3323,11 +5571,10 @@ process_file (file_name)
 
   /* Initialise per file variables.  */
   for (i = NUM_ELEM (version_info); i--;)
-    version_info [i] = 0;
+    version_info[i] = 0;
 
   for (i = NUM_ELEM (dynamic_info); i--;)
-    dynamic_info [i] = 0;
-
+    dynamic_info[i] = 0;
 
   /* Process the file.  */
   if (show_name)
@@ -3349,6 +5596,8 @@ process_file (file_name)
 
   process_symbol_table (file);
 
+  process_syminfo (file);
+
   process_version_sections (file);
 
   process_section_contents (file);
@@ -3380,6 +5629,12 @@ process_file (file_name)
       free (dynamic_symbols);
       dynamic_symbols = NULL;
     }
+
+  if (dynamic_syminfo)
+    {
+      free (dynamic_syminfo);
+      dynamic_syminfo = NULL;
+    }
 }
 
 #ifdef SUPPORT_DISASSEMBLY
@@ -3406,6 +5661,12 @@ main (argc, argv)
      int     argc;
      char ** argv;
 {
+#if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES)
+  setlocale (LC_MESSAGES, "");
+#endif
+  bindtextdomain (PACKAGE, LOCALEDIR);
+  textdomain (PACKAGE);
+
   parse_args (argc, argv);
 
   if (optind < (argc - 1))
@@ -3414,5 +5675,8 @@ main (argc, argv)
   while (optind < argc)
     process_file (argv [optind ++]);
 
+  if (dump_sects != NULL)
+    free (dump_sects);
+
   return 0;
 }