]> 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 675f9c7c98a4c82b04499a460492a4de47fba948..549bf1a68b61cf070ea3d15ad145099ccc840ec4 100644 (file)
@@ -1,9 +1,9 @@
 /* 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>
-   
+
    This file is part of GNU Binutils.
 
    This program is free software; you can redistribute it and/or modify
 \f
 
 #include <assert.h>
-#include <sys/mman.h>
 #include <sys/stat.h>
+#include <stdio.h>
+#include <time.h>
+
+#include "bfd.h"
+
+#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
+   such as elf_mips_reloc_type()  */
+
+#define RELOC_MACROS_GEN_FUNC
+
+#include "elf/i386.h"
+#include "elf/v850.h"
+#include "elf/ppc.h"
+#include "elf/mips.h"
+#include "elf/alpha.h"
+#include "elf/arm.h"
+#include "elf/m68k.h"
+#include "elf/sparc.h"
+#include "elf/m32r.h"
+#include "elf/d10v.h"
+#include "elf/d30v.h"
+#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 "readelf.h"
 #include "bucomm.h"
 #include "getopt.h"
 
 #include <varargs.h>
 #endif
 
-unsigned int dynamic_addr;
-unsigned int dynamic_size;
-char * pint = "";
-char * program_name = "readelf";
-
-int dynamic_info [DT_JMPREL + 1];
-int version_info [16];
-
-int must_swap = 0;
-
-unsigned int rel_size;
-int loadaddr = -1;
-
-unsigned int rela_addr;
-unsigned int rela_size;
-char *                 strtab;
-int            symtab_index;
-int            lastmapped;
-char *          header;
-
-Elf_Dyn *      dpnt;
-Elf_Rel *      rpnt;
-Elf_Shdr *     elf_sections;
-Elf_Ehdr *             epnt;
-Elf_Sym *      symtab;
-
-int show_name;
-int do_dynamic;
-int do_syms;
-int do_reloc;
-int do_section;
-int do_load;
-int do_using_dynamic;
-int do_header;
-int do_dump;
-int do_version;
-long int expected_endian;
-
-char * dyntype[] =
-{
-  "NULL", "NEEDED","PLTRELSZ","PLTGOT","HASH","STRTAB","SYMTAB","RELA",
-  "RELASZ","RELAENT","STRSZ","SYMENT","INIT","FINI","SONAME","RPATH",
-  "SYMBOLIC","REL","RELSZ","RELENT","PLTREL","DEBUG","TEXTREL","JMPREL"
-};
-
-char * vertype[] =
-{
-  "VERNEEDNUM", "VERNEED", "VERDEFNUM", "VERDEF",
-  "", "", "", "", "", "", "", "", "", "", "", "VERSYM"
-};
-
-char * filtertype[] =
-{
-  "FILTER", "USED", "AUXILIARY"
-};
-
-
-char * sttinfo[] = {"NOTYPE","OBJECT","FUNC","SECTION","FILE"};
-char * stbinfo[] = {"LOCAL","GLOBAL","WEAK"};
+char *                 program_name = "readelf";
+unsigned int           dynamic_addr;
+unsigned int           dynamic_size;
+unsigned int           rela_addr;
+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                    loadaddr = 0;
+Elf_Internal_Ehdr       elf_header;
+Elf_Internal_Shdr *     section_headers;
+Elf_Internal_Dyn *      dynamic_segment;
+int                    show_name;
+int                    do_dynamic;
+int                    do_syms;
+int                    do_reloc;
+int                    do_sections;
+int                    do_segments;
+int                    do_using_dynamic;
+int                    do_header;
+int                    do_dump;
+int                    do_version;
+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)
 
-#define SECTION_NAME(X) (& header [lastmapped + (X)->sh_name])
+/* Forward declarations for dumb compilers.  */
+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;
+
+#define SECTION_NAME(X)        (string_table + (X)->sh_name)
+
+#define DT_VERSIONTAGIDX(tag)  (DT_VERNEEDNUM - (tag)) /* Reverse order! */
+
+#define BYTE_GET(field)        byte_get (field, sizeof (field))
+
+#define NUM_ELEM(array)        (sizeof (array) / sizeof ((array)[0]))
+
+#define GET_DATA_ALLOC(offset, size, var, type, reason)                        \
+  if (fseek (file, offset, SEEK_SET))                                  \
+    {                                                                  \
+      error (_("Unable to seek to start of %s at %x\n"), reason, offset); \
+      return 0;                                                                \
+    }                                                                  \
+                                                                       \
+  var = (type) malloc (size);                                          \
+                                                                       \
+  if (var == NULL)                                                     \
+    {                                                                  \
+      error (_("Out of memory allocating %d bytes for %s\n"), size, reason); \
+      return 0;                                                                \
+    }                                                                  \
+                                                                       \
+  if (fread (var, size, 1, file) != 1)                                         \
+    {                                                                  \
+      error (_("Unable to read in %d bytes of %s\n"), size, reason);   \
+      free (var);                                                      \
+      var = NULL;                                                      \
+      return 0;                                                        \
+    }
 
-#define NUM_DUMP_SECTS 100
-char dump_sects [NUM_DUMP_SECTS];
-#define HEX_DUMP       1
-#define DISASS_DUMP    2
 
-/* Forward declarations for dumb compilers.  */
-static char * get_i386_rel_type    PARAMS ((bfd_vma rtype));
-static char * get_m68k_rel_type    PARAMS ((bfd_vma rtype));
-static char * get_sparc_rel_type   PARAMS ((bfd_vma rtype));
-static char * get_m32r_rel_type    PARAMS ((bfd_vma rtype));
-static char * get_v850_rel_type    PARAMS ((bfd_vma rtype));
-static char * get_d10v_rel_type    PARAMS ((bfd_vma rtype));
-static char * get_d30v_rel_type    PARAMS ((bfd_vma rtype));
-static char * get_sh_rel_type      PARAMS ((bfd_vma rtype));
-static char * get_mn10300_rel_type PARAMS ((bfd_vma rtype));
-static char * get_mn10200_rel_type PARAMS ((bfd_vma rtype));
-static void   dump_relocations PARAMS ((Elf_Rel * rpnt, int rel_size));
-static char * get_file_type PARAMS ((unsigned short e_type));
-static char * get_machine_name PARAMS ((unsigned short e_machine));
-static char * get_segment_type PARAMS ((unsigned long p_type));
-static char * get_section_type_name PARAMS ((unsigned int sh_type));
-static void   usage PARAMS ((void));
-static void   parse_args PARAMS ((int argc, char ** argv));
-static int    process_elf_header PARAMS ((void));
-static void   process_program_headers PARAMS ((void));
-static void   process_section_headers PARAMS ((void));
-static void   process_dynamic_segment PARAMS ((void));
-static void   process_symbol_table PARAMS ((void));
-static void   process_section_contents PARAMS ((void));
-static void   process_file PARAMS ((char * file_name));
-
-
-#define SWAP2(val)  (  (((val) << 8) & (0xff << 8)) \
-                    | (((val) >> 8) & (0xff << 0)))
-     
-#define SWAP4(val)  (  (((val) << 24) & (0xff << 24)) \
-                    | (((val) <<  8) & (0xff << 16)) \
-                    | (((val) >>  8) & (0xff <<  8)) \
-                    | (((val) >> 24) & (0xff <<  0)))
-                      
-/* Warning: This macro assumes 8 bits in a char.  */
-#define BYTE_SWAP(pointer, field)                              \
-  if (sizeof ((pointer)->field) == 2)                          \
-    {                                                          \
-      unsigned short val = (pointer)->field ;                  \
-      new_header->field = SWAP2 (val);                         \
-    }                                                          \
-  else if (sizeof ((pointer)->field) != 4)                     \
-    abort ();                                                  \
-  else                                                         \
-   {                                                           \
-      unsigned long val = (pointer)->field ;                   \
-      new_header->field = SWAP4 (val);                         \
-   }
-    
+#define GET_DATA(offset, var, reason)                                  \
+  if (fseek (file, offset, SEEK_SET))                                  \
+    {                                                                  \
+      error (_("Unable to seek to %x for %s\n"), offset, reason);      \
+      return 0;                                                                \
+    }                                                                  \
+  else if (fread (& var, sizeof (var), 1, file) != 1)                  \
+    {                                                                  \
+      error (_("Unable to read data at %x for %s\n"), offset, reason); \
+      return 0;                                                                \
+    }
 
 #ifdef ANSI_PROTOTYPES
 static void
@@ -166,7 +232,7 @@ error (const char * message, ...)
   va_end (args);
   return;
 }
-                 
+
 static void
 warn (const char * message, ...)
 {
@@ -181,6 +247,7 @@ warn (const char * message, ...)
 #else
 static void
 error (va_alist)
+     va_dcl
 {
   char * message;
   va_list args;
@@ -195,7 +262,7 @@ error (va_alist)
 
 static void
 warn (va_alist)
-     va_dcl;
+     va_dcl
 {
   char * message;
   va_list args;
@@ -209,507 +276,460 @@ warn (va_alist)
 }
 #endif
 
-
-static char *
-get_i386_rel_type (rtype)
-     bfd_vma rtype;
-{
-  switch (rtype)
-    {
-    case  0: return "R_386_NONE";
-    case  1: return "R_386_32";
-    case  2: return "R_386_PC32";
-    case  3: return "R_386_GOT32";
-    case  4: return "R_386_PLT32";
-    case  5: return "R_386_COPY";
-    case  6: return "R_386_GLOB_DAT";
-    case  7: return "R_386_JMP_SLOT";
-    case  8: return "R_386_RELATIVE";
-    case  9: return "R_386_GOTOFF";
-    case 10: return "R_386_GOTPC";
-    case 20: return "R_386_16";
-    case 21: return "R_386_PC16";
-    case 22: return "R_386_PC8";
-    case 23: return "R_386_max";      
-    default: return _("*INVALID*");
-    }
-}
-
-static char *
-get_m68k_rel_type (rtype)
-     bfd_vma rtype;
-{
-  switch (rtype)
-    {
-    case  0: return "R_68K_NONE";
-    case  1: return "R_68K_32";
-    case  2: return "R_68K_16";
-    case  3: return "R_68K_8";
-    case  4: return "R_68K_PC32";
-    case  5: return "R_68K_PC16";
-    case  6: return "R_68K_PC8";
-    case  7: return "R_68K_GOT32";
-    case  8: return "R_68K_GOT16";
-    case  9: return "R_68K_GOT8";
-    case 10: return "R_68K_GOT32O";
-    case 11: return "R_68K_GOT16O";
-    case 12: return "R_68K_GOT8O";
-    case 13: return "R_68K_PLT32";
-    case 14: return "R_68K_PLT16";
-    case 15: return "R_68K_PLT8";
-    case 16: return "R_68K_PLT32O";
-    case 17: return "R_68K_PLT16O";
-    case 18: return "R_68K_PLT8O";
-    case 19: return "R_68K_COPY";
-    case 20: return "R_68K_GLOB_DAT";
-    case 21: return "R_68K_JMP_SLOT";
-    case 22: return "R_68K_RELATIVE";
-    default: return _("*INVALID*");
-    }
-}
-
-
-static char *
-get_sparc_rel_type (rtype)
-     bfd_vma rtype;
-{
-  switch (rtype)
-    {
-    case  0: return "R_SPARC_NONE";
-    case  1: return "R_SPARC_8";
-    case  2: return "R_SPARC_16";
-    case  3: return "R_SPARC_32";
-    case  4: return "R_SPARC_DISP8";
-    case  5: return "R_SPARC_DISP16";
-    case  6: return "R_SPARC_DISP32";
-    case  7: return "R_SPARC_WDISP30";
-    case  8: return "R_SPARC_WDISP22";
-    case  9: return "R_SPARC_HI22";
-    case 10: return "R_SPARC_22";
-    case 11: return "R_SPARC_13";
-    case 12: return "R_SPARC_LO10";
-    case 13: return "R_SPARC_GOT10";
-    case 14: return "R_SPARC_GOT13";
-    case 15: return "R_SPARC_GOT22";
-    case 16: return "R_SPARC_PC10";
-    case 17: return "R_SPARC_PC22";
-    case 18: return "R_SPARC_WPLT30";
-    case 19: return "R_SPARC_COPY";
-    case 20: return "R_SPARC_GLOB_DAT";
-    case 21: return "R_SPARC_JMP_SLOT";
-    case 22: return "R_SPARC_RELATIVE";
-    case 23: return "R_SPARC_UA32";
-    case 24: return "R_SPARC_10";
-    case 25: return "R_SPARC_11";
-    case 26: return "R_SPARC_64";
-    case 27: return "R_SPARC_OLO10";
-    case 28: return "R_SPARC_HH22";
-    case 29: return "R_SPARC_HM10";
-    case 30: return "R_SPARC_LM22";
-    case 31: return "R_SPARC_PC_HH22";
-    case 32: return "R_SPARC_PC_HM10";
-    case 33: return "R_SPARC_PC_LM22";
-    case 34: return "R_SPARC_WDISP16";
-    case 35: return "R_SPARC_WDISP19";
-    case 36: return "R_SPARC_UNUSED_42";
-    case 37: return "R_SPARC_7";
-    case 38: return "R_SPARC_5";
-    case 39: return "R_SPARC_6";
-    case 40: return "R_SPARC_DISP64";
-    case 41: return "R_SPARC_PLT64";
-    case 42: return "R_SPARC_HIX22";
-    case 43: return "R_SPARC_LOX10";
-    case 44: return "R_SPARC_H44";
-    case 45: return "R_SPARC_M44";
-    case 46: return "R_SPARC_L44";
-    case 47: return "R_SPARC_REGISTER";
-    case 48: return "R_SPARC_UA64";
-    case 49: return "R_SPARC_UA16";
-    case 50: return "R_SPARC_32LE";
-    default: return _("*INVALID*");
-    }
-}
-
-
-static char *
-get_m32r_rel_type (rtype)
-     bfd_vma rtype;
+static unsigned long int
+byte_get_little_endian (field, size)
+     unsigned char * field;
+     int             size;
 {
-  switch (rtype)
+  switch (size)
     {
-    case  0: return "R_M32R_NONE";
-    case  1: return "R_M32R_16";
-    case  2: return "R_M32R_32";
-    case  3: return "R_M32R_24";
-    case  4: return "R_M32R_10_PCREL";
-    case  5: return "R_M32R_18_PCREL";
-    case  6: return "R_M32R_26_PCREL";
-    case  7: return "R_M32R_HI16_ULO";
-    case  8: return "R_M32R_HI16_SLO";
-    case  9: return "R_M32R_LO16";
-    case 10: return "R_M32R_SDA16";
-    default: return _("*INVALID*");
-    }
-}
-
+    case 1:
+      return * field;
 
-static char *
-get_v850_rel_type (rtype)
-     bfd_vma rtype;
-{
-  switch (rtype)
-    {
-    case  0: return "R_V850_NONE";
-    case  1: return "R_V850_9_PCREL";
-    case  2: return "R_V850_22_PCREL";
-    case  3: return "R_V850_HI16_S";
-    case  4: return "R_V850_HI16";
-    case  5: return "R_V850_LO16";
-    case  6: return "R_V850_32";
-    case  7: return "R_V850_16";
-    case  8: return "R_V850_8";
-    case  9: return "R_V850_SDA_16_16_OFFSET";
-    case 10: return "R_V850_SDA_15_16_OFFSET";
-    case 11: return "R_V850_ZDA_16_16_OFFSET";
-    case 12: return "R_V850_ZDA_15_16_OFFSET";
-    case 13: return "R_V850_TDA_6_8_OFFSET";
-    case 14: return "R_V850_TDA_7_8_OFFSET";
-    case 15: return "R_V850_TDA_7_7_OFFSET";
-    case 16: return "R_V850_TDA_16_16_OFFSET";
-/* start-sanitize-v850e */
-    case 17: return "R_V850_TDA_4_5_OFFSET";
-    case 18: return "R_V850_TDA_4_4_OFFSET";
-    case 19: return "R_V850_SDA_16_16_SPLIT_OFFSET";
-    case 20: return "R_V850_ZDA_16_16_SPLIT_OFFSET";
-    case 21: return "R_V850_CALLT_6_7_OFFSET";
-    case 22: return "R_V850_CALLT_16_16_OFFSET";
-/* end-sanitize-v850e */
-    default: return _("*INVALID*");
-    }
-}
+    case 2:
+      return  ((unsigned int) (field [0]))
+       |    (((unsigned int) (field [1])) << 8);
 
+    case 4:
+      return  ((unsigned long) (field [0]))
+       |    (((unsigned long) (field [1])) << 8)
+       |    (((unsigned long) (field [2])) << 16)
+       |    (((unsigned long) (field [3])) << 24);
 
-static char *
-get_d10v_rel_type (rtype)
-     bfd_vma rtype;
-{
-  switch (rtype)
-    {
-    case 0: return "R_D10V_NONE";
-    case 1: return "R_D10V_10_PCREL_R";
-    case 2: return "R_D10V_10_PCREL_L";
-    case 3: return "R_D10V_16";
-    case 4: return "R_D10V_18";
-    case 5: return "R_D10V_18_PCREL";
-    case 6: return "R_D10V_32";
-    default: return _("*INVALID*");
+    default:
+      error (_("Unhandled data length: %d\n"), size);
+      abort();
     }
 }
 
-
-static char *
-get_d30v_rel_type (rtype)
-     bfd_vma rtype;
+static unsigned long int
+byte_get_big_endian (field, size)
+     unsigned char * field;
+     int             size;
 {
-  switch (rtype)
+  switch (size)
     {
-    case  0: return "R_D30V_NONE";
-    case  1: return "R_D30V_6";
-    case  2: return "R_D30V_9_PCREL";
-    case  3: return "R_D30V_9_PCREL_R";
-    case  4: return "R_D30V_15";
-    case  5: return "R_D30V_15_PCREL";
-    case  6: return "R_D30V_15_PCREL_R";
-    case  7: return "R_D30V_21";
-    case  8: return "R_D30V_21_PCREL";
-    case  9: return "R_D30V_21_PCREL_R";
-    case 10: return "R_D30V_32";
-    case 11: return "R_D30V_32_PCREL";
-    case 12: return "R_D30V_32_NORMAL";
-    default: return _("*INVALID*");
-    }
-}
-
+    case 1:
+      return * field;
 
-static char *
-get_sh_rel_type (rtype)
-     bfd_vma rtype;
-{
-  switch (rtype)
-    {
-    case  0: return "R_SH_NONE";
-    case  1: return "R_SH_DIR32";
-    case  2: return "R_SH_REL32";
-    case  3: return "R_SH_DIR8WPN";
-    case  4: return "R_SH_IND12W";
-    case  5: return "R_SH_DIR8WPL";
-    case  6: return "R_SH_DIR8WPZ";
-    case  7: return "R_SH_DIR8BP";
-    case  8: return "R_SH_DIR8W";
-    case  9: return "R_SH_DIR8L";
-    case 25: return "R_SH_SWITCH16";
-    case 26: return "R_SH_SWITCH32";
-    case 27: return "R_SH_USES";
-    case 28: return "R_SH_COUNT";
-    case 29: return "R_SH_ALIGN";
-    case 30: return "R_SH_CODE";
-    case 31: return "R_SH_DATA";
-    case 32: return "R_SH_LABEL";
-    default: return _("*INVALID*");
-    }
-}
-
-
-static char *
-get_mn10300_rel_type (rtype)
-     bfd_vma rtype;
-{
-  switch (rtype)
-    {
-    case 0: return "R_MN10300_NONE";
-    case 1: return "R_MN10300_32";
-    case 2: return "R_MN10300_16";
-    case 3: return "R_MN10300_8";
-    case 4: return "R_MN10300_PCREL32";
-    case 5: return "R_MN10300_PCREL16";
-    case 6: return "R_MN10300_PCREL8";
-    default: return _("*INVALID*");
-    }
-}
+    case 2:
+      return ((unsigned int) (field [1])) | (((int) (field [0])) << 8);
 
+    case 4:
+      return ((unsigned long) (field [3]))
+       |   (((unsigned long) (field [2])) << 8)
+       |   (((unsigned long) (field [1])) << 16)
+       |   (((unsigned long) (field [0])) << 24);
 
-static char *
-get_mn10200_rel_type (rtype)
-     bfd_vma rtype;
-{
-  switch (rtype)
-    {
-    case 0: return "R_MN10200_NONE";
-    case 1: return "R_MN10200_32";
-    case 2: return "R_MN10200_16";
-    case 3: return "R_MN10200_8";
-    case 4: return "R_MN10200_24";
-    case 5: return "R_MN10200_PCREL8";
-    case 6: return "R_MN10200_PCREL16";
-    case 7: return "R_MN10200_PCREL24";
-    default: return _("*INVALID*");
+    default:
+      error (_("Unhandled data length: %d\n"), size);
+      abort();
     }
 }
 
 
-static void
-dump_relocations (rpnt, rel_size)
-     Elf_Rel * rpnt;
-     int       rel_size;
+/* Display the contents of the relocation data
+   found at the specified offset.  */
+static int
+dump_relocations (file, rel_offset, rel_size, symtab, strtab)
+     FILE *                 file;
+     unsigned long          rel_offset;
+     unsigned long          rel_size;
+     Elf_Internal_Sym *     symtab;
+     char *                 strtab;
 {
-  int          i;
-  int          is_rela;
-  Elf_Rela * rapnt;
-  Elf_Rela * relocs = NULL;
+  unsigned int        i;
+  int                 is_rela;
+  Elf_Internal_Rel *  rels;
+  Elf_Internal_Rela * relas;
 
-  
-  rapnt = (Elf_Rela *) rpnt;
 
-  /* Compute number of relocations.  */
-  switch (epnt->e_machine)
+  /* 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:
-      rel_size = rel_size / sizeof (Elf_Rel);
-      
-      if (must_swap)
-       {
-         Elf_Rel * new_header = malloc (sizeof (* new_header) * rel_size);
+    case EM_MIPS:
+    case EM_MIPS_RS4_BE:
+      {
+       Elf32_External_Rel * erels;
 
-         if (new_header == NULL)
-           {
-             error (_("out of memory\n"));
-             return;
-           }
-         
-         memcpy (new_header, rpnt, sizeof (* new_header) * rel_size);
-      
-         rpnt   = new_header;
-         relocs = (Elf_Rela *) new_header;
-      
-         for (i = 0; i < rel_size; i++)
-           {
-             BYTE_SWAP (rpnt + i, r_offset);
-             BYTE_SWAP (rpnt + i, r_info);
-             
-             new_header ++;
-           }
-       }
+       GET_DATA_ALLOC (rel_offset, rel_size, erels,
+                       Elf32_External_Rel *, "relocs");
 
-      is_rela = 0;
-      break;
-      
+       rel_size = rel_size / sizeof (Elf32_External_Rel);
+
+       rels = (Elf_Internal_Rel *) malloc (rel_size *
+                                           sizeof (Elf_Internal_Rel));
+
+       for (i = 0; i < rel_size; i++)
+         {
+           rels[i].r_offset = BYTE_GET (erels[i].r_offset);
+           rels[i].r_info   = BYTE_GET (erels[i].r_info);
+         }
+
+       free (erels);
+
+       is_rela = 0;
+       relas   = (Elf_Internal_Rela *) rels;
+      }
+    break;
+
+      /* Targets that use RELA relocations.  */
     case EM_68K:
     case EM_SPARC:
+    case EM_PPC:
     case EM_CYGNUS_V850:
     case EM_CYGNUS_D30V:
     case EM_CYGNUS_MN10200:
     case EM_CYGNUS_MN10300:
+    case EM_CYGNUS_FR30:
     case EM_SH:
-      rel_size = rel_size / sizeof (Elf_Rela);
-      
-      if (must_swap)
-       {
-         Elf_Rela * new_header = malloc (sizeof (* new_header) * rel_size);
+    case EM_ALPHA:
+    case EM_MCORE:
+      {
+       Elf32_External_Rela * erelas;
+
+       GET_DATA_ALLOC (rel_offset, rel_size, erelas,
+                       Elf32_External_Rela *, "relocs");
+
+       rel_size = rel_size / sizeof (Elf32_External_Rela);
+
+       relas = (Elf_Internal_Rela *) malloc (rel_size *
+                                             sizeof (Elf_Internal_Rela));
+
+       for (i = 0; i < rel_size; i++)
+         {
+           relas[i].r_offset = BYTE_GET (erelas[i].r_offset);
+           relas[i].r_info   = BYTE_GET (erelas[i].r_info);
+           relas[i].r_addend = BYTE_GET (erelas[i].r_addend);
+         }
+
+       free (erelas);
+
+       is_rela = 1;
+       rels    = (Elf_Internal_Rel *) relas;
+      }
+    break;
 
-         if (new_header == NULL)
-           {
-             error (_("out of memory\n"));
-             return;
-           }
-         
-         memcpy (new_header, rpnt, sizeof (* new_header) * rel_size);
-      
-         relocs = rapnt = new_header;
-         
-         for (i = rel_size; i--;)
-           {
-             BYTE_SWAP (new_header, r_offset);
-             BYTE_SWAP (new_header, r_info);
-             BYTE_SWAP (new_header, r_addend);
-             
-             new_header ++;
-           }
-       }
-      
-      is_rela = 1;
-      break;
-      
     default:
       warn (_("Don't know about relocations on this machine architecture\n"));
-      return;
+      return 0;
     }
 
   if (is_rela)
-    printf (_("  Offset Value Type            Symbol's Value  Symbol Name  Addend\n"));
+    printf
+      (_("  Offset    Info  Type            Symbol's Value  Symbol's Name          Addend\n"));
   else
-    printf (_("  Offset Value Type            Symbol's Value  Symbol Name\n"));
-  
+    printf
+      (_("  Offset    Info  Type            Symbol's Value  Symbol's Name\n"));
+
   for (i = 0; i < rel_size; i++)
     {
-      char * rtype;
-      
+      const char *  rtype;
+      unsigned long offset;
+      unsigned long info;
+      int           symtab_index;
+
       if (is_rela)
-       rpnt = (Elf_Rel *) rapnt;
-      
-      printf ("  %5.5lx  %5.5lx ", rpnt->r_offset, rpnt->r_info);
-            
-      switch (epnt->e_machine)
+       {
+         offset = relas [i].r_offset;
+         info   = relas [i].r_info;
+       }
+      else
+       {
+         offset = rels [i].r_offset;
+         info   = rels [i].r_info;
+       }
+
+      printf ("  %8.8lx  %5.5lx ", offset, info);
+
+      switch (elf_header.e_machine)
        {
        default:
-         rtype = "UGG!";
+         rtype = NULL;
          break;
-         
+
        case EM_CYGNUS_M32R:
-         rtype = get_m32r_rel_type (ELF32_R_TYPE (rpnt->r_info));
+         rtype = elf_m32r_reloc_type (ELF32_R_TYPE (info));
          break;
-         
+
        case EM_386:
        case EM_486:
-         rtype = get_i386_rel_type (ELF32_R_TYPE (rpnt->r_info));
+         rtype = elf_i386_reloc_type (ELF32_R_TYPE (info));
          break;
-         
+
        case EM_68K:
-         rtype = get_m68k_rel_type (ELF32_R_TYPE (rpnt->r_info));
+         rtype = elf_m68k_reloc_type (ELF32_R_TYPE (info));
          break;
-         
+
        case EM_SPARC:
-         rtype = get_sparc_rel_type (ELF32_R_TYPE (rapnt->r_info));
+         rtype = elf_sparc_reloc_type (ELF32_R_TYPE (info));
          break;
-         
+
        case EM_CYGNUS_V850:
-         rtype = get_v850_rel_type (ELF32_R_TYPE (rpnt->r_info));
+         rtype = v850_reloc_type (ELF32_R_TYPE (info));
          break;
-         
+
        case EM_CYGNUS_D10V:
-         rtype = get_d10v_rel_type (ELF32_R_TYPE (rpnt->r_info));
+         rtype = elf_d10v_reloc_type (ELF32_R_TYPE (info));
          break;
-         
+
        case EM_CYGNUS_D30V:
-         rtype = get_d30v_rel_type (ELF32_R_TYPE (rpnt->r_info));
+         rtype = elf_d30v_reloc_type (ELF32_R_TYPE (info));
          break;
-         
+
        case EM_SH:
-         rtype = get_sh_rel_type (ELF32_R_TYPE (rpnt->r_info));
+         rtype = elf_sh_reloc_type (ELF32_R_TYPE (info));
          break;
-         
+
        case EM_CYGNUS_MN10300:
-         rtype = get_mn10300_rel_type (ELF32_R_TYPE (rpnt->r_info));
+         rtype = elf_mn10300_reloc_type (ELF32_R_TYPE (info));
          break;
-         
+
        case EM_CYGNUS_MN10200:
-         rtype = get_mn10200_rel_type (ELF32_R_TYPE (rpnt->r_info));
+         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;
+
+       case EM_MIPS:
+       case EM_MIPS_RS4_BE:
+         rtype = elf_mips_reloc_type (ELF32_R_TYPE (info));
+         break;
+
+       case EM_ALPHA:
+         rtype = elf_alpha_reloc_type (ELF32_R_TYPE (info));
+         break;
+
+       case EM_ARM:
+         rtype = elf_arm_reloc_type (ELF32_R_TYPE (info));
+         break;
+
+       case EM_CYGNUS_ARC:
+         rtype = elf_arc_reloc_type (ELF32_R_TYPE (info));
+         break;
+
+       case EM_PARISC:
+         rtype = elf32_hppa_reloc_type (ELF32_R_TYPE (info));
          break;
        }
+
+      if (rtype == NULL)
+       printf (_("unrecognised: %-7lx"), ELF32_R_TYPE (info));
+      else
+       printf ("%-21.21s", rtype);
+
+      symtab_index = ELF32_R_SYM (info);
+
+      if (symtab_index && symtab != NULL)
+       {
+         Elf_Internal_Sym * psym;
+
+         psym = symtab + symtab_index;
+
+         printf (" %08lx  ", (unsigned long) psym->st_value);
+
+         if (psym->st_name == 0)
+           printf ("%-25.25s",
+                   SECTION_NAME (section_headers + psym->st_shndx));
+         else if (strtab == NULL)
+           printf (_("<string table index %3ld>"), psym->st_name);
+         else
+           printf ("%-25.25s", strtab + psym->st_name);
+
+         if (is_rela)
+           printf (" + %lx", (unsigned long) relas [i].r_addend);
+       }
+
+      putchar ('\n');
+    }
+
+  free (relas);
+
+  return 1;
+}
+
+static const char *
+get_mips_dynamic_type (type)
+     unsigned long type;
+{
+  switch (type)
+    {
+    case DT_MIPS_RLD_VERSION: return "MIPS_RLD_VERSION";
+    case DT_MIPS_TIME_STAMP: return "MIPS_TIME_STAMP";
+    case DT_MIPS_ICHECKSUM: return "MIPS_ICHECKSUM";
+    case DT_MIPS_IVERSION: return "MIPS_IVERSION";
+    case DT_MIPS_FLAGS: return "MIPS_FLAGS";
+    case DT_MIPS_BASE_ADDRESS: return "MIPS_BASE_ADDRESS";
+    case DT_MIPS_MSYM: return "MIPS_MSYM";
+    case DT_MIPS_CONFLICT: return "MIPS_CONFLICT";
+    case DT_MIPS_LIBLIST: return "MIPS_LIBLIST";
+    case DT_MIPS_LOCAL_GOTNO: return "MIPS_LOCAL_GOTNO";
+    case DT_MIPS_CONFLICTNO: return "MIPS_CONFLICTNO";
+    case DT_MIPS_LIBLISTNO: return "MIPS_LIBLISTNO";
+    case DT_MIPS_SYMTABNO: return "MIPS_SYMTABNO";
+    case DT_MIPS_UNREFEXTNO: return "MIPS_UNREFEXTNO";
+    case DT_MIPS_GOTSYM: return "MIPS_GOTSYM";
+    case DT_MIPS_HIPAGENO: return "MIPS_HIPAGENO";
+    case DT_MIPS_RLD_MAP: return "MIPS_RLD_MAP";
+    case DT_MIPS_DELTA_CLASS: return "MIPS_DELTA_CLASS";
+    case DT_MIPS_DELTA_CLASS_NO: return "MIPS_DELTA_CLASS_NO";
+    case DT_MIPS_DELTA_INSTANCE: return "MIPS_DELTA_INSTANCE";
+    case DT_MIPS_DELTA_INSTANCE_NO: return "MIPS_DELTA_INSTANCE_NO";
+    case DT_MIPS_DELTA_RELOC: return "MIPS_DELTA_RELOC";
+    case DT_MIPS_DELTA_RELOC_NO: return "MIPS_DELTA_RELOC_NO";
+    case DT_MIPS_DELTA_SYM: return "MIPS_DELTA_SYM";
+    case DT_MIPS_DELTA_SYM_NO: return "MIPS_DELTA_SYM_NO";
+    case DT_MIPS_DELTA_CLASSSYM: return "MIPS_DELTA_CLASSSYM";
+    case DT_MIPS_DELTA_CLASSSYM_NO: return "MIPS_DELTA_CLASSSYM_NO";
+    case DT_MIPS_CXX_FLAGS: return "MIPS_CXX_FLAGS";
+    case DT_MIPS_PIXIE_INIT: return "MIPS_PIXIE_INIT";
+    case DT_MIPS_SYMBOL_LIB: return "MIPS_SYMBOL_LIB";
+    case DT_MIPS_LOCALPAGE_GOTIDX: return "MIPS_LOCALPAGE_GOTIDX";
+    case DT_MIPS_LOCAL_GOTIDX: return "MIPS_LOCAL_GOTIDX";
+    case DT_MIPS_HIDDEN_GOTIDX: return "MIPS_HIDDEN_GOTIDX";
+    case DT_MIPS_PROTECTED_GOTIDX: return "MIPS_PROTECTED_GOTIDX";
+    case DT_MIPS_OPTIONS: return "MIPS_OPTIONS";
+    case DT_MIPS_INTERFACE: return "MIPS_INTERFACE";
+    case DT_MIPS_DYNSTR_ALIGN: return "MIPS_DYNSTR_ALIGN";
+    case DT_MIPS_INTERFACE_SIZE: return "MIPS_INTERFACE_SIZE";
+    case DT_MIPS_RLD_TEXT_RESOLVE_ADDR: return "MIPS_RLD_TEXT_RESOLVE_ADDR";
+    case DT_MIPS_PERF_SUFFIX: return "MIPS_PERF_SUFFIX";
+    case DT_MIPS_COMPACT_SIZE: return "MIPS_COMPACT_SIZE";
+    case DT_MIPS_GP_VALUE: return "MIPS_GP_VALUE";
+    case DT_MIPS_AUX_DYNAMIC: return "MIPS_AUX_DYNAMIC";
+    default:
+      return NULL;
+    }
+}
+
+static const char *
+get_dynamic_type (type)
+     unsigned long type;
+{
+  static char buff [32];
+
+  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_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";
       
-      printf ("%-18s", rtype);
+    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";
       
-      symtab_index = ELF32_R_SYM (rpnt->r_info);
+    case DT_AUXILIARY: return "AUXILARY";
+    case DT_USED:      return "USED";
+    case DT_FILTER:    return "FILTER";
       
-      if (symtab_index)
+    default:
+      if ((type >= DT_LOPROC) && (type <= DT_HIPROC))
        {
-         Elf_Sym   ssym;
-         Elf_Sym * psym;
-         
-         psym = symtab + symtab_index;
+         const char * result;
          
-         if (must_swap)
+         switch (elf_header.e_machine)
            {
-             Elf_Sym * new_header = & ssym;
-             
-             ssym = * psym;
-             
-             BYTE_SWAP (psym, st_name);
-             BYTE_SWAP (psym, st_value);
-             /* BYTE_SWAP (psym, st_size); */
-             BYTE_SWAP (psym, st_shndx);
-             
-             psym = new_header;
+           case EM_MIPS:
+           case EM_MIPS_RS4_BE:
+             result = get_mips_dynamic_type (type);
+             break;
+           default:
+             result = NULL;
+             break;
            }
 
-         if (psym->st_name == 0)
-           printf ("    %08lx  %-15s", psym->st_value,
-                   SECTION_NAME (elf_sections + psym->st_shndx));
-         else
-           printf ("    %08lx  %-15s", psym->st_value, strtab + psym->st_name);
-           
-         if (is_rela)
-           printf (" + %lx", rapnt->r_addend);
+         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>: %lx"), type);
       
-      putchar ('\n');
-      rapnt ++;
-      rpnt ++;
+      return buff;
     }
-
-  if (relocs != NULL)
-    free (relocs);
 }
 
 static char *
 get_file_type (e_type)
-     unsigned short e_type;
+     unsigned e_type;
 {
   static char buff [32];
-  
+
   switch (e_type)
     {
-    case ET_NONE:      return _("None");
-    case ET_REL:       return _("Relocatable file");
-    case ET_EXEC:       return _("Executable file");
-    case ET_DYN:        return _("Shared object file");
-    case ET_CORE:       return _("Core file");
-      
+    case ET_NONE:      return _("NONE (None)");
+    case ET_REL:       return _("REL (Relocatable file)");
+    case ET_EXEC:       return _("EXEC (Executable file)");
+    case ET_DYN:        return _("DYN (Shared object file)");
+    case ET_CORE:       return _("CORE (Core file)");
+
     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;
@@ -718,37 +738,57 @@ get_file_type (e_type)
 
 static char *
 get_machine_name (e_machine)
-     unsigned short e_machine;
+     unsigned e_machine;
 {
   static char buff [32];
-  
+
   switch (e_machine)
     {
     case EM_NONE:              return _("None");
     case EM_M32:               return "WE32100";
     case EM_SPARC:             return "Sparc";
-    case EM_386:               return "80386";
+    case EM_386:               return "Intel 80386";
     case EM_68K:               return "MC68000";
     case EM_88K:               return "MC88000";
     case EM_486:               return "Intel 80486";
     case EM_860:               return "Intel 80860";
     case EM_MIPS:              return "MIPS R3000 big-endian";
     case EM_S370:              return "Amdahl";
-    case EM_MIPS_RS4_BE:       return "MIPS R400 big-endian";
+    case EM_MIPS_RS4_BE:       return "MIPS R4000 big-endian";
+    case EM_OLD_SPARCV9:       return "Sparc v9 (old)";
     case EM_PARISC:            return "HPPA";
+    case EM_PPC_OLD:           return "Power PC (old)";
     case EM_SPARC32PLUS:       return "Sparc v8+" ;
-    case EM_PPC:               return "Power PCC";
-    case EM_SPARCV9:           return "Sparc v9";      
+    case EM_960:               return "Intel 90860";
+    case EM_PPC:               return "PowerPC";
+    case EM_V800:              return "NEC V800";
+    case EM_FR20:              return "Fujitsu FR20";
+    case EM_RH32:              return "TRW RH32";
+    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";
     case EM_CYGNUS_D30V:        return "d30v";
-    case EM_CYGNUS_M32R:       return "M32r";
-    case EM_CYGNUS_V850:       return "v850";
+    case EM_CYGNUS_ARC:                return "Arc";
+    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);
       return buff;
@@ -756,192 +796,487 @@ get_machine_name (e_machine)
 }
 
 static char *
-get_segment_type (p_type)
-     unsigned long p_type;
+get_machine_flags (e_flags, e_machine)
+     unsigned e_flags;
+     unsigned e_machine;
 {
-  static char buff [32];
-  
-  switch (p_type)
-    {
-    case PT_NULL:       return _("Unused");
-    case PT_LOAD:       return _("Loadable");
-    case PT_DYNAMIC:   return _("Dynamic link info");
-    case PT_INTERP:     return _("Interpreter");
-    case PT_NOTE:       return _("Auxillary Info");
-    case PT_SHLIB:      return _("Shared Library");
-    case PT_PHDR:       return _("Program Headers");
+  static char buf [1024];
 
-    default:
-      if ((p_type >= PT_LOPROC) && (p_type <= PT_HIPROC))
-       return _("processor specific");
-      else
+  buf[0] = '\0';
+  if (e_flags)
+    {
+      switch (e_machine)
        {
-         sprintf (buff, _("<unknown>: %x"), p_type);
-         return buff;
-       }
-    }
-}
+       default:
+         break;
 
-static char *
-get_section_type_name (sh_type)
-     unsigned int sh_type;
-{
-  static char buff [32];
-  
-  switch (sh_type)
-    {
-    case SHT_NULL:             return _("Unused");
-    case SHT_PROGBITS:         return _("Program data");
-    case SHT_SYMTAB:           return _("Symbol table");
-    case SHT_STRTAB:           return _("String table");
-    case SHT_RELA:             return _("Relocs, addends");
-    case SHT_HASH:             return _("Symbol hash table");
-    case SHT_DYNAMIC:          return _("Dynamic linking info");
-    case SHT_NOTE:             return _("Notes");
-    case SHT_NOBITS:           return _("Space, no data");
-    case SHT_REL:              return _("Relocs, no addends");
-    case SHT_SHLIB:            return _("Shared Library info");
-    case SHT_DYNSYM:           return _("Dynamic linker symbols");
-    case SHT_GNU_verdef:       return _("Version definition");
-    case SHT_GNU_verneed:      return _("Version needs");
-    case SHT_GNU_versym:       return _("Version symbols");
-    case 0x6ffffff0:           return "VERSYM";
-    case 0x6ffffffc:           return "VERDEF";
-    case 0x7ffffffd:           return "AUXILIARY";
-    case 0x7fffffff:           return "FILTER";
+       case EM_PPC:
+         if (e_flags & EF_PPC_EMB)
+           strcat (buf, ", emb");
 
-    default:
-      if ((sh_type >= SHT_LOPROC) && (sh_type <= SHT_HIPROC))
-       return _("processor specific");
-      else if ((sh_type >= SHT_LOUSER) && (sh_type <= SHT_HIUSER))
-       return _("application specific");
-      else
-       {
-         sprintf (buff, _("<unknown>: %x"), sh_type);
-         return buff;
-       }
+         if (e_flags & EF_PPC_RELOCATABLE)
+           strcat (buf, ", relocatable");
+
+         if (e_flags & EF_PPC_RELOCATABLE_LIB)
+           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");
+
+         break;
+
+       case EM_MIPS:
+       case EM_MIPS_RS4_BE:
+         if (e_flags & EF_MIPS_NOREORDER)
+           strcat (buf, ", noreorder");
+
+         if (e_flags & EF_MIPS_PIC)
+           strcat (buf, ", pic");
+
+         if (e_flags & EF_MIPS_CPIC)
+           strcat (buf, ", cpic");
+
+         if (e_flags & EF_MIPS_ABI2)
+           strcat (buf, ", abi2");
+
+         if ((e_flags & EF_MIPS_ARCH) == E_MIPS_ARCH_1)
+           strcat (buf, ", mips1");
+
+         if ((e_flags & EF_MIPS_ARCH) == E_MIPS_ARCH_2)
+           strcat (buf, ", mips2");
+
+         if ((e_flags & EF_MIPS_ARCH) == E_MIPS_ARCH_3)
+           strcat (buf, ", mips3");
+
+         if ((e_flags & EF_MIPS_ARCH) == E_MIPS_ARCH_4)
+           strcat (buf, ", mips4");
+         break;
+       }
+    }
+
+  return buf;
+}
+
+static char *
+get_machine_data (e_data)
+     unsigned e_data;
+{
+  static char buff [32];
+
+  switch (e_data)
+    {
+    case ELFDATA2LSB: return _("ELFDATA2LSB (little endian)");
+    case ELFDATA2MSB: return _("ELFDATA2MSB (big endian)");
+    default:
+      sprintf (buff, _("<unknown>: %x"), e_data);
+      return buff;
+    }
+}
+
+static const char *
+get_mips_segment_type (type)
+     unsigned long type;
+{
+  switch (type)
+    {
+    case PT_MIPS_REGINFO:
+      return "REGINFO";
+    case PT_MIPS_RTPROC:
+      return "RTPROC";
+    case PT_MIPS_OPTIONS:
+      return "OPTIONS";
+    default:
+      break;
+    }
+
+  return NULL;
+}
+
+static const char *
+get_segment_type (p_type)
+     unsigned long p_type;
+{
+  static char buff [32];
+
+  switch (p_type)
+    {
+    case PT_NULL:       return "NULL";
+    case PT_LOAD:       return "LOAD";
+    case PT_DYNAMIC:   return "DYNAMIC";
+    case PT_INTERP:     return "INTERP";
+    case PT_NOTE:       return "NOTE";
+    case PT_SHLIB:      return "SHLIB";
+    case PT_PHDR:       return "PHDR";
+
+    default:
+      if ((p_type >= PT_LOPROC) && (p_type <= PT_HIPROC))
+       {
+         const char * result;
+         
+         switch (elf_header.e_machine)
+           {
+           case EM_MIPS:
+           case EM_MIPS_RS4_BE:
+             result = get_mips_segment_type (p_type);
+             break;
+           default:
+             result = NULL;
+             break;
+           }
+         
+         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>: %lx"), p_type);
+
+      return buff;
+    }
+}
+
+static const char *
+get_mips_section_type_name (sh_type)
+     unsigned int 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";
+    default:
+      break;
+    }
+  return NULL;
+}
+
+static const char *
+get_section_type_name (sh_type)
+     unsigned int sh_type;
+{
+  static char buff [32];
+
+  switch (sh_type)
+    {
+    case SHT_NULL:             return "NULL";
+    case SHT_PROGBITS:         return "PROGBITS";
+    case SHT_SYMTAB:           return "SYMTAB";
+    case SHT_STRTAB:           return "STRTAB";
+    case SHT_RELA:             return "RELA";
+    case SHT_HASH:             return "HASH";
+    case SHT_DYNAMIC:          return "DYNAMIC";
+    case SHT_NOTE:             return "NOTE";
+    case SHT_NOBITS:           return "NOBITS";
+    case SHT_REL:              return "REL";
+    case SHT_SHLIB:            return "SHLIB";
+    case SHT_DYNSYM:           return "DYNSYM";
+    case SHT_GNU_verdef:       return "VERDEF";
+    case SHT_GNU_verneed:      return "VERNEED";
+    case SHT_GNU_versym:       return "VERSYM";
+    case 0x6ffffff0:           return "VERSYM";
+    case 0x6ffffffc:           return "VERDEF";
+    case 0x7ffffffd:           return "AUXILIARY";
+    case 0x7fffffff:           return "FILTER";
+
+    default:
+      if ((sh_type >= SHT_LOPROC) && (sh_type <= SHT_HIPROC))
+       {
+         const char * result;
+
+         switch (elf_header.e_machine)
+           {
+           case EM_MIPS:
+           case EM_MIPS_RS4_BE:
+             result = get_mips_section_type_name (sh_type);
+             break;
+           default:
+             result = NULL;
+             break;
+           }
+
+         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+%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'},
-  {"segments", no_argument, 0, 'l'},
-  {"sections", 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
 usage ()
 {
-  fprintf (stderr, _("Usage: readelf {options} elf-file(s)\n"));
-  fprintf (stderr, _("  Options are:\n"));
-  fprintf (stderr, _("  -a or --all               Display all the information\n"));
-  fprintf (stderr, _("  -h or --file-header       Display the ELF file header\n"));
-  fprintf (stderr, _("  -l or --program-headers or --segments\n"));
-  fprintf (stderr, _("                            Display the program headers\n"));
-  fprintf (stderr, _("  -S or --sections          Display the sections' headers\n"));
-  fprintf (stderr, _("  -s or --symbols           Display the symbol table\n"));
-  fprintf (stderr, _("  -r or --relocs            Display the relocations (if present)\n"));
-  fprintf (stderr, _("  -d or --dynamic           Display the dynamic section (if present)\n"));
-  fprintf (stderr, _("  -V or --version-info      Display the version sections (if present)\n"));
-  fprintf (stderr, _("  -D or --use-dynamic       Use the dynamic section info when displaying symbols\n"));
-  fprintf (stderr, _("  -x <number> or --hex-dump=<number>\n"));
-  fprintf (stderr, _("                            Dump the contents of section <number>\n"));
-#ifdef SUPPORT_DISASSEMBLY  
-  fprintf (stderr, _("  -i <number> or --instruction-dump=<number>\n"));
-  fprintf (stderr, _("                            Disassemble the contents of section <number>\n"));
-#endif  
-  fprintf (stderr, _("  -v or --version           Display the version number of readelf\n"));
-  fprintf (stderr, _("  -H or --help              Display this information\n"));
-  
+  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 --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 --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"));
+
   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;
      char ** argv;
 {
-  char c;
-  
+  int c;
+
   if (argc < 2)
     usage ();
 
   while ((c = getopt_long
-         (argc, argv, "rsahldSDx: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;
-         
+
        case 'a':
-         do_syms++;
-         do_reloc++;
-         do_dynamic++;
-         do_header++;
-         do_section++;
-         do_load++;
-         do_version++;
+         do_syms ++;
+         do_reloc ++;
+         do_dynamic ++;
+         do_header ++;
+         do_sections ++;
+         do_segments ++;
+         do_version ++;
+         do_histogram ++;
+         break;
+       case 'e':
+         do_header ++;
+         do_sections ++;
+         do_segments ++;
          break;
        case 'D':
-         do_using_dynamic++;
+         do_using_dynamic ++;
          break;
        case 'r':
-         do_reloc++;
+         do_reloc ++;
          break;
        case 'h':
-         do_header++;
+         do_header ++;
          break;
        case 'l':
-         do_load++;
+         do_segments ++;
          break;
        case 's':
-         do_syms++;
+         do_syms ++;
          break;
        case 'S':
-         do_section++;
+         do_section++;
          break;
        case 'd':
-         do_dynamic++;
+         do_dynamic ++;
          break;
        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;
-#ifdef SUPPORT_DISASSEMBLY       
+       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;
@@ -962,1247 +1297,4343 @@ parse_args (argc, argv)
        }
     }
 
-  if (!do_dynamic && !do_syms && !do_reloc && !do_section
-      && !do_load && !do_header && !do_dump && !do_version)
+  if (!do_dynamic && !do_syms && !do_reloc && !do_sections
+      && !do_segments && !do_header && !do_dump && !do_version
+      && !do_histogram && !do_debugging)
     usage ();
   else if (argc < 3)
-    warn (_("Nothing to do.\n"));
+    {
+      warn (_("Nothing to do.\n"));
+      usage();
+    }
 }
 
-static int
-process_elf_header ()
+static const char *
+get_elf_class (elf_class)
+     unsigned char elf_class;
 {
-  if (   epnt->e_ident [EI_MAG0] != ELFMAG0
-      || epnt->e_ident [EI_MAG1] != ELFMAG1
-      || epnt->e_ident [EI_MAG2] != ELFMAG2
-      || epnt->e_ident [EI_MAG3] != ELFMAG3)
+  switch (elf_class)
     {
-      error (_("Not an ELF file - it has the wrong magic bytes at the start\n"));
-      return 0;
+    case ELFCLASSNONE: return _("none");
+    case ELFCLASS32:   return _("ELF32");
+    case ELFCLASS64:   return _("ELF64");
+    default:           return _("<unknown>");
     }
-    
-  if (epnt->e_ident [EI_CLASS] != ELFCLASS32)
+}
+
+static const char *
+get_data_encoding (encoding)
+     unsigned char encoding;
+{
+  switch (encoding)
     {
-      error (_("Not a 32 bit ELF file\n"));
-      return 0;
+    case ELFDATANONE: return _("none");
+    case ELFDATA2LSB: return _("2's compilment, little endian");
+    case ELFDATA2MSB: return _("2's compilment, big endian");
+    default:          return _("<unknown>");
     }
-    
-  if (epnt->e_ident [EI_DATA] != expected_endian)
-    must_swap = 1;
-    
-  if (must_swap)
+}
+
+static const char *
+get_osabi_name (osabi)
+     unsigned char osabi;
+{
+  switch (osabi)
     {
-      Elf_Ehdr * new_header = malloc (sizeof (* new_header));
-      
-      if (new_header == NULL)
-       {
-         error (_("out of memory\n"));
-         return 0;
-       }
-      
-      memcpy (new_header, epnt, sizeof (* new_header));
-      
-      BYTE_SWAP (epnt, e_type);
-      BYTE_SWAP (epnt, e_machine);
-      BYTE_SWAP (epnt, e_version);
-      BYTE_SWAP (epnt, e_entry);
-      BYTE_SWAP (epnt, e_phoff);
-      BYTE_SWAP (epnt, e_shoff);
-      BYTE_SWAP (epnt, e_flags);
-      BYTE_SWAP (epnt, e_ehsize);
-      BYTE_SWAP (epnt, e_phentsize);
-      BYTE_SWAP (epnt, e_phnum);
-      BYTE_SWAP (epnt, e_shentsize);
-      BYTE_SWAP (epnt, e_shnum);
-      BYTE_SWAP (epnt, e_shstrndx);
-      
-      epnt = new_header;
+    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 ()
+{
+  if (   elf_header.e_ident [EI_MAG0] != ELFMAG0
+      || elf_header.e_ident [EI_MAG1] != ELFMAG1
+      || elf_header.e_ident [EI_MAG2] != ELFMAG2
+      || elf_header.e_ident [EI_MAG3] != ELFMAG3)
+    {
+      error
+       (_("Not an ELF file - it has the wrong magic bytes at the start\n"));
+      return 0;
     }
-    
+
   if (do_header)
     {
       int i;
-      
-      printf (_("ELF Header....\n"));
-      printf (_(" Magic:   "));
+
+      printf (_("ELF Header:\n"));
+      printf (_("  Magic:   "));
       for (i = 0; i < EI_NIDENT; i ++)
-       printf ("%2.2x ", epnt->e_ident [i]);
-      printf ("\n"); 
-      printf (_(" Type:                              %s\n"), get_file_type (epnt->e_type));
-      printf (_(" Machine:                           %s\n"), get_machine_name (epnt->e_machine));
-      printf (_(" Version:                           %x\n"), epnt->e_version);
-      printf (_(" Entry point address:               %x\n"), epnt->e_entry);
-      printf (_(" Start of program headers:          %d (bytes into file)\n"), epnt->e_phoff);
-      printf (_(" Start of section headers:          %d (bytes into file)\n"), epnt->e_shoff);
-      printf (_(" Flags:                             %x\n"), epnt->e_flags);
-      printf (_(" Size of this header:               %d (bytes)\n"), epnt->e_ehsize);
-      printf (_(" Size of program headers:           %d (bytes)\n"), epnt->e_phentsize);
-      printf (_(" Number of program headers:         %d\n"), epnt->e_phnum);
-      printf (_(" Size of section headers:           %d (bytes)\n"), epnt->e_shentsize);
-      printf (_(" Number of section headers:         %d\n"), epnt->e_shnum);
-      printf (_(" Section header string table index: %d\n"), epnt->e_shstrndx);
+       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"),
+             get_machine_name (elf_header.e_machine));
+      printf (_("  Version:                           0x%lx\n"),
+             (unsigned long) elf_header.e_version);
+      printf (_("  Data:                              %s\n"),
+             get_machine_data (elf_header.e_ident [EI_DATA]));
+      printf (_("  Entry point address:               0x%lx\n"),
+             (unsigned long) elf_header.e_entry);
+      printf (_("  Start of program headers:          %ld (bytes into file)\n"),
+             (long) elf_header.e_phoff);
+      printf (_("  Start of section headers:          %ld (bytes into file)\n"),
+             (long) elf_header.e_shoff);
+      printf (_("  Flags:                             0x%lx%s\n"),
+             (unsigned long) elf_header.e_flags,
+             get_machine_flags (elf_header.e_flags, elf_header.e_machine));
+      printf (_("  Size of this header:               %ld (bytes)\n"),
+             (long) elf_header.e_ehsize);
+      printf (_("  Size of program headers:           %ld (bytes)\n"),
+             (long) elf_header.e_phentsize);
+      printf (_("  Number of program headers:         %ld\n"),
+             (long) elf_header.e_phnum);
+      printf (_("  Size of section headers:           %ld (bytes)\n"),
+             (long) elf_header.e_shentsize);
+      printf (_("  Number of section headers:         %ld\n"),
+             (long) elf_header.e_shnum);
+      printf (_("  Section header string table index: %ld\n"),
+             (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;
 }
 
 
-static void
-process_program_headers ()
+static int
+process_program_headers (file)
+     FILE * file;
 {
-  Elf_Phdr * elf_segments;
-  Elf_Phdr * ppnt;
-  int         i;
-  
-  if (epnt->e_phnum == 0)
+  Elf32_External_Phdr * phdrs;
+  Elf32_Internal_Phdr * program_headers;
+  Elf32_Internal_Phdr * segment;
+  unsigned int         i;
+
+  if (elf_header.e_phnum == 0)
     {
-      if (do_load)
-       printf (_("\nThere are no program headers in this file\n"));
-      return;
+      if (do_segments)
+       printf (_("\nThere are no program headers in this file.\n"));
+      return 1;
     }
-  
-  if (do_load && !do_header)
+
+  if (do_segments && !do_header)
     {
-      printf (_("\nElf file is %s\n"), get_file_type (epnt->e_type));
-      printf (_("Entry point 0x%x\n"), epnt->e_entry);
-      printf (_("There are %d program headers, starting at offset %x:\n"),
-             epnt->e_phnum, epnt->e_phoff);
+      printf (_("\nElf file is %s\n"), get_file_type (elf_header.e_type));
+      printf (_("Entry point 0x%lx\n"), (unsigned long) elf_header.e_entry);
+      printf (_("There are %d program headers, starting at offset %lx:\n"),
+             elf_header.e_phnum, (unsigned long) elf_header.e_phoff);
     }
 
-  if (must_swap)
-    {
-      Elf_Phdr * new_header = malloc (sizeof (* new_header) * epnt->e_phnum);
+  GET_DATA_ALLOC (elf_header.e_phoff,
+                 elf_header.e_phentsize * elf_header.e_phnum,
+                 phdrs, Elf32_External_Phdr *, "program headers");
 
-      if (new_header == NULL)
-       {
-         error (_("out of memory\n"));
-         return;
-       }
-      
-      memcpy (new_header, & header [epnt->e_phoff],
-             sizeof (* new_header) * epnt->e_phnum);
-      
-      elf_segments = ppnt = new_header;
-      
-      for (i = 0; i < epnt->e_phnum; i++)
-       {
-         BYTE_SWAP (ppnt + i, p_type);
-         BYTE_SWAP (ppnt + i, p_flags);
-         BYTE_SWAP (ppnt + i, p_offset);
-         BYTE_SWAP (ppnt + i, p_vaddr);
-         BYTE_SWAP (ppnt + i, p_paddr);
-         BYTE_SWAP (ppnt + i, p_filesz);
-         BYTE_SWAP (ppnt + i, p_memsz);
-         BYTE_SWAP (ppnt + i, p_align);
-         
-         new_header ++;
-       }
+  program_headers = (Elf32_Internal_Phdr *) malloc
+    (elf_header.e_phnum * sizeof (Elf32_Internal_Phdr));
+
+  if (program_headers == NULL)
+    {
+      error (_("Out of memory\n"));
+      return 0;
     }
-  else
+
+  for (i = 0, segment = program_headers;
+       i < elf_header.e_phnum;
+       i ++, segment ++)
     {
-      ppnt = (Elf_Phdr *) & header [epnt->e_phoff];
-      elf_segments = NULL;
+      segment->p_type   = BYTE_GET (phdrs[i].p_type);
+      segment->p_offset = BYTE_GET (phdrs[i].p_offset);
+      segment->p_vaddr  = BYTE_GET (phdrs[i].p_vaddr);
+      segment->p_paddr  = BYTE_GET (phdrs[i].p_paddr);
+      segment->p_filesz = BYTE_GET (phdrs[i].p_filesz);
+      segment->p_memsz  = BYTE_GET (phdrs[i].p_memsz);
+      segment->p_flags  = BYTE_GET (phdrs[i].p_flags);
+      segment->p_align  = BYTE_GET (phdrs[i].p_align);
     }
-    
-  if (do_load)
+
+  free (phdrs);
+
+  if (do_segments)
     {
-      printf (_("\nProgram Header%s....\n"), epnt->e_phnum > 1 ? "s" : "");
-      printf (_(" Type        Offset  VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align\n"));
+      printf
+       (_("\nProgram Header%s:\n"), elf_header.e_phnum > 1 ? "s" : "");
+      printf
+       (_("  Type        Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align\n"));
     }
 
   loadaddr = -1;
   dynamic_addr = 0;
 
-  for (i = 0; i < epnt->e_phnum; i++)
+  for (i = 0, segment = program_headers;
+       i < elf_header.e_phnum;
+       i ++, segment ++)
     {
-      if (loadaddr == -1 && ppnt->p_type == PT_LOAD)
-       loadaddr = (ppnt->p_vaddr & 0xfffff000)
-         - (ppnt->p_offset & 0xfffff000);
-      
-      if (do_load)
+      if (do_segments)
        {
-         printf ("  %-10s ", get_segment_type (ppnt->p_type));
-         printf ("0x%5.5lx ",ppnt->p_offset);
-         printf ("0x%8.8lx ",ppnt->p_vaddr);
-         printf ("0x%8.8lx ",ppnt->p_paddr);
-         printf ("0x%5.5lx 0x%5.5lx ",ppnt->p_filesz, ppnt->p_memsz);
+         printf ("  %-11.11s ", get_segment_type (segment->p_type));
+         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);
+         printf ("0x%5.5lx ", (unsigned long) segment->p_memsz);
          printf ("%c%c%c ",
-                 (ppnt->p_flags & 4 ? 'R' : ' '),
-                 (ppnt->p_flags & 2 ? 'W' : ' '),
-                 (ppnt->p_flags & 1 ? 'E' : ' '));
-         printf ("%#lx", ppnt->p_align);
+                 (segment->p_flags & PF_R ? 'R' : ' '),
+                 (segment->p_flags & PF_W ? 'W' : ' '),
+                 (segment->p_flags & PF_X ? 'E' : ' '));
+         printf ("%#lx", (unsigned long) segment->p_align);
        }
-      
-      if (ppnt->p_type == PT_DYNAMIC)
+
+      switch (segment->p_type)
        {
+       case PT_LOAD:
+         if (loadaddr == -1)
+           loadaddr = (segment->p_vaddr & 0xfffff000)
+             - (segment->p_offset & 0xfffff000);
+         break;
+
+       case PT_DYNAMIC:
          if (dynamic_addr)
-           error (_("more than one dynamic section\n"));
-         
-         dynamic_addr = ppnt->p_offset;
-         dynamic_size = ppnt->p_filesz;
-       }
-      
-      if (ppnt->p_type == PT_INTERP)
-       {
-         if (do_load)
-           printf (_("\nRequesting program interpreter [%s]"),
-                   & header [ppnt->p_offset]);
-         pint = strdup (& header [ppnt->p_offset]);
+           error (_("more than one dynamic segment\n"));
+
+         dynamic_addr = segment->p_offset;
+         dynamic_size = segment->p_filesz;
+         break;
+
+       case PT_INTERP:
+         if (fseek (file, segment->p_offset, SEEK_SET))
+           error (_("Unable to find program interpreter name\n"));
+         else
+           {
+             program_interpreter[0] = 0;
+             fscanf (file, "%63s", program_interpreter);
+
+             if (do_segments)
+               printf (_("\n      [Requesting program interpreter: %s]"),
+                   program_interpreter);
+           }
+         break;
        }
-      
-      if (do_load)
+
+      if (do_segments)
        putc ('\n', stdout);
-      
-      ppnt ++;
     }
 
-  if (do_load)
+  if (loadaddr == -1)
+    {
+      /* Very strange. */
+      loadaddr = 0;
+    }
+
+  if (do_segments && section_headers != NULL)
     {
       printf (_("\n Section to Segment mapping:\n"));
       printf (_("  Segment Sections...\n"));
 
-      if (elf_segments)
-       ppnt = elf_segments;
-      else     
-       ppnt = (Elf_Phdr *) & header [epnt->e_phoff];
-      
-      for (i = 0; i < epnt->e_phnum; i++, ppnt++)
+      assert (string_table != NULL);
+
+      for (i = 0; i < elf_header.e_phnum; i++)
        {
-         int j;
-         Elf_Shdr * spnt;
-         
+         int        j;
+         Elf32_Internal_Shdr * section;
+
+         segment = program_headers + i;
+         section = section_headers;
+
          printf ("   %2.2d     ", i);
-         
-         spnt = (Elf_Shdr *) & header [epnt->e_shoff];
 
-         if (must_swap)
-           {
-             lastmapped = SWAP4 (spnt[epnt->e_shstrndx].sh_offset);
-             
-             for (j = 0; j < epnt->e_shnum; j++)
-               {
-                 bfd_vma addr; 
-                 bfd_size_type size;
-                 unsigned int  name;
-
-                 addr = SWAP4 (spnt[j].sh_addr);
-                 size = SWAP4 (spnt[j].sh_size);
-                 name = SWAP4 (spnt[j].sh_name);
-                 
-                 if (size > 0
-                     && (addr >= ppnt->p_vaddr)
-                     && (addr + size) <= (ppnt->p_vaddr + ppnt->p_memsz))
-                   printf ("%s ", header + lastmapped + name);
-               }
-           }
-         else
+         for (j = 0; j < elf_header.e_shnum; j++, section ++)
            {
-             lastmapped = spnt[epnt->e_shstrndx].sh_offset;
-             
-             for (j = 0; j < epnt->e_shnum; j++, spnt++)
-               {
-                 if (spnt->sh_size > 0
-                     && (spnt->sh_addr >= ppnt->p_vaddr)
-                     && (spnt->sh_addr + spnt->sh_size)
-                     <= (ppnt->p_vaddr + ppnt->p_memsz))
-                   printf ("%s ", SECTION_NAME (spnt));
-               }
+             if (section->sh_size > 0
+                 /* Compare allocated sections by VMA, unallocated
+                    sections by file offset.  */
+                 && (section->sh_flags & SHF_ALLOC
+                     ? (section->sh_addr >= segment->p_vaddr
+                        && section->sh_addr + section->sh_size
+                        <= segment->p_vaddr + segment->p_memsz)
+                     : (section->sh_offset >= segment->p_offset
+                        && (section->sh_offset + section->sh_size
+                            <= segment->p_offset + segment->p_filesz))))
+               printf ("%s ", SECTION_NAME (section));
            }
 
          putc ('\n',stdout);
        }
     }
-  
-  if (elf_segments)
-    free (elf_segments);
+
+  free (program_headers);
+
+  return 1;
 }
 
 
-static void
-process_section_headers ()
+static int
+get_section_headers (file)
+     FILE * file;
 {
-  Elf_Shdr * spnt;
-  int          i;
+  Elf32_External_Shdr * shdrs;
+  Elf32_Internal_Shdr * internal;
+  unsigned int          i;
+
+  GET_DATA_ALLOC (elf_header.e_shoff,
+                 elf_header.e_shentsize * elf_header.e_shnum,
+                 shdrs, Elf32_External_Shdr *, "section headers");
+
+  section_headers = (Elf32_Internal_Shdr *) malloc
+    (elf_header.e_shnum * sizeof (Elf32_Internal_Shdr));
 
-  if (must_swap)
+  if (section_headers == NULL)
     {
-      Elf_Shdr * new_header = malloc (sizeof (* new_header) * epnt->e_shnum);
-      
-      if (new_header == NULL)
-       {
-         error (_("out of memory\n"));
-         return;
-       }
-      
-      memcpy (new_header, & header [epnt->e_shoff],
-             sizeof (* new_header) * epnt->e_shnum);
-      
-      elf_sections = spnt = new_header;
-      
-      for (i = 0; i < epnt->e_shnum; i++)
-       {
-         BYTE_SWAP (spnt + i, sh_name);
-         BYTE_SWAP (spnt + i, sh_type);
-         BYTE_SWAP (spnt + i, sh_flags);
-         BYTE_SWAP (spnt + i, sh_addr);
-         BYTE_SWAP (spnt + i, sh_offset);
-         BYTE_SWAP (spnt + i, sh_size);
-         BYTE_SWAP (spnt + i, sh_link);
-         BYTE_SWAP (spnt + i, sh_info);
-         BYTE_SWAP (spnt + i, sh_addralign);
-         BYTE_SWAP (spnt + i, sh_entsize);
-         
-         new_header ++;
-       }
+      error (_("Out of memory\n"));
+      return 0;
     }
-  else
+
+  for (i = 0, internal = section_headers;
+       i < elf_header.e_shnum;
+       i ++, internal ++)
     {
-      elf_sections = spnt = (Elf_Shdr *) & header [epnt->e_shoff];
+      internal->sh_name      = BYTE_GET (shdrs[i].sh_name);
+      internal->sh_type      = BYTE_GET (shdrs[i].sh_type);
+      internal->sh_flags     = BYTE_GET (shdrs[i].sh_flags);
+      internal->sh_addr      = BYTE_GET (shdrs[i].sh_addr);
+      internal->sh_offset    = BYTE_GET (shdrs[i].sh_offset);
+      internal->sh_size      = BYTE_GET (shdrs[i].sh_size);
+      internal->sh_link      = BYTE_GET (shdrs[i].sh_link);
+      internal->sh_info      = BYTE_GET (shdrs[i].sh_info);
+      internal->sh_addralign = BYTE_GET (shdrs[i].sh_addralign);
+      internal->sh_entsize   = BYTE_GET (shdrs[i].sh_entsize);
     }
-  
-  spnt += epnt->e_shstrndx;
-  lastmapped = spnt->sh_offset;
-  spnt = elf_sections;
-  
-  if (! do_section || (epnt->e_shnum == 0))
-    return;
-  
-  if (! do_header)
-    printf (_("There are %d section headers, starting at offset %x:\n"),
-           epnt->e_shnum, epnt->e_shoff);
-  
-  printf (_("\nSection Header%s....\n"), epnt->e_shnum > 1 ? "s" : "");
-  printf (_("  [Nr] Name           Type               Addr     Off    Size   ES Flg Lk In Al\n"));
-      
-  for (i = 0; i < epnt->e_shnum; i++)
+
+  free (shdrs);
+
+  return 1;
+}
+
+static Elf_Internal_Sym *
+get_elf_symbols (file, offset, number)
+     FILE * file;
+     unsigned long offset;
+     unsigned long number;
+{
+  Elf32_External_Sym * esyms;
+  Elf_Internal_Sym *   isyms;
+  Elf_Internal_Sym *   psym;
+  unsigned int         j;
+
+  GET_DATA_ALLOC (offset, number * sizeof (Elf32_External_Sym),
+                 esyms, Elf32_External_Sym *, "symbols");
+
+  isyms = (Elf_Internal_Sym *) malloc (number * sizeof (Elf_Internal_Sym));
+
+  if (isyms == NULL)
     {
-      printf ("  [%2d] %-14s", i, SECTION_NAME (spnt));
-         
-      printf (" %-18s ",get_section_type_name (spnt->sh_type));
+      error (_("Out of memory\n"));
+      free (esyms);
+
+      return NULL;
+    }
+
+  for (j = 0, psym = isyms;
+       j < number;
+       j ++, psym ++)
+    {
+      psym->st_name  = BYTE_GET (esyms[j].st_name);
+      psym->st_value = BYTE_GET (esyms[j].st_value);
+      psym->st_size  = BYTE_GET (esyms[j].st_size);
+      psym->st_shndx = BYTE_GET (esyms[j].st_shndx);
+      psym->st_info  = BYTE_GET (esyms[j].st_info);
+      psym->st_other = BYTE_GET (esyms[j].st_other);
+    }
+
+  free (esyms);
+
+  return isyms;
+}
+
+static int
+process_section_headers (file)
+     FILE * file;
+{
+  Elf32_Internal_Shdr * section;
+  int        i;
+
+  section_headers = NULL;
+
+  if (elf_header.e_shnum == 0)
+    {
+      if (do_sections)
+       printf (_("\nThere are no sections in this file.\n"));
+
+      return 1;
+    }
+
+  if (do_sections && !do_header)
+    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;
+
+  /* Read in the string table, so that we have names to display.  */
+  section = section_headers + elf_header.e_shstrndx;
+
+  if (section->sh_size != 0)
+    {
+      unsigned long string_table_offset;
+
+      string_table_offset = section->sh_offset;
+
+      GET_DATA_ALLOC (section->sh_offset, section->sh_size,
+                     string_table, char *, "string table");
+    }
+
+  /* Scan the sections for the dynamic symbol 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)
+           {
+             error (_("File contains multiple dynamic symbol tables\n"));
+             continue;
+           }
+
+         dynamic_symbols = get_elf_symbols
+           (file, section->sh_offset,
+            section->sh_size / section->sh_entsize);
+       }
+      else if (section->sh_type == SHT_STRTAB
+              && strcmp (name, ".dynstr") == 0)
+       {
+         if (dynamic_strings != NULL)
+           {
+             error (_("File contains multiple dynamic string tables\n"));
+             continue;
+           }
+
+         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)
+    return 1;
+
+  printf (_("\nSection Header%s:\n"), elf_header.e_shnum > 1 ? "s" : "");
+  printf
+    (_("  [Nr] Name              Type            Addr     Off    Size   ES Flg Lk Inf Al\n"));
+
+  for (i = 0, section = section_headers;
+       i < elf_header.e_shnum;
+       i ++, section ++)
+    {
+      printf ("  [%2d] %-17.17s %-15.15s ",
+             i,
+             SECTION_NAME (section),
+             get_section_type_name (section->sh_type));
+
       printf ( "%8.8lx %6.6lx %6.6lx %2.2lx",
-              spnt->sh_addr,
-              spnt->sh_offset,
-              spnt->sh_size,
-              spnt->sh_entsize);
-      
-      printf (" %c%c%c %2ld %2lx %ld \n",
-             (spnt->sh_flags & 1 ? 'W' : ' '),
-             (spnt->sh_flags & 2 ? 'A' : ' '),
-             (spnt->sh_flags & 4 ? 'X' : ' '),
-             spnt->sh_link,
-             spnt->sh_info,
-             spnt->sh_addralign);
-      spnt ++;
+              (unsigned long) section->sh_addr,
+              (unsigned long) section->sh_offset,
+              (unsigned long) section->sh_size,
+              (unsigned long) section->sh_entsize);
+
+      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' : ' '),
+             (unsigned long) section->sh_link,
+             (unsigned long) section->sh_info,
+             (unsigned long) section->sh_addralign);
     }
+
+  return 1;
 }
 
-/* Parse the dynamic segment */
-static void
-process_dynamic_segment ()
+/* Process the reloc section.  */
+static int
+process_relocs (file)
+     FILE * file;
 {
-  Elf_Dyn * elf_dynamic;
-  unsigned int i;
-  
-  dynamic_size = dynamic_size / sizeof (Elf_Dyn);
+  unsigned long    rel_size;
+  unsigned long           rel_offset;
 
-  if (must_swap)
+
+  if (!do_reloc)
+    return 1;
+
+  if (do_using_dynamic)
     {
-      Elf_Dyn * new_header = malloc (sizeof (* new_header) * dynamic_size);
-      
-      if (new_header == NULL)
+      rel_size   = 0;
+      rel_offset = 0;
+
+      if (dynamic_info[DT_REL])
        {
-         error (_("out of memory\n"));
-         return;
+         rel_offset = dynamic_info[DT_REL];
+         rel_size   = dynamic_info[DT_RELSZ];
        }
-      
-      memcpy (new_header, & header [dynamic_addr],
-             sizeof (* new_header) * dynamic_size);
-      
-      elf_dynamic = dpnt = new_header;
-      
-      for (i = 0; i < dynamic_size; i++)
+      else if (dynamic_info [DT_RELA])
        {
-         BYTE_SWAP (dpnt + i, d_tag);
-         BYTE_SWAP (dpnt + i, d_un.d_ptr);
-         
-         new_header ++;
+         rel_offset = dynamic_info[DT_RELA];
+         rel_size   = dynamic_info[DT_RELASZ];
+       }
+      else if (dynamic_info[DT_JMPREL])
+       {
+         rel_offset = dynamic_info[DT_JMPREL];
+         rel_size   = dynamic_info[DT_PLTRELSZ];
+       }
+
+      if (rel_size)
+       {
+         printf
+           (_("\nRelocation section at offset 0x%lx contains %ld bytes:\n"),
+            rel_offset, rel_size);
+
+         dump_relocations (file, rel_offset - loadaddr, rel_size,
+                           dynamic_symbols, dynamic_strings);
        }
+      else
+       printf (_("\nThere are no dynamic relocations in this file.\n"));
     }
   else
     {
-      dpnt = (Elf_Dyn *) & header [dynamic_addr];
-      elf_dynamic = NULL;
+      Elf32_Internal_Shdr *     section;
+      unsigned long            i;
+      int                      found = 0;
+
+      for (i = 0, section = section_headers;
+          i < elf_header.e_shnum;
+          i++, section ++)
+       {
+         if (   section->sh_type != SHT_RELA
+             && section->sh_type != SHT_REL)
+           continue;
+
+         rel_offset = section->sh_offset;
+         rel_size   = section->sh_size;
+
+         if (rel_size)
+           {
+             Elf32_Internal_Shdr * strsec;
+             Elf32_Internal_Shdr * symsec;
+             Elf_Internal_Sym *    symtab;
+             char *                strtab;
+
+             printf (_("\nRelocation section "));
+
+             if (string_table == NULL)
+               printf ("%d", section->sh_name);
+             else
+               printf ("'%s'", SECTION_NAME (section));
+
+             printf (_(" at offset 0x%lx contains %lu entries:\n"),
+                rel_offset, (unsigned long) (rel_size / section->sh_entsize));
+
+             symsec = section_headers + section->sh_link;
+
+             symtab = get_elf_symbols (file, symsec->sh_offset,
+                                       symsec->sh_size / symsec->sh_entsize);
+
+             if (symtab == NULL)
+               continue;
+
+             strsec = section_headers + symsec->sh_link;
+
+             GET_DATA_ALLOC (strsec->sh_offset, strsec->sh_size, strtab,
+                             char *, "string table");
+
+             dump_relocations (file, rel_offset, rel_size, symtab, strtab);
+
+             free (strtab);
+             free (symtab);
+
+             found = 1;
+           }
+       }
+
+      if (! found)
+       printf (_("\nThere are no relocations in this file.\n"));
     }
 
-  /* Find symtab.  */
-  for (i = 0; i < dynamic_size; ++i, ++dpnt)
-    if (dpnt->d_tag == DT_SYMTAB)
-      {
-       dynamic_info [DT_SYMTAB] = dpnt->d_un.d_val;
-       symtab =  (Elf_Sym *) (header - loadaddr
-                                + dynamic_info[DT_SYMTAB]);
-      }
-    else if (dpnt->d_tag == DT_STRTAB)
+  return 1;
+}
+
+
+static void
+dynamic_segment_mips_val (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:
       {
-       dynamic_info [DT_STRTAB] = dpnt->d_un.d_val;
-       strtab = (char *) (header - loadaddr + dynamic_info[DT_STRTAB]);
+       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:
+    case DT_MIPS_SYMTABNO:
+    case DT_MIPS_UNREFEXTNO:
+    case DT_MIPS_HIPAGENO:
+    case DT_MIPS_DELTA_CLASS_NO:
+    case DT_MIPS_DELTA_INSTANCE_NO:
+    case DT_MIPS_DELTA_RELOC_NO:
+    case DT_MIPS_DELTA_SYM_NO:
+    case DT_MIPS_DELTA_CLASSSYM_NO:
+    case DT_MIPS_COMPACT_SIZE:
+      printf ("%ld\n", (long) entry->d_un.d_ptr);
+      break;
+      
+    default:
+      printf ("%#lx\n", (long) entry->d_un.d_ptr);
+    }
+}
+
+/* Parse the dynamic segment */
+static int
+process_dynamic_segment (file)
+     FILE * file;
+{
+  Elf_Internal_Dyn *    entry;
+  Elf32_External_Dyn *  edyn;
+  unsigned int i;
+
+  if (dynamic_size == 0)
+    {
+      if (do_dynamic)
+       printf (_("\nThere is no dynamic segment in this file.\n"));
+
+      return 1;
+    }
+
+  GET_DATA_ALLOC (dynamic_addr, dynamic_size,
+                 edyn, Elf32_External_Dyn *, "dynamic segment");
   
-  if (do_dynamic && dynamic_addr)
+  /* 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.  */
+  dynamic_size = 0;
+  while (*(Elf32_Word *) edyn[dynamic_size++].d_tag != DT_NULL)
+    ;
+
+  dynamic_segment = (Elf_Internal_Dyn *)
+    malloc (dynamic_size * sizeof (Elf_Internal_Dyn));
+
+  if (dynamic_segment == NULL)
     {
-      printf (_("\n Dynamic section data: %x, %d entries\n"),
-             dynamic_addr, dynamic_size );
-    }      
+      error (_("Out of memory\n"));
+      free (edyn);
+      return 0;
+    }
 
-  for (i = 0; i < dynamic_size; i++)
+  for (i = 0, entry = dynamic_segment;
+       i < dynamic_size;
+       i ++, entry ++)
     {
-      if (do_dynamic)
-       printf (_("  Tag: %#10x: "), dpnt->d_tag);
-      
-      switch (dpnt->d_tag)
+      entry->d_tag      = BYTE_GET (edyn [i].d_tag);
+      entry->d_un.d_val = BYTE_GET (edyn [i].d_un.d_val);
+    }
+
+  free (edyn);
+
+  /* Find the appropriate symbol table.  */
+  if (dynamic_symbols == NULL)
+    {
+      for (i = 0, entry = dynamic_segment;
+          i < dynamic_size;
+          ++i, ++ entry)
        {
-       case DT_AUXILIARY:
-       case DT_FILTER:
-         if (do_dynamic)
-           {
-             printf ("(%-11s)", filtertype [DT_FILTER - dpnt->d_tag]);
-             
-             if (dynamic_info [DT_STRTAB])
-               {
-                 if (dpnt->d_tag == DT_AUXILIARY)
-                   printf (_("Auxiliary library"));
-                 else
-                   printf (_("Filter library"));
+         unsigned long        offset;
+         long                 num_syms;
 
-                 printf (": [%s]\n", (dpnt->d_un.d_val + strtab));
-               }
-             else
-               printf (_("Value %x\n"), dpnt->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 [dpnt->d_tag] = dpnt->d_un.d_val;
-         
-         if (do_dynamic)
-           {
-             printf ("(%-11s)", dyntype [dpnt->d_tag]);
-             
-             if (dynamic_info [DT_STRTAB])
-               {
-                 switch (dpnt->d_tag)
-                   {
-                   case DT_NEEDED:
-                     printf (_("Shared library: [%s]\n"),
-                             (dpnt->d_un.d_val + strtab));
-                     
-                     if (strcmp (dpnt->d_un.d_val + strtab, pint))
-                       printf ("\n");
-                     else
-                       printf (_(" program interpreter\n"));
-                     break;
+         if (entry->d_tag != DT_SYMTAB)
+           continue;
 
-                   case DT_SONAME:
-                     printf (_("Library soname: [%s]\n"),
-                             (dpnt->d_un.d_val + strtab));
-                     break;
+         dynamic_info[DT_SYMTAB] = entry->d_un.d_val;
 
-                   case DT_RPATH:
-                     printf (_("Library rpath: [%s]\n"),
-                             (dpnt->d_un.d_val + strtab));
-                     break;
+         /* Since we do not know how big the symbol table is,
+            we default to reading in the entire file (!) and
+            processing that.  This is overkill, I know, but it
+            should work. */
 
-                   default:
-                     printf (_("Value %x\n"), dpnt->d_un.d_val);
-                   }
-               }
-             else
-               printf (_("Value %x\n"), dpnt->d_un.d_val);
-           }
-         break;
+         offset = entry->d_un.d_val - loadaddr;
 
-       default:
-         if ((dpnt->d_tag >= DT_VERSYM) && (dpnt->d_tag <= DT_VERNEEDNUM))
+         if (fseek (file, 0, SEEK_END))
+           error (_("Unable to seek to end of file!"));
+
+         num_syms = (ftell (file) - offset) / sizeof (Elf32_External_Sym);
+
+         if (num_syms < 1)
            {
-             version_info [DT_VERSIONTAGIDX (dpnt->d_tag)] = dpnt->d_un.d_val;
+             error (_("Unable to determine the number of symbols to load\n"));
+             continue;
+           }
+
+         dynamic_symbols = get_elf_symbols (file, offset, num_syms);
+       }
+    }
+
+  /* Similarly find a string table.  */
+  if (dynamic_strings == NULL)
+    {
+      for (i = 0, entry = dynamic_segment;
+          i < dynamic_size;
+          ++i, ++ entry)
+       {
+         unsigned long offset;
+         long          str_tab_len;
+
+         if (entry->d_tag != DT_STRTAB)
+           continue;
+
+         dynamic_info[DT_STRTAB] = entry->d_un.d_val;
 
-             if (do_dynamic)
-               printf (_("(%-11s) Value %#x\n"),
-                       vertype [DT_VERSIONTAGIDX (dpnt->d_tag)],
-                       dpnt->d_un.d_ptr);
+         /* Since we do not know how big the string table is,
+            we default to reading in the entire file (!) and
+            processing that.  This is overkill, I know, but it
+            should work. */
+
+         offset = entry->d_un.d_val - loadaddr;
+         if (fseek (file, 0, SEEK_END))
+           error (_("Unable to seek to end of file\n"));
+         str_tab_len = ftell (file) - offset;
+
+         if (str_tab_len < 1)
+           {
+             error
+               (_("Unable to determine the length of the dynamic string table\n"));
+             continue;
            }
-         else
-           warn (_("<Invalid>     Value %#x\n"), dpnt->d_un.d_ptr);
+
+         GET_DATA_ALLOC (offset, str_tab_len, dynamic_strings, char *,
+                         "dynamic string table");
+
          break;
        }
-      
-      dpnt ++;
     }
 
-  if (do_reloc)
+  /* And find the syminfo section if available.  */
+  if (dynamic_syminfo == NULL)
     {
-      if (do_using_dynamic)
+      unsigned int syminsz = 0;
+
+      for (i = 0, entry = dynamic_segment;
+          i < dynamic_size;
+          ++i, ++ entry)
        {
-         if (dynamic_info [DT_REL])
+         if (entry->d_tag == DT_SYMINENT)
            {
-             rpnt = (Elf_Rel *) (header + dynamic_info [DT_REL] - loadaddr);
-             rel_size = dynamic_info [DT_RELSZ];
-             if (rel_size)
-               {
-                 printf (_("\nRelocation section data: %x %x\n"),
-                         dynamic_info[DT_REL], rel_size);
-                 dump_relocations (rpnt, rel_size);
-               }
-             else
-               printf (_("\nNo Relocations in this file\n"));
+             /* 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);
            }
-         
-         if (dynamic_info[DT_RELA])
+         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)
            {
-             rpnt = (Elf_Rel *) (header + dynamic_info[DT_RELA] - loadaddr);
-             rel_size = dynamic_info[DT_RELASZ];
-             if (rel_size)
-               {
-                 printf (_("\nRelocation section data: %x %x\n"),
-                         dynamic_info[DT_RELA], rel_size);
-                 dump_relocations (rpnt, rel_size);
-               }
-             else
-               printf (_("\nNo Relocations in this file\n"));
+             error (_("Out of memory\n"));
+             return 0;
            }
-         
-         if (dynamic_info[DT_JMPREL])
+
+         dynamic_syminfo_nent = syminsz / sizeof (Elf_External_Syminfo);
+         for (i = 0, syminfo = dynamic_syminfo; i < dynamic_syminfo_nent;
+              ++i, ++syminfo)
            {
-             rpnt = (Elf_Rel *) (header + dynamic_info[DT_JMPREL]
-                                   - loadaddr);
-             rel_size = dynamic_info[DT_PLTRELSZ];
-             if (rel_size)
-               {
-                 printf (_("\nJumptable Relocation section data: %x %x\n"),
-                         dynamic_info[DT_JMPREL], rel_size);
-                 dump_relocations (rpnt, rel_size);
-               }
-             else
-               printf (_("\nNo Relocations in this file\n"));
+             syminfo->si_boundto = BYTE_GET (extsyminfo[i].si_boundto);
+             syminfo->si_flags = BYTE_GET (extsyminfo[i].si_flags);
            }
+
+         free (extsyminfo);
        }
-      else
+    }
+
+  if (do_dynamic && dynamic_addr)
+    printf (_("\nDynamic segment at offset 0x%x contains %d entries:\n"),
+           dynamic_addr, dynamic_size);
+  if (do_dynamic)
+    printf (_("  Tag        Type                         Name/Value\n"));
+
+  for (i = 0, entry = dynamic_segment;
+       i < dynamic_size;
+       i++, entry ++)
+    {
+      if (do_dynamic)
+       printf (_("  0x%-8.8lx (%s)%*s"),
+               (unsigned long) entry->d_tag,
+               get_dynamic_type (entry->d_tag),
+               27 - strlen (get_dynamic_type (entry->d_tag)),
+               " ");
+
+      switch (entry->d_tag)
        {
-         Elf_Shdr * spnt;
-         
-         spnt = elf_sections;
-         
-         for (i = 0; i < epnt->e_shnum; i++, spnt++)
+       case DT_AUXILIARY:
+       case DT_FILTER:
+         if (do_dynamic)
            {
-             Elf_Shdr * symsec;
+             if (entry->d_tag == DT_AUXILIARY)
+               printf (_("Auxiliary library"));
+             else
+               printf (_("Filter library"));
 
-             
-             if (spnt->sh_type != SHT_RELA && spnt->sh_type != SHT_REL)
-               continue;
-             
-             rpnt = (Elf_Rel *) (header + spnt->sh_offset);
-             
-             rel_size = spnt->sh_size;
+             if (dynamic_strings)
+               printf (": [%s]\n", dynamic_strings + entry->d_un.d_val);
+             else
+               printf (": %#lx\n", (long) entry->d_un.d_val);
+           }
+         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_PLTGOT  :
+       case DT_HASH    :
+       case DT_STRTAB  :
+       case DT_SYMTAB  :
+       case DT_RELA    :
+       case DT_INIT    :
+       case DT_FINI    :
+       case DT_SONAME  :
+       case DT_RPATH   :
+       case DT_SYMBOLIC:
+       case DT_REL     :
+       case DT_DEBUG   :
+       case DT_TEXTREL :
+       case DT_JMPREL  :
+         dynamic_info[entry->d_tag] = entry->d_un.d_val;
+
+         if (do_dynamic)
+           {
+             char * name;
+
+             if (dynamic_strings == NULL)
+               name = NULL;
+             else
+               name = dynamic_strings + entry->d_un.d_val;
 
-             if (rel_size)
+             if (name)
                {
-                 printf (_("\nRelocation section data: %s (%#x entries)\n"),
-                         SECTION_NAME (spnt), rel_size / spnt->sh_entsize);
-                 
-                 symsec = & elf_sections [spnt->sh_link];
-                 symtab = (Elf_Sym *) (header + symsec->sh_offset);
-                 strtab = (char *) (header
-                                    + elf_sections [symsec->sh_link].sh_offset);
-                 
-                 dump_relocations (rpnt, rel_size);
+                 switch (entry->d_tag)
+                   {
+                   case DT_NEEDED:
+                     printf (_("Shared library: [%s]"), name);
+
+                     if (strcmp (name, program_interpreter))
+                       printf ("\n");
+                     else
+                       printf (_(" program interpreter\n"));
+                     break;
+
+                   case DT_SONAME:
+                     printf (_("Library soname: [%s]\n"), name);
+                     break;
+
+                   case DT_RPATH:
+                     printf (_("Library rpath: [%s]\n"), name);
+                     break;
+
+                   default:
+                     printf ("%#lx\n", (long) entry->d_un.d_val);
+                   }
                }
              else
-               printf (_("\nNo Relocations in this file\n"));
+               printf ("%#lx\n", (long) entry->d_un.d_val);
+           }
+         break;
+
+       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)
+           {
+             if (dynamic_strings != NULL && entry->d_tag == DT_USED)
+               {
+                 char * name;
+
+                 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);
+           }
+         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;
        }
     }
-  
-  if (elf_dynamic)
-    free (elf_dynamic);
+
+  return 1;
+}
+
+static char *
+get_ver_flags (flags)
+     unsigned int flags;
+{
+  static char buff [32];
+
+  buff[0] = 0;
+
+  if (flags == 0)
+    return _("none");
+
+  if (flags & VER_FLG_BASE)
+    strcat (buff, "BASE ");
+
+  if (flags & VER_FLG_WEAK)
+    {
+      if (flags & VER_FLG_BASE)
+       strcat (buff, "| ");
+
+      strcat (buff, "WEAK ");
+    }
+
+  if (flags & ~(VER_FLG_BASE | VER_FLG_WEAK))
+    strcat (buff, "| <unknown>");
+
+  return buff;
+}
+
+/* Display the contents of the version sections.  */
+static int
+process_version_sections (file)
+     FILE * file;
+{
+  Elf32_Internal_Shdr * section;
+  unsigned   i;
+  int        found = 0;
+
+  if (! do_version)
+    return 1;
+
+  for (i = 0, section = section_headers;
+       i < elf_header.e_shnum;
+       i++, section ++)
+    {
+      switch (section->sh_type)
+       {
+       case SHT_GNU_verdef:
+         {
+           Elf_External_Verdef * edefs;
+           unsigned int          idx;
+           unsigned int          cnt;
+
+           found = 1;
+
+           printf
+             (_("\nVersion definition section '%s' contains %ld entries:\n"),
+              SECTION_NAME (section), section->sh_info);
+
+           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,
+                           edefs, Elf_External_Verdef *,
+                           "version definition section");
+
+           for (idx = cnt = 0; cnt < section->sh_info; ++ cnt)
+             {
+               char *                 vstart;
+               Elf_External_Verdef *  edef;
+               Elf_Internal_Verdef    ent;
+               Elf_External_Verdaux * eaux;
+               Elf_Internal_Verdaux   aux;
+               int                    j;
+               int                    isum;
+               
+               vstart = ((char *) edefs) + idx;
+
+               edef = (Elf_External_Verdef *) vstart;
+
+               ent.vd_version = BYTE_GET (edef->vd_version);
+               ent.vd_flags   = BYTE_GET (edef->vd_flags);
+               ent.vd_ndx     = BYTE_GET (edef->vd_ndx);
+               ent.vd_cnt     = BYTE_GET (edef->vd_cnt);
+               ent.vd_hash    = BYTE_GET (edef->vd_hash);
+               ent.vd_aux     = BYTE_GET (edef->vd_aux);
+               ent.vd_next    = BYTE_GET (edef->vd_next);
+
+               printf (_("  %#06x: Rev: %d  Flags: %s"),
+                       idx, ent.vd_version, get_ver_flags (ent.vd_flags));
+
+               printf (_("  Index: %d  Cnt: %d  "),
+                       ent.vd_ndx, ent.vd_cnt);
+
+               vstart += ent.vd_aux;
+
+               eaux = (Elf_External_Verdaux *) vstart;
+
+               aux.vda_name = BYTE_GET (eaux->vda_name);
+               aux.vda_next = BYTE_GET (eaux->vda_next);
+
+               if (dynamic_strings)
+                 printf (_("Name: %s\n"), dynamic_strings + aux.vda_name);
+               else
+                 printf (_("Name index: %ld\n"), aux.vda_name);
+
+               isum = idx + ent.vd_aux;
+
+               for (j = 1; j < ent.vd_cnt; j ++)
+                 {
+                   isum   += aux.vda_next;
+                   vstart += aux.vda_next;
+
+                   eaux = (Elf_External_Verdaux *) vstart;
+
+                   aux.vda_name = BYTE_GET (eaux->vda_name);
+                   aux.vda_next = BYTE_GET (eaux->vda_next);
+
+                   if (dynamic_strings)
+                     printf (_("  %#06x: Parent %d: %s\n"),
+                             isum, j, dynamic_strings + aux.vda_name);
+                   else
+                     printf (_("  %#06x: Parent %d, name index: %ld\n"),
+                             isum, j, aux.vda_name);
+                 }
+
+               idx += ent.vd_next;
+             }
+
+           free (edefs);
+         }
+         break;
+         
+       case SHT_GNU_verneed:
+         {
+           Elf_External_Verneed *  eneed;
+           unsigned int            idx;
+           unsigned int            cnt;
+
+           found = 1;
+
+           printf (_("\nVersion needs section '%s' contains %ld entries:\n"),
+                   SECTION_NAME (section), section->sh_info);
+
+           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 *,
+                           "version need section");
+
+           for (idx = cnt = 0; cnt < section->sh_info; ++cnt)
+             {
+               Elf_External_Verneed * entry;
+               Elf_Internal_Verneed     ent;
+               int                      j;
+               int                      isum;
+               char *                   vstart;
+
+               vstart = ((char *) eneed) + idx;
+
+               entry = (Elf_External_Verneed *) vstart;
+
+               ent.vn_version = BYTE_GET (entry->vn_version);
+               ent.vn_cnt     = BYTE_GET (entry->vn_cnt);
+               ent.vn_file    = BYTE_GET (entry->vn_file);
+               ent.vn_aux     = BYTE_GET (entry->vn_aux);
+               ent.vn_next    = BYTE_GET (entry->vn_next);
+
+               printf (_("  %#06x: Version: %d"), idx, ent.vn_version);
+
+               if (dynamic_strings)
+                 printf (_("  File: %s"), dynamic_strings + ent.vn_file);
+               else
+                 printf (_("  File: %lx"), ent.vn_file);
+
+               printf (_("  Cnt: %d\n"), ent.vn_cnt);
+
+               vstart += ent.vn_aux;
+
+               for (j = 0, isum = idx + ent.vn_aux; j < ent.vn_cnt; ++j)
+                 {
+                   Elf_External_Vernaux * eaux;
+                   Elf_Internal_Vernaux   aux;
+
+                   eaux = (Elf_External_Vernaux *) vstart;
+
+                   aux.vna_hash  = BYTE_GET (eaux->vna_hash);
+                   aux.vna_flags = BYTE_GET (eaux->vna_flags);
+                   aux.vna_other = BYTE_GET (eaux->vna_other);
+                   aux.vna_name  = BYTE_GET (eaux->vna_name);
+                   aux.vna_next  = BYTE_GET (eaux->vna_next);
+
+                   if (dynamic_strings)
+                     printf (_("  %#06x: Name: %s"),
+                             isum, dynamic_strings + aux.vna_name);
+                   else
+                     printf (_("  %#06x: Name index: %lx"),
+                             isum, aux.vna_name);
+
+                   printf (_("  Flags: %s  Version: %d\n"),
+                           get_ver_flags (aux.vna_flags), aux.vna_other);
+
+                   isum   += aux.vna_next;
+                   vstart += aux.vna_next;
+                 }
+
+               idx += ent.vn_next;
+             }
+           
+           free (eneed);
+         }
+         break;
+
+       case SHT_GNU_versym:
+         {
+           Elf32_Internal_Shdr *       link_section;
+           int                         total;
+           int                         cnt;
+           unsigned char *             edata;
+           unsigned short *            data;
+           char *                      strtab;
+           Elf_Internal_Sym *          symbols;
+           Elf32_Internal_Shdr *       string_sec;
+
+           link_section = section_headers + section->sh_link;
+           total = section->sh_size / section->sh_entsize;
+
+           found = 1;
+
+           symbols = get_elf_symbols
+             (file, link_section->sh_offset,
+              link_section->sh_size / link_section->sh_entsize);
+
+           string_sec = section_headers + link_section->sh_link;
+
+           GET_DATA_ALLOC (string_sec->sh_offset, string_sec->sh_size,
+                           strtab, char *, "version string table");
+
+           printf (_("\nVersion symbols section '%s' contains %d entries:\n"),
+                   SECTION_NAME (section), total);
+
+           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,
+                           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));
+
+           free (edata);
+
+           for (cnt = 0; cnt < total; cnt += 4)
+             {
+               int j, nn;
+
+               printf ("  %03x:", cnt);
+
+               for (j = 0; (j < 4) && (cnt + j) < total; ++j)
+                 switch (data [cnt + j])
+                   {
+                   case 0:
+                     fputs (_("   0 (*local*)    "), stdout);
+                     break;
+
+                   case 1:
+                     fputs (_("   1 (*global*)   "), stdout);
+                     break;
+
+                   default:
+                     nn = printf ("%4x%c", data [cnt + j] & 0x7fff,
+                                  data [cnt + j] & 0x8000 ? 'h' : ' ');
+
+                     if (symbols [cnt + j].st_shndx < SHN_LORESERVE
+                         && section_headers[symbols [cnt + j].st_shndx].sh_type
+                         == SHT_NOBITS)
+                       {
+                         /* We must test both.  */
+                         Elf_Internal_Verneed     ivn;
+                         unsigned long            offset;
+
+                         offset = version_info [DT_VERSIONTAGIDX (DT_VERNEED)]
+                           - loadaddr;
+
+                         do
+                           {
+                             Elf_External_Verneed   evn;
+                             Elf_External_Vernaux   evna;
+                             Elf_Internal_Vernaux     ivna;
+                             unsigned long            vna_off;
+
+                             GET_DATA (offset, evn, "version need");
+
+                             ivn.vn_aux  = BYTE_GET (evn.vn_aux);
+                             ivn.vn_next = BYTE_GET (evn.vn_next);
+
+                             vna_off = offset + ivn.vn_aux;
+
+                             do
+                               {
+                                 GET_DATA (vna_off, evna,
+                                           "version need aux (1)");
+
+                                 ivna.vna_next  = BYTE_GET (evna.vna_next);
+                                 ivna.vna_other = BYTE_GET (evna.vna_other);
+
+                                 vna_off += ivna.vna_next;
+                               }
+                             while (ivna.vna_other != data [cnt + j]
+                                    && ivna.vna_next != 0);
+
+                             if (ivna.vna_other == data [cnt + j])
+                               {
+                                 ivna.vna_name = BYTE_GET (evna.vna_name);
+
+                                 nn += printf ("(%s%-*s",
+                                               strtab + ivna.vna_name,
+                                               12 - strlen (strtab
+                                                            + ivna.vna_name),
+                                               ")");
+                                 break;
+                               }
+                             else if (ivn.vn_next == 0)
+                               {
+                                 if (data [cnt + j] != 0x8001)
+                                   {
+                                     Elf_Internal_Verdef  ivd;
+                                     Elf_External_Verdef  evd;
+
+                                     offset = version_info
+                                       [DT_VERSIONTAGIDX (DT_VERDEF)]
+                                       - loadaddr;
+
+                                     do
+                                       {
+                                         GET_DATA (offset, evd,
+                                                   "version definition");
+
+                                         ivd.vd_next = BYTE_GET (evd.vd_next);
+                                         ivd.vd_ndx  = BYTE_GET (evd.vd_ndx);
+
+                                         offset += ivd.vd_next;
+                                       }
+                                     while (ivd.vd_ndx
+                                            != (data [cnt + j] & 0x7fff)
+                                            && ivd.vd_next != 0);
+
+                                     if (ivd.vd_ndx
+                                         == (data [cnt + j] & 0x7fff))
+                                       {
+                                         Elf_External_Verdaux  evda;
+                                         Elf_Internal_Verdaux  ivda;
+
+                                         ivd.vd_aux = BYTE_GET (evd.vd_aux);
+
+                                         GET_DATA (offset + ivd.vd_aux, evda,
+                                                   "version definition aux");
+
+                                         ivda.vda_name =
+                                           BYTE_GET (evda.vda_name);
+
+                                         nn +=
+                                           printf ("(%s%-*s",
+                                                   strtab + ivda.vda_name,
+                                                   12
+                                                   - strlen (strtab
+                                                             + ivda.vda_name),
+                                                   ")");
+                                       }
+                                   }
+
+                                 break;
+                               }
+                             else
+                               offset += ivn.vn_next;
+                           }
+                         while (ivn.vn_next);
+                       }
+                     else if (symbols [cnt + j].st_shndx == SHN_UNDEF)
+                       {
+                         Elf_Internal_Verneed     ivn;
+                         unsigned long            offset;
+
+                         offset = version_info [DT_VERSIONTAGIDX (DT_VERNEED)]
+                           - loadaddr;
+
+                         do
+                           {
+                             Elf_Internal_Vernaux     ivna;
+                             Elf_External_Verneed   evn;
+                             Elf_External_Vernaux   evna;
+                             unsigned long            a_off;
+
+                             GET_DATA (offset, evn, "version need");
+
+                             ivn.vn_aux  = BYTE_GET (evn.vn_aux);
+                             ivn.vn_next = BYTE_GET (evn.vn_next);
+
+                             a_off = offset + ivn.vn_aux;
+
+                             do
+                               {
+                                 GET_DATA (a_off, evna,
+                                           "version need aux (2)");
+
+                                 ivna.vna_next  = BYTE_GET (evna.vna_next);
+                                 ivna.vna_other = BYTE_GET (evna.vna_other);
+
+                                 a_off += ivna.vna_next;
+                               }
+                             while (ivna.vna_other != data [cnt + j]
+                                    && ivna.vna_next != 0);
+
+                             if (ivna.vna_other == data [cnt + j])
+                               {
+                                 ivna.vna_name = BYTE_GET (evna.vna_name);
+
+                                 nn += printf ("(%s%-*s",
+                                               strtab + ivna.vna_name,
+                                               12 - strlen (strtab
+                                                            + ivna.vna_name),
+                                               ")");
+                                 break;
+                               }
+
+                             offset += ivn.vn_next;
+                           }
+                         while (ivn.vn_next);
+                       }
+                     else if (data [cnt + j] != 0x8001)
+                       {
+                         Elf_Internal_Verdef  ivd;
+                         Elf_External_Verdef  evd;
+                         unsigned long        offset;
+
+                         offset = version_info
+                           [DT_VERSIONTAGIDX (DT_VERDEF)] - loadaddr;
+
+                         do
+                           {
+                             GET_DATA (offset, evd, "version def");
+
+                             ivd.vd_next = BYTE_GET (evd.vd_next);
+                             ivd.vd_ndx  = BYTE_GET (evd.vd_ndx);
+
+                             offset += ivd.vd_next;
+                           }
+                         while (ivd.vd_ndx != (data [cnt + j] & 0x7fff)
+                                && ivd.vd_next != 0);
+
+                         if (ivd.vd_ndx == (data [cnt + j] & 0x7fff))
+                           {
+                             Elf_External_Verdaux  evda;
+                             Elf_Internal_Verdaux  ivda;
+
+                             ivd.vd_aux = BYTE_GET (evd.vd_aux);
+
+                             GET_DATA (offset - ivd.vd_next + ivd.vd_aux,
+                                       evda, "version def aux");
+
+                             ivda.vda_name = BYTE_GET (evda.vda_name);
+
+                             nn += printf ("(%s%-*s",
+                                           strtab + ivda.vda_name,
+                                           12 - strlen (strtab
+                                                        + ivda.vda_name),
+                                           ")");
+                           }
+                       }
+
+                     if (nn < 18)
+                       printf ("%*c", 18 - nn, ' ');
+                   }
+
+               putchar ('\n');
+             }
+
+           free (data);
+           free (strtab);
+           free (symbols);
+         }
+         break;
+       
+       default:
+         break;
+       }
+    }
+
+  if (! found)
+    printf (_("\nNo version information found in this file.\n"));
+
+  return 1;
+}
+
+static char *
+get_symbol_binding (binding)
+     unsigned int binding;
+{
+  static char buff [32];
+
+  switch (binding)
+    {
+    case STB_LOCAL:  return _("LOCAL");
+    case STB_GLOBAL: return _("GLOBAL");
+    case STB_WEAK:   return _("WEAK");
+    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;
+    }
+}
+
+static char *
+get_symbol_type (type)
+     unsigned int type;
+{
+  static char buff [32];
+
+  switch (type)
+    {
+    case STT_NOTYPE:   return _("NOTYPE");
+    case STT_OBJECT:   return _("OBJECT");
+    case STT_FUNC:     return _("FUNC");
+    case STT_SECTION:  return _("SECTION");
+    case STT_FILE:     return _("FILE");
+    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;
+    }
+}
+
+static char *
+get_symbol_index_type (type)
+     unsigned int type;
+{
+  switch (type)
+    {
+    case SHN_UNDEF:  return "UND";
+    case SHN_ABS:    return "ABS";
+    case SHN_COMMON: return "COM";
+    default:
+      if (type >= SHN_LOPROC && type <= SHN_HIPROC)
+       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];
+
+         sprintf (buff, "%3d", type);
+         return buff;
+       }
+    }
+}
+
+
+static int *
+get_dynamic_data (file, number)
+     FILE *       file;
+     unsigned int number;
+{
+  char * e_data;
+  int *  i_data;
+
+  e_data = (char *) malloc (number * 4);
+
+  if (e_data == NULL)
+    {
+      error (_("Out of memory\n"));
+      return NULL;
+    }
+
+  if (fread (e_data, 4, number, file) != number)
+    {
+      error (_("Unable to read in dynamic data\n"));
+      return NULL;
+    }
+
+  i_data = (int *) malloc (number * sizeof (* i_data));
+
+  if (i_data == NULL)
+    {
+      error (_("Out of memory\n"));
+      free (e_data);
+      return NULL;
+    }
+
+  while (number--)
+    i_data [number] = byte_get (e_data + number * 4, 4);
+
+  free (e_data);
+
+  return i_data;
+}
+
+/* Dump the symbol table */
+static int
+process_symbol_table (file)
+     FILE * file;
+{
+  Elf32_Internal_Shdr *   section;
+  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)
+                               || do_histogram))
+    {
+      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)
+       {
+         error (_("Failed to read in number of buckets\n"));
+         return 0;
+       }
+
+      if (fread (nc, sizeof (nc), 1, file) != 1)
+       {
+         error (_("Failed to read in number of chains\n"));
+         return 0;
+       }
+
+      nbuckets = byte_get (nb, 4);
+      nchains  = byte_get (nc, 4);
+
+      buckets = get_dynamic_data (file, nbuckets);
+      chains  = get_dynamic_data (file, nchains);
+
+      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"));
+
+      for (hn = 0; hn < nbuckets; hn++)
+       {
+         if (! buckets [hn])
+           continue;
+
+         for (si = buckets [hn]; si; si = chains [si])
+           {
+             Elf_Internal_Sym * psym;
+
+             psym = dynamic_symbols + si;
+
+             printf ("  %3d %3d: %8lx %5ld %6s %6s %2d ",
+                     si, hn,
+                     (unsigned long) psym->st_value,
+                     (unsigned long) psym->st_size,
+                     get_symbol_type (ELF_ST_TYPE (psym->st_info)),
+                     get_symbol_binding (ELF_ST_BIND (psym->st_info)),
+                     psym->st_other);
+
+             printf ("%3.3s", get_symbol_index_type (psym->st_shndx));
+
+             printf (" %s\n", dynamic_strings + psym->st_name);
+           }
+       }
+    }
+  else if (do_syms && !do_using_dynamic)
+    {
+      unsigned int     i;
+
+      for (i = 0, section = section_headers;
+          i < elf_header.e_shnum;
+          i++, section++)
+       {
+         unsigned int          si;
+         char *                strtab;
+         Elf_Internal_Sym *    symtab;
+         Elf_Internal_Sym *    psym;
+
+
+         if (   section->sh_type != SHT_SYMTAB
+             && section->sh_type != SHT_DYNSYM)
+           continue;
+
+         printf (_("\nSymbol table '%s' contains %lu entries:\n"),
+                 SECTION_NAME (section),
+                 (unsigned long) (section->sh_size / section->sh_entsize));
+         fputs (_("  Num:    Value  Size Type    Bind   Ot  Ndx Name\n"),
+                stdout);
+
+         symtab = get_elf_symbols (file, section->sh_offset,
+                                   section->sh_size / section->sh_entsize);
+         if (symtab == NULL)
+           continue;
+
+         if (section->sh_link == elf_header.e_shstrndx)
+           strtab = string_table;
+         else
+           {
+             Elf32_Internal_Shdr * string_sec;
+
+             string_sec = section_headers + section->sh_link;
+
+             GET_DATA_ALLOC (string_sec->sh_offset, string_sec->sh_size,
+                             strtab, char *, "string table");
+           }
+
+         for (si = 0, psym = symtab;
+              si < section->sh_size / section->sh_entsize;
+              si ++, psym ++)
+           {
+             printf ("  %3d: %8lx %5ld %-7s %-6s %2d ",
+                     si,
+                     (unsigned long) psym->st_value,
+                     (unsigned long) psym->st_size,
+                     get_symbol_type (ELF_ST_TYPE (psym->st_info)),
+                     get_symbol_binding (ELF_ST_BIND (psym->st_info)),
+                     psym->st_other);
+
+             if (psym->st_shndx == 0)
+               fputs (" UND", stdout);
+             else if ((psym->st_shndx & 0xffff) == 0xfff1)
+               fputs (" ABS", stdout);
+             else if ((psym->st_shndx & 0xffff) == 0xfff2)
+               fputs (" COM", stdout);
+             else
+               printf ("%4x", psym->st_shndx);
+
+             printf (" %s", strtab + psym->st_name);
+
+             if (section->sh_type == SHT_DYNSYM &&
+                 version_info [DT_VERSIONTAGIDX (DT_VERSYM)] != 0)
+               {
+                 unsigned char   data[2];
+                 unsigned short  vers_data;
+                 unsigned long   offset;
+                 int             is_nobits;
+                 int             check_def;
+
+                 offset = version_info [DT_VERSIONTAGIDX (DT_VERSYM)]
+                   - loadaddr;
+
+                 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;
+
+    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;
+
+    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;
+
+    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;
+
+    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;
+
+    default:
+      break;
+    }
+
+  printf ("\n");
+  return data;
+}
+
+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;
+
+  printf (_("The section %s contains:\n\n"), SECTION_NAME (section));
+
+  while (start < end)
+    {
+      DWARF2_External_CompUnit * external;
+      DWARF2_Internal_CompUnit   compunit;
+      unsigned char *            tags;
+      int                        i;
+      int                       level;
+
+      external = (DWARF2_External_CompUnit *) start;
+
+      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);
+
+      tags = start + sizeof (* external);
+      start += compunit.cu_length + sizeof (external->cu_length);
+
+      if (compunit.cu_version != 2)
+       {
+         warn (_("Only version 2 DWARF debug information is currently supported.\n"));
+         continue;
+       }
+
+      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);
+
+      if (first_abbrev != NULL)
+       free_abbrevs ();
+
+      /* Read in the abbrevs used by this compilation unit.  */
+
+      {
+       Elf32_Internal_Shdr * sec;
+       unsigned char *       begin;
+
+       /* 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;
+
+       if (i == -1 || sec->sh_size == 0)
+         {
+           warn (_("Unable to locate .debug_abbrev section!\n"));
+           return 0;
+         }
+
+       GET_DATA_ALLOC (sec->sh_offset, sec->sh_size, begin, unsigned char *,
+                       "debug_abbrev section data");
+
+       process_abbrev_section (begin + compunit.cu_abbrev_offset,
+                               begin + sec->sh_size);
+
+       free (begin);
+      }
+
+      level = 0;
+      while (tags < start)
+       {
+         int            bytes_read;
+         int            abbrev_number;
+         abbrev_entry * entry;
+         abbrev_attr  * attr;
+
+         abbrev_number = read_leb128 (tags, & bytes_read, 0);
+         tags += bytes_read;
+
+         /* A null DIE marks the end of a list of children.  */
+         if (abbrev_number == 0)
+           {
+             --level;
+             continue;
+           }
+
+         /* Scan through the abbreviation list until we reach the
+            correct entry.  */
+         for (entry = first_abbrev;
+              entry && entry->entry != abbrev_number;
+              entry = entry->next)
+           continue;
+
+         if (entry == NULL)
+           {
+             warn (_("Unable to locate entry %d in the abbreviation table\n"),
+                   abbrev_number);
+             return 0;
+           }
+
+         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;
+       }
+    }
+
+  printf ("\n");
+
+  return 1;
+}
+
+static int
+display_debug_aranges (section, start, file)
+     Elf32_Internal_Shdr * section;
+     unsigned char *       start;
+     FILE *                file;
+{
+  unsigned char * end = start + section->sh_size;
+
+  printf (_("The section %s contains:\n\n"), SECTION_NAME (section));
+
+  while (start < end)
+    {
+      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"));
+
+      ranges = start + sizeof (* external);
+
+      for (;;)
+       {
+         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);
+
+         ranges += arange.ar_pointer_size;
+
+         printf ("    %8.8lx %lu\n", address, length);
+       }
+
+      start += arange.ar_length + sizeof (external->ar_length);
+    }
+
+  printf ("\n");
+
+  return 1;
+}
+
+
+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));
+
+  return 1;
+}
+
+  /* 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 }
+};
+
+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;
+
+  length = section->sh_size;
+  if (length == 0)
+    {
+      printf (_("\nSection '%s' has no debugging data.\n"), name);
+      return 0;
+    }
+
+  GET_DATA_ALLOC (section->sh_offset, length, start, unsigned char *,
+                 "debug section data");
+
+  /* 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 (i == -1)
+    printf (_("Unrecognised debug section: %s\n"), name);
+
+  free (start);
+
+  /* If we loaded in the abbrev section at some point,
+     we must release it here.  */
+  if (first_abbrev != NULL)
+    free_abbrevs ();
+
+  return 1;
+}
+
+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;
 }
 
-/* Dump the symbol table */
 static void
-process_symbol_table ()
+process_mips_fpe_exception (mask)
+     int mask;
 {
-  char *       pnt;
-  int          i;
-  Elf_Shdr * spnt;
-  
-  if (! do_syms)
-    return;
-  
-  if (dynamic_info [DT_HASH] && do_using_dynamic)
+  if (mask)
     {
-      int   nbucket;
-      int   nchain;
-      int * elf_buckets;
-      int * chains;
-      int   hn;
-      int   si;
-      int * hash_addr;
+      int first = 1;
+      if (mask & OEX_FPU_INEX)
+       fputs ("INEX", stdout), first = 0;
+      if (mask & OEX_FPU_UFLO)
+       printf ("%sUFLO", first ? "" : "|"), first = 0;
+      if (mask & OEX_FPU_OFLO)
+       printf ("%sOFLO", first ? "" : "|"), first = 0;
+      if (mask & OEX_FPU_DIV0)
+       printf ("%sDIV0", first ? "" : "|"), first = 0;
+      if (mask & OEX_FPU_INVAL)
+       printf ("%sINVAL", first ? "" : "|");
+    }
+  else
+    fputs ("0", stdout);
+}
 
-      hash_addr = (int *) (dynamic_info [DT_HASH] + header - loadaddr);
-      
-      nbucket     = *hash_addr++;
-      nchain      = *hash_addr++;
-      elf_buckets = hash_addr;
-      hash_addr  += nbucket;
-      chains      = hash_addr;
-         
-      printf (_("\n Symbol table for image\n"));
-      printf (_("  Num Buc:    Value  Size   Type   Bind Ot Ndx Name\n"));
-      
-      for (hn = 0; hn < nbucket; hn++)
+static int
+process_mips_specific (file)
+     FILE *file;
+{
+  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)
+    /* No information available.  */
+    return 0;
+
+  for (entry = dynamic_segment; entry->d_tag != DT_NULL; ++entry)
+    switch (entry->d_tag)
+      {
+      case DT_MIPS_LIBLIST:
+       liblist_offset = entry->d_un.d_val - loadaddr;
+       break;
+      case DT_MIPS_LIBLISTNO:
+       liblistno = entry->d_un.d_val;
+       break;
+      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;
+      }
+
+  if (liblist_offset != 0 && liblistno != 0 && do_dynamic)
+    {
+      Elf32_External_Lib *elib;
+      size_t cnt;
+
+      GET_DATA_ALLOC (liblist_offset, liblistno * sizeof (Elf32_External_Lib),
+                     elib, Elf32_External_Lib *, "liblist");
+
+      printf ("\nSection '.liblist' contains %d entries:\n", liblistno);
+      fputs ("     Library              Time Stamp          Checksum   Version Flags\n",
+            stdout);
+
+      for (cnt = 0; cnt < liblistno; ++cnt)
        {
-         if (! elf_buckets [hn])
-           continue;
-         
-         for (si = elf_buckets[hn]; si; si = chains[si])
+         Elf32_Lib liblist;
+         time_t time;
+         char timebuf[20];
+
+         liblist.l_name = BYTE_GET (elib[cnt].l_name);
+         time = BYTE_GET (elib[cnt].l_time_stamp);
+         liblist.l_checksum = BYTE_GET (elib[cnt].l_checksum);
+         liblist.l_version = BYTE_GET (elib[cnt].l_version);
+         liblist.l_flags = BYTE_GET (elib[cnt].l_flags);
+
+         strftime (timebuf, 20, "%Y-%m-%dT%H:%M:%S", gmtime (&time));
+
+         printf ("%3d: %-20s %s %#10lx %-7ld", cnt,
+                 dynamic_strings + liblist.l_name, timebuf,
+                 liblist.l_checksum, liblist.l_version);
+
+         if (liblist.l_flags == 0)
+           puts (" NONE");
+         else
            {
-             pnt = strtab + symtab[si].st_name;
-             
-             printf ("%3d %3d: %8lx %5ld %6s %6s %2d ", si, hn,
-                     symtab[si].st_value,
-                     symtab[si].st_size,
-                     sttinfo [ELF_ST_TYPE (symtab[si].st_info)],
-                     stbinfo [ELF_ST_BIND (symtab[si].st_info)],
-                     symtab[si].st_other);
-             
-             if (symtab[si].st_shndx == 0)
-               printf ("UND");
-             else if ((symtab[si].st_shndx & 0xffff) == 0xfff1)
-               printf ("ABS");
-             else if ((symtab[si].st_shndx & 0xffff) == 0xfff2)
-               printf ("COM");
-             else
-               printf ("%3d", symtab[si].st_shndx);
-             printf (" %s\n", pnt);
+             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);
     }
-  else if (!do_using_dynamic)
+
+  if (options_offset != 0)
     {
-      int i;
-      unsigned short * vers_addr;
-         
-      spnt      = elf_sections;
-      vers_addr = (short *) (version_info [DT_VERNEEDNUM - DT_VERSYM]
-                            + header - loadaddr);
+      Elf_External_Options *eopt;
+      Elf_Internal_Shdr *sect = section_headers;
+      Elf_Internal_Options *iopt;
+      Elf_Internal_Options *option;
+      size_t offset;
+      int cnt;
+
+      /* Find the section header so that we get the size.  */
+      while (sect->sh_type != SHT_MIPS_OPTIONS)
+       ++sect;
+
+      GET_DATA_ALLOC (options_offset, sect->sh_size, eopt,
+                     Elf_External_Options *, "options");
+
+      iopt = (Elf_Internal_Options *) malloc ((sect->sh_size / sizeof (eopt))
+                                             * sizeof (*iopt));
+      if (iopt == NULL)
+       {
+         error (_("Out of memory"));
+         return 0;
+       }
 
-      for (i = 0; i < epnt->e_shnum; i++, spnt++)
+      offset = cnt = 0;
+      option = iopt;
+      while (offset < sect->sh_size)
        {
-         unsigned int si;
-         
-         if (spnt->sh_type != SHT_SYMTAB && spnt->sh_type != SHT_DYNSYM)
-           continue;
-         
-         printf (_("\nSymbol data for: %s\n"), SECTION_NAME (spnt));
-         printf (_("  Num:    Value  Size Type    Bind   Ot Ndx Name\n"));
-         
-         symtab = (Elf_Sym *) (header + spnt->sh_offset);
-         strtab = (char *) (header + elf_sections [spnt->sh_link].sh_offset);
-         
-         for (si = 0; si < spnt->sh_size / spnt->sh_entsize; si++)
-           {
-             Elf_Sym   ssym;
-             Elf_Sym * psym;
-             Elf_Sym * new_header;
+         Elf_External_Options *eoption;
 
-             psym = symtab + si;
-             
-             if (must_swap)
-               {
-                 ssym = * psym;
-                 
-                 new_header = & ssym;
+         eoption = (Elf_External_Options *) ((char *) eopt + offset);
+
+         option->kind = BYTE_GET (eoption->kind);
+         option->size = BYTE_GET (eoption->size);
+         option->section = BYTE_GET (eoption->section);
+         option->info = BYTE_GET (eoption->info);
+
+         offset += option->size;
+         ++option;
+         ++cnt;
+       }
 
-                 BYTE_SWAP (psym, st_name);
-                 BYTE_SWAP (psym, st_value);
-                 BYTE_SWAP (psym, st_size);
-                 BYTE_SWAP (psym, st_shndx);
+      printf (_("\nSection '%s' contains %d entries:\n"),
+             string_table + sect->sh_name, cnt);
 
-                 psym = new_header;
+      option = iopt;
+      while (cnt-- > 0)
+       {
+         size_t len;
+
+         switch (option->kind)
+           {
+           case ODK_NULL:
+             /* This shouldn't happen.  */
+             printf (" NULL       %d %lx", option->section, option->info);
+             break;
+           case ODK_REGINFO:
+             printf (" REGINFO    ");
+             if (elf_header.e_machine == EM_MIPS)
+               {
+                 /* 32bit form.  */
+                 Elf32_External_RegInfo *ereg;
+                 Elf32_RegInfo reginfo;
+
+                 ereg = (Elf32_External_RegInfo *) (option + 1);
+                 reginfo.ri_gprmask = BYTE_GET (ereg->ri_gprmask);
+                 reginfo.ri_cprmask[0] = BYTE_GET (ereg->ri_cprmask[0]);
+                 reginfo.ri_cprmask[1] = BYTE_GET (ereg->ri_cprmask[1]);
+                 reginfo.ri_cprmask[2] = BYTE_GET (ereg->ri_cprmask[2]);
+                 reginfo.ri_cprmask[3] = BYTE_GET (ereg->ri_cprmask[3]);
+                 reginfo.ri_gp_value = BYTE_GET (ereg->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]);
                }
-             
-             pnt = strtab + psym->st_name;
-             
-             printf ("  %3d: %8lx %5ld %-7s %-6s %2d ", si,
-                     psym->st_value,
-                     psym->st_size,
-                     sttinfo [ELF_ST_TYPE (psym->st_info)],
-                     stbinfo [ELF_ST_BIND (psym->st_info)],
-                     psym->st_other);
-             
-             if (psym->st_shndx == 0)
-               printf ("UND");
-             else if ((psym->st_shndx & 0xffff) == 0xfff1)
-               printf ("ABS");
-             else if ((psym->st_shndx & 0xffff) == 0xfff2)
-               printf ("COM");
              else
-               printf ("%3d", psym->st_shndx);
-             printf (" %s", pnt);
-             
-             if (spnt->sh_type == SHT_DYNSYM &&
-                 version_info [DT_VERSIONTAGIDX (DT_VERSYM)] != 0 &&
-                 ((vers_addr[si] & 0x8000) || vers_addr[si] > 1))
                {
-                 Elf_Vernaux * a;
-                 
-                 if (elf_sections [psym->st_shndx].sh_type == SHT_NOBITS
-                     || psym->st_shndx == SHN_UNDEF)
-                   {
-                     Elf_Verneed * v;
-                     
-                     /* We must test both.  */
-                     v = (Elf_Verneed *)
-                       (version_info [DT_VERSIONTAGIDX (DT_VERNEED)]
-                        + header - loadaddr);
-                     
-                     for (;;)
-                       {
-                         a = (Elf_Vernaux *)((char *)v + v->vn_aux);
-                         
-                         while (a->vna_other != vers_addr[si]
-                                && a->vna_next != 0)
-                           a = (Elf_Vernaux *)((char *)a + a->vna_next);
-                         
-                         if (a->vna_other == vers_addr[si])
-                           break;
-
-                         if (v->vn_next == 0)
-                           {
-                             if (elf_sections [psym->st_shndx].sh_type
-                                 != SHT_NOBITS)
-                               error (_("bad dynamic symbol"));
-                             
-                             a = NULL;
-                             break;
-                           }
-                         
-                         v = (Elf_Verneed *)((char *)v + v->vn_next);
-                       }
-                     
-                     if (a != NULL)
-                       printf ("@%s (%d)", strtab + a->vna_name, a->vna_other);
-                   }
-                 else if ((elf_sections [psym->st_shndx].sh_type
-                           == SHT_NOBITS && a == NULL)
-                          || psym->st_shndx != SHN_UNDEF)
-                   {
-                     Elf_Verdef * v;
-                     Elf_Verdaux * b;
-                     
-                     v = (Elf_Verdef *)
-                       (version_info [DT_VERSIONTAGIDX (DT_VERDEF)]
-                        + header - loadaddr);
-                         
-                     if (vers_addr[si] == 0x8001)
-                       pnt = "";
-                     else
-                       {
-                         while (v->vd_ndx != (vers_addr [si] & 0x7fff))
-                           v = (Elf_Verdef *)((char *)v + v->vd_next);
-                         
-                         b = (Elf_Verdaux *) ((char *)v + v->vd_aux);
-                         
-                         if (psym->st_name != b->vda_name)
-                           pnt = strtab + b->vda_name;
-                         else
-                           pnt = NULL;
-                       }
-                     
-                     if (pnt)
-                       printf ((vers_addr [si] & 0x8000)
-                               ? "@%s" : "@@%s", pnt);
-                   }
+                 /* 64 bit form.  */
+                 Elf64_External_RegInfo *ereg;
+                 Elf64_Internal_RegInfo reginfo;
+
+                 ereg = (Elf64_External_RegInfo *) (option + 1);
+                 reginfo.ri_gprmask = BYTE_GET (ereg->ri_gprmask);
+                 reginfo.ri_cprmask[0] = BYTE_GET (ereg->ri_cprmask[0]);
+                 reginfo.ri_cprmask[1] = BYTE_GET (ereg->ri_cprmask[1]);
+                 reginfo.ri_cprmask[2] = BYTE_GET (ereg->ri_cprmask[2]);
+                 reginfo.ri_cprmask[3] = BYTE_GET (ereg->ri_cprmask[3]);
+                 reginfo.ri_gp_value = BYTE_GET (ereg->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]);
                }
-             
-             puts ("");
+             ++option;
+             continue;
+           case ODK_EXCEPTIONS:
+             fputs (" EXCEPTIONS fpe_min(", stdout);
+             process_mips_fpe_exception (option->info & OEX_FPU_MIN);
+             fputs (") fpe_max(", stdout);
+             process_mips_fpe_exception ((option->info & OEX_FPU_MAX) >> 8);
+             fputs (")", stdout);
+
+             if (option->info & OEX_PAGE0)
+               fputs (" PAGE0", stdout);
+             if (option->info & OEX_SMM)
+               fputs (" SMM", stdout);
+             if (option->info & OEX_FPDBUG)
+               fputs (" FPDBUG", stdout);
+             if (option->info & OEX_DISMISS)
+               fputs (" DISMISS", stdout);
+             break;
+           case ODK_PAD:
+             fputs (" PAD       ", stdout);
+             if (option->info & OPAD_PREFIX)
+               fputs (" PREFIX", stdout);
+             if (option->info & OPAD_POSTFIX)
+               fputs (" POSTFIX", stdout);
+             if (option->info & OPAD_SYMBOL)
+               fputs (" SYMBOL", stdout);
+             break;
+           case ODK_HWPATCH:
+             fputs (" HWPATCH   ", stdout);
+             if (option->info & OHW_R4KEOP)
+               fputs (" R4KEOP", stdout);
+             if (option->info & OHW_R8KPFETCH)
+               fputs (" R8KPFETCH", stdout);
+             if (option->info & OHW_R5KEOP)
+               fputs (" R5KEOP", stdout);
+             if (option->info & OHW_R5KCVTL)
+               fputs (" R5KCVTL", stdout);
+             break;
+           case ODK_FILL:
+             fputs (" FILL       ", stdout);
+             /* XXX Print content of info word?  */
+             break;
+           case ODK_TAGS:
+             fputs (" TAGS       ", stdout);
+             /* XXX Print content of info word?  */
+             break;
+           case ODK_HWAND:
+             fputs (" HWAND     ", stdout);
+             if (option->info & OHWA0_R4KEOP_CHECKED)
+               fputs (" R4KEOP_CHECKED", stdout);
+             if (option->info & OHWA0_R4KEOP_CLEAN)
+               fputs (" R4KEOP_CLEAN", stdout);
+             break;
+           case ODK_HWOR:
+             fputs (" HWOR      ", stdout);
+             if (option->info & OHWA0_R4KEOP_CHECKED)
+               fputs (" R4KEOP_CHECKED", stdout);
+             if (option->info & OHWA0_R4KEOP_CLEAN)
+               fputs (" R4KEOP_CLEAN", stdout);
+             break;
+           case ODK_GP_GROUP:
+             printf (" GP_GROUP  %#06lx  self-contained %#06lx",
+                     option->info & OGP_GROUP,
+                     (option->info & OGP_SELF) >> 16);
+             break;
+           case ODK_IDENT:
+             printf (" IDENT     %#06lx  self-contained %#06lx",
+                     option->info & OGP_GROUP,
+                     (option->info & OGP_SELF) >> 16);
+             break;
+           default:
+             /* This shouldn't happen.  */
+             printf (" %3d ???     %d %lx",
+                     option->kind, option->section, option->info);
+             break;
            }
+
+         len = sizeof (*eopt);
+         while (len < option->size)
+           if (((char *) option)[len] >= ' '
+               && ((char *) option)[len] < 0x7f)
+             printf ("%c", ((char *) option)[len++]);
+           else
+             printf ("\\%03o", ((char *) option)[len++]);
+
+         fputs ("\n", stdout);
+         ++option;
        }
+
+      free (eopt);
     }
 
-  if (! do_version)
-    return;
-  
-  spnt = elf_sections;
-  
-  for (i = 0; i < epnt->e_shnum; i++, spnt++)
+  if (conflicts_offset != 0 && conflictsno != 0)
     {
-      if (spnt->sh_type == SHT_GNU_verdef)
+      Elf32_External_Conflict *econf32;
+      Elf64_External_Conflict *econf64;
+      Elf32_Conflict *iconf;
+      size_t cnt;
+
+      if (dynamic_symbols == NULL)
        {
-         Elf_Shdr * dspnt = &elf_sections[spnt->sh_link];
-         unsigned int idx;
-         unsigned int cnt;
-                 
-         strtab = (char *) (header - loadaddr + dynamic_info[DT_STRTAB]);
-                 
-         printf (_("\n Version definitions:%s (%#0x entries)\n"),
-                 SECTION_NAME(spnt), spnt->sh_info);
-         printf (_("Addr: %#08x  Offset: %#08x  Link: %x (%s)\n"),
-                 spnt->sh_addr, spnt->sh_offset, spnt->sh_link,
-                 SECTION_NAME(dspnt));
-                 
-         for (idx = cnt = 0; cnt < spnt->sh_info; ++cnt)
-           {
-             Elf_Verdef *  ent = (Elf_Verdef *)
-               ((char *) header + spnt->sh_offset + idx);
-             Elf_Verdaux * aux = (Elf_Verdaux *)
-               ((char *) ent + ent->vd_aux);
-             int j, isum;
-             
-             printf (_("%#06x: Rev: %d  Flags: "), idx, ent->vd_version);
-             
-             if (ent->vd_flags == 0)
-               printf (_("none"));
-             else
-               {
-                 int f = 1;
-                 if (ent->vd_flags & 0x1)
-                   {
-                     printf (_("BASE"));
-                     f = 0;
-                   }
-                 if (ent->vd_flags & 0x2)
-                   {
-                     printf (_("%sWEAK"), f ? "" : "|");
-                     f = 0;
-                   }
-               }
-             printf (_("  Index: %d  Cnt: %d  Name: %s\n"),
-                     ent->vd_ndx, ent->vd_cnt, strtab + aux->vda_name);
-             j = 1;
-             isum = idx + ent->vd_aux;
-             while (j < ent->vd_cnt)
-               {
-                 isum += aux->vda_next;
-                 aux = (Elf_Verdaux *)((char *)aux + aux->vda_next);
-                 printf (_("  %#06x: Parent %d: %s\n"), isum, j,
-                        strtab + aux->vda_name);
-                 ++j;
-               }
+         error (_("conflict list with without table"));
+         return 0;
+       }
 
-             idx += ent->vd_next;
-           }
+      iconf = (Elf32_Conflict *) malloc (conflictsno * sizeof (*iconf));
+      if (iconf == NULL)
+       {
+         error (_("Out of memory"));
+         return 0;
        }
-      
-      if (spnt->sh_type == SHT_GNU_verneed)
+
+      if (binary_class == ELFCLASS32)
        {
-         Elf_Shdr * dspnt = &elf_sections[spnt->sh_link];
-         unsigned int idx;
-         unsigned int cnt;
-         
-         strtab = (char *) (header - loadaddr + dynamic_info[DT_STRTAB]);
-         printf (_("\n Needed versions:%s (%#0x entries)\n"),
-                SECTION_NAME (spnt), spnt->sh_info);
-         printf (_("Addr: %#08x  Offset: %#08x  Link: %x (%s)\n"),
-                spnt->sh_addr, spnt->sh_offset, spnt->sh_link,
-                SECTION_NAME (dspnt));
-
-         for (idx = cnt = 0; cnt < spnt->sh_info; ++cnt)
-           {
-             Elf_Verneed * ent = (Elf_Verneed *)
-               ((char *) header + spnt->sh_offset + idx);
-             Elf_Vernaux * aux = (Elf_Vernaux *)
-               ((char *) ent + ent->vn_aux);
-             int j, isum;
-             
-             printf (_("%#06x: Version: %d  File: %s  Cnt: %d\n"),
-                     idx, ent->vn_version, strtab + ent->vn_file,ent->vn_cnt);
-             
-             for (j = 0, isum = idx + ent->vn_aux; j < ent->vn_cnt; ++j)
-               {
-                 printf (_("  %#06x: Name: %s  Flags: %s  Version: %d\n"),
-                         isum, strtab+aux->vna_name,
-                         aux->vna_flags & 0x2 ? "WEAK" : "none",
-                         aux->vna_other);
-                 isum += aux->vna_next;
-                 aux = (Elf_Vernaux *)((char *) aux + aux->vna_next);
-               }
+         GET_DATA_ALLOC (conflicts_offset, conflictsno * sizeof (*econf32),
+                         econf32, Elf32_External_Conflict *, "conflict");
 
-             idx += ent->vn_next;
-           }
+         for (cnt = 0; cnt < conflictsno; ++cnt)
+           iconf[cnt] = BYTE_GET (econf32[cnt]);
        }
-      
-      if (spnt->sh_type == SHT_GNU_versym)
-       {
-         Elf_Shdr * dspnt = &elf_sections[spnt->sh_link];
-         int total = spnt->sh_size / spnt->sh_entsize;
-         int cnt;
-         unsigned short * p = (short *)
-           (version_info[DT_VERNEEDNUM - DT_VERSYM] + header - loadaddr);
-
-         symtab = (Elf_Sym *) (header + dspnt->sh_offset);
-         strtab = (char *) (header + elf_sections[dspnt->sh_link].sh_offset);
-
-         printf (_("\n Version symbols:%s (%#0x entries)\n"),
-                 SECTION_NAME (spnt), total);
-         printf (_("Addr: %#08x  Offset: %#08x  Link: %x (%s)\n"),
-                 spnt->sh_addr, spnt->sh_offset, spnt->sh_link,
-                 SECTION_NAME (dspnt));
-         
-         for (cnt = 0; cnt < total; cnt += 4)
-           {
-             int j, nn;
-             
-             printf ("%#08x:", cnt);
-             
-             for (j = 0; (j < 4) && (cnt + j) < total; ++j)
-               switch (p[cnt + j])
-                 {
-                 case 0:
-                   printf ("   0 (*local*)  ");
-                   break;
-                 case 1:
-                   printf ("   1 (*global*) ");
-                   break;
-                 default:
-                   nn = printf ("%4x%c", p[cnt + j] & 0x7fff,
-                                p[cnt + j] & 0x8000 ? 'h' : ' ');
-                   if (elf_sections[symtab[cnt + j].st_shndx].sh_type
-                       == SHT_NOBITS)
-                     {
-                       /* We must test both.  */
-                       Elf_Verneed * v = (Elf_Verneed *)
-                         (version_info [DT_VERNEEDNUM - DT_VERNEED]
-                          + header - loadaddr);
-                       Elf_Vernaux * a = NULL;
-                     
-                       for (;;)
-                         {
-                           a = (Elf_Vernaux *)((char *) v + v->vn_aux);
-                           
-                           while (a->vna_other != p[cnt + j]
-                                  && a->vna_next != 0)
-                             a = (Elf_Vernaux *)((char *) a + a->vna_next);
-                           
-                           if (a->vna_other == p[cnt + j])
-                             break;
-                           
-                           if (v->vn_next == 0)
-                             {
-                               a = NULL;
-                               break;
-                             }
-                           
-                           v = (Elf_Verneed *)((char *)v + v->vn_next);
-                         }
-                     
-                       if (a != NULL)
-                         nn += printf ("(%s)", strtab + a->vna_name);
-                       else
-                         {
-                           Elf_Verdef * v = (Elf_Verdef *)
-                             (version_info [DT_VERNEEDNUM - DT_VERDEF]
-                              + header - loadaddr);
-                           Elf_Verdaux * a;
-                           
-                           if (p[cnt + j] == 0x8001)
-                             pnt = "";
-                           else
-                             {
-                               while (v->vd_ndx != (p[cnt + j]&0x7fff))
-                                 v = (Elf_Verdef *)((char *)v + v->vd_next);
-                               
-                               a = (Elf_Verdaux *) ((char *) v + v->vd_aux);
-                               pnt = strtab + a->vda_name;
-                             }
-                           
-                           if (pnt)
-                             nn += printf ("(%s)", pnt);
-                         }
-                       
-                       if (nn <16)
-                         printf ("%*c", 16 - nn, ' ');
-                     }
-                   else if (symtab[cnt + j].st_shndx ==SHN_UNDEF)
-                     {
-                       Elf_Verneed * v = (Elf_Verneed *)
-                         (version_info [DT_VERNEEDNUM - DT_VERNEED]
-                          + header - loadaddr);
-                       Elf_Vernaux * a;
-                     
-                       for (;;)
-                         {
-                           a = (Elf_Vernaux *)((char *) v + v->vn_aux);
-                           
-                           while (a->vna_other != p[cnt + j]
-                                  && a->vna_next != 0)
-                             a = (Elf_Vernaux *)((char *)a + a->vna_next);
-                           
-                           if (a->vna_other == p[cnt + j])
-                             break;
-                           
-                           v = (Elf_Verneed *)((char *) v + v->vn_next);
-                         }
-                     
-                       nn += printf ("(%s)", strtab + a->vna_name);
-                       
-                       if (nn <16)
-                         printf ("%*c", 16 - nn, ' ');
-                     }
-                   else
-                     {
-                       Elf_Verdef * v = (Elf_Verdef *)
-                         (version_info [DT_VERNEEDNUM - DT_VERDEF]
-                          + header - loadaddr);
-                       Elf_Verdaux * a;
-                     
-                       if (p[cnt + j] == 0x8001)
-                         pnt = "";
-                       else
-                         {
-                           while (v->vd_ndx != (p[cnt + j] & 0x7fff))
-                             v = (Elf_Verdef *)((char *) v + v->vd_next);
-                           
-                           a = (Elf_Verdaux *) ((char *) v + v->vd_aux);
-                           pnt = strtab + a->vda_name;
-                         }
-                     
-                       if (pnt)
-                         nn += printf ("(%s)", pnt);
-                       
-                       if (nn <16)
-                         printf ("%*c", 16 - nn, ' ');
-                     }
-                 }
-             
-             printf ("\n");
-           }
+      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;
 }
 
-static void
-process_section_contents ()
+static int
+process_arch_specific (file)
+     FILE *file;
 {
-  Elf_Shdr *    spnt;
-  int             i;
+  switch (elf_header.e_machine)
+    {
+    case EM_MIPS:
+    case EM_MIPS_RS4_BE:
+      return process_mips_specific (file);
+      break;
+    default:
+      break;
+    }
+  return 1;
+}
 
-  if (! do_dump)
-    return;
+static int
+get_file_header (file)
+     FILE * file;
+{
+  Elf32_External_Ehdr ehdr;
 
-  spnt = elf_sections;
+  if (fread (& ehdr, sizeof (ehdr), 1, file) != 1)
+    return 0;
 
-  for (i = 0; i < epnt->e_shnum; i++, spnt++)
-    {
-      int             bytes;
-      int             addr;
-      int             lbytes;
-      unsigned char * my_addr;
+  memcpy (elf_header.e_ident, ehdr.e_ident, EI_NIDENT);
 
-#ifdef SUPPORT_DISASSEMBLY
-      /* See if we need an assembly dump of this section */
-      
-      if ((i < NUM_DUMP_SECTS) && (dump_sects[i] & DISASS_DUMP))
-       {
-         printf (_("\nAssembly dump of section %s\n"), SECTION_NAME (spnt));
-         
-         bytes   = spnt->sh_size;
-         addr    = spnt->sh_addr;
-         my_addr = (unsigned char *) (header + spnt->sh_offset);
-         
-         while (bytes > 0)
-           {
-             printf ("0x%8.8x  ", addr);
-             
-             switch (epnt->e_machine)
-               {
-                 case EM_386:
-                 case EM_486:
-                   lbytes =  db_disasm ((unsigned int) my_addr, 0, 0) -
-                     ((unsigned int) my_addr);
-                   break;
-                 case EM_68K:
-                   lbytes = (m68k_disass ((unsigned int) my_addr, addr)
-                             - (unsigned int) my_addr);
-                   break;
-                 default:
-                   warn (_("Unable to disassemble code for this platform\n"));
-                   return;
-                 }
-               
-               addr    += lbytes;
-               my_addr += lbytes;
-               bytes   -= lbytes;
-               
-               printf ("\n");
-             }
-         }
-#endif
-      
-       /* OK, see if we need a hex dump of this section.  */
-       if ((i < NUM_DUMP_SECTS) && (dump_sects[i] & HEX_DUMP))
-         {
-           int j;
-           int k;
-           
-           printf (_("\nHex dump of section %s\n"), SECTION_NAME (spnt));
-           
-           bytes   = spnt->sh_size;
-           addr    = spnt->sh_addr;
-           my_addr = (unsigned char *) (header + spnt->sh_offset);
-           
-           while (bytes)
-             {
-               lbytes = (bytes > 16 ? 16 : bytes);
-               
-               printf ("0x%8.8x ",addr);
-               
-               switch (epnt->e_ident [EI_DATA])
-                 {
-                 case ELFDATA2LSB:
-                   for (j = 15; j >= 0; j --)
-                     {
-                       if (j < lbytes)
-                         printf ("%2.2x", my_addr[j]);
-                       else
-                         printf ("  ");
-                       
-                       if (!(j & 0x3))
-                         printf (" ");
-                     }
-                   break;
-                   
-                 case ELFDATA2MSB:
-                   for (j = 0; j < 16; j++)
-                     {
-                       if (j < lbytes)
-                         printf ("%2.2x", my_addr[j]);
-                       else
-                         printf ("  ");
-                       
-                       if ((j & 3) == 3)
-                         printf (" ");
-                     }
-                   break;
-                 }
-               
-               for (j = 0; j < lbytes; j++)
-                 {
-                   k = my_addr [j];
-                   if (k >= ' ' && k < 0x80)
-                     printf ("%c", k);
-                   else
-                     printf (".");
-                 }
-               
-               printf ("\n");
-               
-               my_addr += lbytes;
-               addr    += lbytes;
-               bytes   -= lbytes;
-             }
-         }
-    }
+  if (elf_header.e_ident [EI_DATA] == ELFDATA2LSB)
+    byte_get = byte_get_little_endian;
+  else
+    byte_get = byte_get_big_endian;
+
+  elf_header.e_entry     = BYTE_GET (ehdr.e_entry);
+  elf_header.e_phoff     = BYTE_GET (ehdr.e_phoff);
+  elf_header.e_shoff     = BYTE_GET (ehdr.e_shoff);
+  elf_header.e_version   = BYTE_GET (ehdr.e_version);
+  elf_header.e_flags     = BYTE_GET (ehdr.e_flags);
+  elf_header.e_type      = BYTE_GET (ehdr.e_type);
+  elf_header.e_machine   = BYTE_GET (ehdr.e_machine);
+  elf_header.e_ehsize    = BYTE_GET (ehdr.e_ehsize);
+  elf_header.e_phentsize = BYTE_GET (ehdr.e_phentsize);
+  elf_header.e_phnum     = BYTE_GET (ehdr.e_phnum);
+  elf_header.e_shentsize = BYTE_GET (ehdr.e_shentsize);
+  elf_header.e_shnum     = BYTE_GET (ehdr.e_shnum);
+  elf_header.e_shstrndx  = BYTE_GET (ehdr.e_shstrndx);
+
+  return 1;
 }
 
 static void
 process_file (file_name)
      char * file_name;
 {
-  int          fd;
+  FILE *       file;
   struct stat  statbuf;
-    
-  must_swap = 0;
-  
-  fd = open (file_name, O_RDONLY);
-  if (fd == -1)
+  unsigned int i;
+
+  if (stat (file_name, & statbuf) < 0)
     {
-      error (_("Input file %s not found.\n"), file_name);
+      error (_("Cannot stat input file %s.\n"), file_name);
       return;
     }
-      
-  if (fstat (fd, & statbuf) < 0)
+
+  file = fopen (file_name, "rb");
+  if (file == NULL)
     {
-      error (_("Cannot stat input file %s.\n"), file_name);
-      close (fd);
+      error (_("Input file %s not found.\n"), file_name);
       return;
     }
-  
-  header = mmap (0, statbuf.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
-  
-  if ((header == (char *) -1) || (header == NULL))
+
+  if (! get_file_header (file))
     {
-      error (_("Cannot mmap %s: %s\n"), file_name, strerror (errno));
-      close (fd);
+      error (_("%s: Failed to read file header\n"), file_name);
+      fclose (file);
       return;
     }
-  
-  close (fd);
 
-  epnt = (Elf_Ehdr *) header;
+  /* Initialise per file variables.  */
+  for (i = NUM_ELEM (version_info); i--;)
+    version_info[i] = 0;
 
+  for (i = NUM_ELEM (dynamic_info); i--;)
+    dynamic_info[i] = 0;
+
+  /* Process the file.  */
   if (show_name)
     printf (_("\nFile: %s\n"), file_name);
-  
-  if (! process_elf_header ())
+
+  if (! process_file_header ())
     {
-      munmap (header, statbuf.st_size);
+      fclose (file);
       return;
     }
-  
-  process_program_headers ();
-  
-  if (loadaddr == -1)
-    {
-      /* Very strange. */
-      loadaddr = 0;
-    }
 
-  process_section_headers ();
+  process_section_headers (file);
 
-  process_dynamic_segment ();
+  process_program_headers (file);
 
-  process_symbol_table ();
+  process_dynamic_segment (file);
 
-  process_section_contents ();
-  
-  munmap (header, statbuf.st_size);
+  process_relocs (file);
+
+  process_symbol_table (file);
+
+  process_syminfo (file);
+
+  process_version_sections (file);
+
+  process_section_contents (file);
+
+  process_arch_specific (file);
 
-  if (must_swap)
+  fclose (file);
+
+  if (section_headers)
     {
-      if (epnt)
-       {
-         free (epnt);
-         epnt = NULL;
-       }
+      free (section_headers);
+      section_headers = NULL;
+    }
 
-      if (elf_sections)
-       {
-         free (elf_sections);
-         elf_sections = NULL;
-       }
+  if (string_table)
+    {
+      free (string_table);
+      string_table = NULL;
+    }
+
+  if (dynamic_strings)
+    {
+      free (dynamic_strings);
+      dynamic_strings = NULL;
+    }
+
+  if (dynamic_symbols)
+    {
+      free (dynamic_symbols);
+      dynamic_symbols = NULL;
+    }
+
+  if (dynamic_syminfo)
+    {
+      free (dynamic_syminfo);
+      dynamic_syminfo = NULL;
     }
 }
 
@@ -2230,20 +5661,22 @@ main (argc, argv)
      int     argc;
      char ** argv;
 {
-  parse_args (argc, argv);
+#if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES)
+  setlocale (LC_MESSAGES, "");
+#endif
+  bindtextdomain (PACKAGE, LOCALEDIR);
+  textdomain (PACKAGE);
 
-  expected_endian = 0x12345678;
-  
-  if (* ((char *) & expected_endian) == 0x12)
-    expected_endian = ELFDATA2MSB;
-  else
-    expected_endian = ELFDATA2LSB;
+  parse_args (argc, argv);
 
   if (optind < (argc - 1))
     show_name = 1;
-  
+
   while (optind < argc)
     process_file (argv [optind ++]);
 
+  if (dump_sects != NULL)
+    free (dump_sects);
+
   return 0;
 }