]> git.ipfire.org Git - thirdparty/binutils-gdb.git/blobdiff - binutils/readelf.c
Add entry for change in solib-osf.c (osf_in_dynsym_resolve_code).
[thirdparty/binutils-gdb.git] / binutils / readelf.c
index 64207d95e4e16a5afae5129ee1fefabc218e3237..53ca41a9689acca7a619374498e460bea79d27f8 100644 (file)
@@ -1,5 +1,5 @@
 /* readelf.c -- display contents of an ELF format file
-   Copyright (C) 1998, 99, 2000 Free Software Foundation, Inc.
+   Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 
    Originally developed by Eric Youngdale <eric@andante.jic.com>
    Modifications by Nick Clifton <nickc@cygnus.com>
 #include "elf/pj.h"
 #include "elf/avr.h"
 #include "elf/ia64.h"
+#include "elf/cris.h"
+#include "elf/i860.h"
+#include "elf/x86-64.h"
+#include "elf/s390.h"
 
 #include "bucomm.h"
 #include "getopt.h"
 
-char *                 program_name = "readelf";
-unsigned int           dynamic_addr;
-bfd_size_type                  dynamic_size;
-unsigned int           rela_addr;
-unsigned int           rela_size;
-char *                 dynamic_strings;
+char *                 program_name = "readelf";
+unsigned int           dynamic_addr;
+bfd_size_type          dynamic_size;
+unsigned int           rela_addr;
+unsigned int           rela_size;
+char *                 dynamic_strings;
 char *                 string_table;
+unsigned long          string_table_length;
 unsigned long           num_dynamic_syms;
-Elf_Internal_Sym *     dynamic_symbols;
+Elf_Internal_Sym *     dynamic_symbols;
 Elf_Internal_Syminfo * dynamic_syminfo;
-unsigned long          dynamic_syminfo_offset;
+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;
+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                    show_name;
+int                    do_dynamic;
+int                    do_syms;
+int                    do_reloc;
+int                    do_sections;
+int                    do_segments;
+int                    do_unwind;
+int                    do_using_dynamic;
+int                    do_header;
+int                    do_dump;
+int                    do_version;
 int                    do_histogram;
 int                    do_debugging;
 int                     do_debug_info;
@@ -111,6 +117,8 @@ int                     do_debug_abbrevs;
 int                     do_debug_lines;
 int                     do_debug_pubnames;
 int                     do_debug_aranges;
+int                     do_debug_frames;
+int                     do_debug_frames_interp;
 int                     do_arch;
 int                     do_notes;
 int                    is_32bit_elf;
@@ -145,6 +153,8 @@ static const char *       get_mips_dynamic_type       PARAMS ((unsigned long));
 static const char *       get_sparc64_dynamic_type    PARAMS ((unsigned long));
 static const char *       get_parisc_dynamic_type     PARAMS ((unsigned long));
 static const char *       get_dynamic_type            PARAMS ((unsigned long));
+static int               slurp_rela_relocs           PARAMS ((FILE *, unsigned long, unsigned long, Elf_Internal_Rela **, unsigned long *));
+static int               slurp_rel_relocs            PARAMS ((FILE *, unsigned long, unsigned long, Elf_Internal_Rel **, unsigned long *));
 static int                dump_relocations            PARAMS ((FILE *, unsigned long, unsigned long, Elf_Internal_Sym *, unsigned long, char *, int));
 static char *             get_file_type               PARAMS ((unsigned));
 static char *             get_machine_name            PARAMS ((unsigned));
@@ -152,20 +162,23 @@ static void                 decode_ARM_machine_flags    PARAMS ((unsigned, char []));
 static char *             get_machine_flags           PARAMS ((unsigned, unsigned));
 static const char *       get_mips_segment_type       PARAMS ((unsigned long));
 static const char *       get_parisc_segment_type     PARAMS ((unsigned long));
+static const char *       get_ia64_segment_type       PARAMS ((unsigned long));
 static const char *       get_segment_type            PARAMS ((unsigned long));
 static const char *       get_mips_section_type_name  PARAMS ((unsigned int));
 static const char *       get_parisc_section_type_name PARAMS ((unsigned int));
+static const char *       get_ia64_section_type_name  PARAMS ((unsigned int));
 static const char *       get_section_type_name       PARAMS ((unsigned int));
 static const char *       get_symbol_binding          PARAMS ((unsigned int));
 static const char *       get_symbol_type             PARAMS ((unsigned int));
 static const char *       get_symbol_visibility       PARAMS ((unsigned int));
 static const char *       get_symbol_index_type       PARAMS ((unsigned int));
-static const char *       get_dynamic_flags          PARAMS ((bfd_vma));
+static const char *       get_dynamic_flags          PARAMS ((bfd_vma));
 static void               usage                       PARAMS ((void));
 static void               parse_args                  PARAMS ((int, char **));
 static int                process_file_header         PARAMS ((void));
 static int                process_program_headers     PARAMS ((FILE *));
 static int                process_section_headers     PARAMS ((FILE *));
+static int               process_unwind              PARAMS ((FILE *));
 static void               dynamic_segment_mips_val    PARAMS ((Elf_Internal_Dyn *));
 static void               dynamic_segment_parisc_val  PARAMS ((Elf_Internal_Dyn *));
 static int                process_dynamic_segment     PARAMS ((FILE *));
@@ -182,19 +195,21 @@ static int                  get_64bit_program_headers   PARAMS ((FILE *, Elf_Internal_Phdr *))
 static int                get_file_header             PARAMS ((FILE *));
 static Elf_Internal_Sym * get_32bit_elf_symbols       PARAMS ((FILE *, unsigned long, unsigned long));
 static Elf_Internal_Sym * get_64bit_elf_symbols       PARAMS ((FILE *, unsigned long, unsigned long));
+static const char *      get_elf_section_flags       PARAMS ((bfd_vma));
 static int *              get_dynamic_data            PARAMS ((FILE *, unsigned int));
 static int                get_32bit_dynamic_segment   PARAMS ((FILE *));
 static int                get_64bit_dynamic_segment   PARAMS ((FILE *));
 #ifdef SUPPORT_DISASSEMBLY
-static int               disassemble_section         PARAMS ((Elf32_Internal_Shdr *, FILE *));
+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               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 int                display_debug_frames        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, int));
@@ -213,11 +228,11 @@ 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));
 static int               guess_is_rela               PARAMS ((unsigned long));
-static char *            get_note_type                  PARAMS ((unsigned int));
+static char *            get_note_type                  PARAMS ((unsigned int));
 static int               process_note                   PARAMS ((Elf32_Internal_Note *));
 static int               process_corefile_note_segment  PARAMS ((FILE *, bfd_vma, bfd_vma));
 static int               process_corefile_note_segments PARAMS ((FILE *));
-static int               process_corefile_contents      PARAMS ((FILE *));
+static int               process_corefile_contents      PARAMS ((FILE *));
 
 typedef int Elf32_Word;
 
@@ -227,27 +242,29 @@ typedef int Elf32_Word;
 #endif
 #define UNKNOWN -1
 
-#define SECTION_NAME(X)        (string_table + (X)->sh_name)
+#define SECTION_NAME(X)        ((X) == NULL ? "<none>" : \
+                                ((X)->sh_name >= string_table_length \
+                                 ? "<corrupt>" : string_table + (X)->sh_name))
 
 #define DT_VERSIONTAGIDX(tag)  (DT_VERNEEDNUM - (tag)) /* Reverse order! */
 
-#define BYTE_GET(field)        byte_get (field, sizeof (field))
+#define BYTE_GET(field)        byte_get (field, sizeof (field))
 
 /* If we can support a 64 bit data type then BFD64 should be defined
    and sizeof (bfd_vma) == 8.  In this case when translating from an
    external 8 byte field to an internal field, we can assume that the
-   internal field is also 8 bytes wide and so we can extact all the data.
+   internal field is also 8 bytes wide and so we can extract all the data.
    If, however, BFD64 is not defined, then we must assume that the
    internal data structure only has 4 byte wide fields that are the
    equivalent of the 8 byte wide external counterparts, and so we must
    truncate the data.  */
 #ifdef  BFD64
-#define BYTE_GET8(field)       byte_get (field, -8)
+#define BYTE_GET8(field)       byte_get (field, -8)
 #else
-#define BYTE_GET8(field)       byte_get (field, 8)
+#define BYTE_GET8(field)       byte_get (field, 8)
 #endif
 
-#define NUM_ELEM(array)        (sizeof (array) / sizeof ((array)[0]))
+#define NUM_ELEM(array)        (sizeof (array) / sizeof ((array)[0]))
 
 #define GET_DATA_ALLOC(offset, size, var, type, reason)                        \
   if (fseek (file, offset, SEEK_SET))                                  \
@@ -262,20 +279,20 @@ typedef int Elf32_Word;
     {                                                                  \
       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);                                                      \
+    }                                                                  \
+                                                                       \
+  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;                                                        \
+      return 0;                                                        \
     }
 
 
-#define GET_DATA(offset, var, reason)                                  \
+#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;                                                                \
     }                                                                  \
@@ -360,11 +377,13 @@ byte_get_little_endian (field, size)
       return  ((unsigned int) (field [0]))
        |    (((unsigned int) (field [1])) << 8);
 
+#ifndef BFD64
     case 8:
       /* We want to extract data from an 8 byte wide field and
         place it into a 4 byte wide field.  Since this is a little
         endian source we can juts use the 4 byte extraction code.  */
       /* Fall through.  */
+#endif
     case 4:
       return  ((unsigned long) (field [0]))
        |    (((unsigned long) (field [1])) << 8)
@@ -372,6 +391,7 @@ byte_get_little_endian (field, size)
        |    (((unsigned long) (field [3])) << 24);
 
 #ifdef BFD64
+    case 8:
     case -8:
       /* This is a special case, generated by the BYTE_GET8 macro.
         It means that we are loading an 8 byte value from a field
@@ -421,15 +441,15 @@ print_vma (vma, mode)
        case FULL_HEX:
          printf ("0x");
          /* drop through */
-         
+
        case LONG_HEX:
          printf_vma (vma);
          break;
-         
+
        case PREFIX_HEX:
          printf ("0x");
          /* drop through */
-         
+
        case HEX:
 #if BFD_HOST_64BIT_LONG
          printf ("%lx", vma);
@@ -450,7 +470,7 @@ print_vma (vma, mode)
            printf ("++%ld", _bfd_int64_low (vma));
          else
            printf ("%ld", _bfd_int64_low (vma));
-#endif   
+#endif
          break;
 
        case DEC_5:
@@ -462,13 +482,13 @@ print_vma (vma, mode)
            printf ("++%ld", _bfd_int64_low (vma));
          else
            printf ("%5ld", _bfd_int64_low (vma));
-#endif   
+#endif
          break;
-         
+
        case UNSIGNED:
 #if BFD_HOST_64BIT_LONG
          printf ("%lu", vma);
-#else    
+#else
          if (_bfd_int64_high (vma))
            /* ugg */
            printf ("++%lu", _bfd_int64_low (vma));
@@ -500,6 +520,7 @@ byte_get_big_endian (field, size)
        |   (((unsigned long) (field [1])) << 16)
        |   (((unsigned long) (field [0])) << 24);
 
+#ifndef BFD64
     case 8:
       /* Although we are extracing data from an 8 byte wide field, we
         are returning only 4 bytes of data.  */
@@ -507,8 +528,8 @@ byte_get_big_endian (field, size)
        |   (((unsigned long) (field [6])) << 8)
        |   (((unsigned long) (field [5])) << 16)
        |   (((unsigned long) (field [4])) << 24);
-
-#ifdef BFD64
+#else
+    case 8:
     case -8:
       /* This is a special case, generated by the BYTE_GET8 macro.
         It means that we are loading an 8 byte value from a field
@@ -530,8 +551,8 @@ byte_get_big_endian (field, size)
     }
 }
 
+/* Guess the relocation size commonly used by the specific machines.  */
 
-/* Guess the relocation sized based on the sized commonly used by the specific machine.  */
 static int
 guess_is_rela (e_machine)
      unsigned long e_machine;
@@ -546,7 +567,7 @@ guess_is_rela (e_machine)
     case EM_CYGNUS_M32R:
     case EM_CYGNUS_D10V:
     case EM_MIPS:
-    case EM_MIPS_RS4_BE:
+    case EM_MIPS_RS3_LE:
       return FALSE;
 
       /* Targets that use RELA relocations.  */
@@ -565,6 +586,11 @@ guess_is_rela (e_machine)
     case EM_MCORE:
     case EM_IA_64:
     case EM_AVR:
+    case EM_CRIS:
+    case EM_860:
+    case EM_X86_64:
+    case EM_S390:
+    case EM_S390_OLD:
       return TRUE;
 
     case EM_MMA:
@@ -591,144 +617,172 @@ guess_is_rela (e_machine)
     }
 }
 
-/* Display the contents of the relocation data found at the specified offset.  */
 static int
-dump_relocations (file, rel_offset, rel_size, symtab, nsyms, strtab, is_rela)
-     FILE *             file;
-     unsigned long      rel_offset;
-     unsigned long      rel_size;
-     Elf_Internal_Sym * symtab;
-     unsigned long      nsyms;
-     char *             strtab;
-     int                is_rela;
+slurp_rela_relocs (file, rel_offset, rel_size, relasp, nrelasp)
+     FILE *file;
+     unsigned long rel_offset;
+     unsigned long rel_size;
+     Elf_Internal_Rela **relasp;
+     unsigned long *nrelasp;
 {
-  unsigned int        i;
-  Elf_Internal_Rel *  rels;
-  Elf_Internal_Rela * relas;
+  Elf_Internal_Rela *relas;
+  unsigned long nrelas;
+  unsigned int i;
 
+  if (is_32bit_elf)
+    {
+      Elf32_External_Rela * erelas;
 
-  if (is_rela == UNKNOWN)
-    is_rela = guess_is_rela (elf_header.e_machine);
+      GET_DATA_ALLOC (rel_offset, rel_size, erelas,
+                     Elf32_External_Rela *, "relocs");
 
-  if (is_rela)
-    {
-      if (is_32bit_elf)
-       {
-         Elf32_External_Rela * erelas;
+      nrelas = rel_size / sizeof (Elf32_External_Rela);
 
-         GET_DATA_ALLOC (rel_offset, rel_size, erelas,
-                         Elf32_External_Rela *, "relocs");
+      relas = (Elf_Internal_Rela *)
+       malloc (nrelas * sizeof (Elf_Internal_Rela));
 
-         rel_size = rel_size / sizeof (Elf32_External_Rela);
+      if (relas == NULL)
+       {
+         error(_("out of memory parsing relocs"));
+         return 0;
+       }
 
-         relas = (Elf_Internal_Rela *)
-           malloc (rel_size * sizeof (Elf_Internal_Rela));
+      for (i = 0; i < nrelas; 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);
+       }
 
-         if (relas == NULL)
-           {
-             error(_("out of memory parsing relocs"));
-             return 0;
-           }
+      free (erelas);
+    }
+  else
+    {
+      Elf64_External_Rela * erelas;
 
-         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);
-           }
+      GET_DATA_ALLOC (rel_offset, rel_size, erelas,
+                     Elf64_External_Rela *, "relocs");
 
-         free (erelas);
+      nrelas = rel_size / sizeof (Elf64_External_Rela);
 
-         rels = (Elf_Internal_Rel *) relas;
+      relas = (Elf_Internal_Rela *)
+       malloc (nrelas * sizeof (Elf_Internal_Rela));
+
+      if (relas == NULL)
+       {
+         error(_("out of memory parsing relocs"));
+         return 0;
        }
-      else
+
+      for (i = 0; i < nrelas; i++)
        {
-         Elf64_External_Rela * erelas;
+         relas[i].r_offset = BYTE_GET8 (erelas[i].r_offset);
+         relas[i].r_info   = BYTE_GET8 (erelas[i].r_info);
+         relas[i].r_addend = BYTE_GET8 (erelas[i].r_addend);
+       }
 
-         GET_DATA_ALLOC (rel_offset, rel_size, erelas,
-                         Elf64_External_Rela *, "relocs");
+      free (erelas);
+    }
+  *relasp = relas;
+  *nrelasp = nrelas;
+  return 1;
+}
 
-         rel_size = rel_size / sizeof (Elf64_External_Rela);
+static int
+slurp_rel_relocs (file, rel_offset, rel_size, relsp, nrelsp)
+     FILE *file;
+     unsigned long rel_offset;
+     unsigned long rel_size;
+     Elf_Internal_Rel **relsp;
+     unsigned long *nrelsp;
+{
+  Elf_Internal_Rel *rels;
+  unsigned long nrels;
+  unsigned int i;
 
-         relas = (Elf_Internal_Rela *)
-           malloc (rel_size * sizeof (Elf_Internal_Rela));
+  if (is_32bit_elf)
+    {
+      Elf32_External_Rel * erels;
 
-         if (relas == NULL)
-           {
-             error(_("out of memory parsing relocs"));
-             return 0;
-           }
+      GET_DATA_ALLOC (rel_offset, rel_size, erels,
+                     Elf32_External_Rel *, "relocs");
 
-         for (i = 0; i < rel_size; i++)
-           {
-             relas[i].r_offset = BYTE_GET8 (erelas[i].r_offset);
-             relas[i].r_info   = BYTE_GET8 (erelas[i].r_info);
-             relas[i].r_addend = BYTE_GET8 (erelas[i].r_addend);
-           }
+      nrels = rel_size / sizeof (Elf32_External_Rel);
 
-         free (erelas);
+      rels = (Elf_Internal_Rel *) malloc (nrels * sizeof (Elf_Internal_Rel));
 
-         rels = (Elf_Internal_Rel *) relas;
+      if (rels == NULL)
+       {
+         error(_("out of memory parsing relocs"));
+         return 0;
+       }
+
+      for (i = 0; i < nrels; i++)
+       {
+         rels[i].r_offset = BYTE_GET (erels[i].r_offset);
+         rels[i].r_info   = BYTE_GET (erels[i].r_info);
        }
+
+      free (erels);
     }
   else
     {
-      if (is_32bit_elf)
-       {
-         Elf32_External_Rel * erels;
-
-         GET_DATA_ALLOC (rel_offset, rel_size, erels,
-                         Elf32_External_Rel *, "relocs");
+      Elf64_External_Rel * erels;
 
-         rel_size = rel_size / sizeof (Elf32_External_Rel);
+      GET_DATA_ALLOC (rel_offset, rel_size, erels,
+                     Elf64_External_Rel *, "relocs");
 
-         rels = (Elf_Internal_Rel *)
-           malloc (rel_size * sizeof (Elf_Internal_Rel));
+      nrels = rel_size / sizeof (Elf64_External_Rel);
 
-         if (rels == NULL)
-           {
-             error(_("out of memory parsing relocs"));
-             return 0;
-           }
+      rels = (Elf_Internal_Rel *) malloc (nrels * 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);
-
-         relas = (Elf_Internal_Rela *) rels;
-       }
-      else
+      if (rels == NULL)
        {
-         Elf64_External_Rel * erels;
-
-         GET_DATA_ALLOC (rel_offset, rel_size, erels,
-                         Elf64_External_Rel *, "relocs");
+         error(_("out of memory parsing relocs"));
+         return 0;
+       }
 
-         rel_size = rel_size / sizeof (Elf64_External_Rel);
+      for (i = 0; i < nrels; i++)
+       {
+         rels[i].r_offset = BYTE_GET8 (erels[i].r_offset);
+         rels[i].r_info   = BYTE_GET8 (erels[i].r_info);
+       }
 
-         rels = (Elf_Internal_Rel *)
-           malloc (rel_size * sizeof (Elf_Internal_Rel));
+      free (erels);
+    }
+  *relsp = rels;
+  *nrelsp = nrels;
+  return 1;
+}
 
-         if (rels == NULL)
-           {
-             error(_("out of memory parsing relocs"));
-             return 0;
-           }
+/* Display the contents of the relocation data found at the specified offset.  */
+static int
+dump_relocations (file, rel_offset, rel_size, symtab, nsyms, strtab, is_rela)
+     FILE *             file;
+     unsigned long      rel_offset;
+     unsigned long      rel_size;
+     Elf_Internal_Sym * symtab;
+     unsigned long      nsyms;
+     char *             strtab;
+     int                is_rela;
+{
+  unsigned int        i;
+  Elf_Internal_Rel *  rels;
+  Elf_Internal_Rela * relas;
 
-         for (i = 0; i < rel_size; i++)
-           {
-             rels[i].r_offset = BYTE_GET8 (erels[i].r_offset);
-             rels[i].r_info   = BYTE_GET8 (erels[i].r_info);
-           }
 
-         free (erels);
+  if (is_rela == UNKNOWN)
+    is_rela = guess_is_rela (elf_header.e_machine);
 
-         relas = (Elf_Internal_Rela *) rels;
-       }
+  if (is_rela)
+    {
+      if (!slurp_rela_relocs (file, rel_offset, rel_size, &relas, &rel_size))
+       return 0;
+    }
+  else
+    {
+      if (!slurp_rel_relocs (file, rel_offset, rel_size, &rels, &rel_size))
+       return 0;
     }
 
   if (is_rela)
@@ -853,7 +907,7 @@ dump_relocations (file, rel_offset, rel_size, symtab, nsyms, strtab, is_rela)
          break;
 
        case EM_MIPS:
-       case EM_MIPS_RS4_BE:
+       case EM_MIPS_RS3_LE:
          rtype = elf_mips_reloc_type (type);
          break;
 
@@ -866,6 +920,7 @@ dump_relocations (file, rel_offset, rel_size, symtab, nsyms, strtab, is_rela)
          break;
 
        case EM_CYGNUS_ARC:
+       case EM_ARC:
          rtype = elf_arc_reloc_type (type);
          break;
 
@@ -879,6 +934,23 @@ dump_relocations (file, rel_offset, rel_size, symtab, nsyms, strtab, is_rela)
        case EM_IA_64:
          rtype = elf_ia64_reloc_type (type);
          break;
+
+       case EM_CRIS:
+         rtype = elf_cris_reloc_type (type);
+         break;
+
+       case EM_860:
+         rtype = elf_i860_reloc_type (type);
+         break;
+
+       case EM_X86_64:
+         rtype = elf_x86_64_reloc_type (type);
+         break;
+
+        case EM_S390_OLD:
+        case EM_S390:
+          rtype = elf_s390_reloc_type (type);
+          break;
        }
 
       if (rtype == NULL)
@@ -892,31 +964,28 @@ dump_relocations (file, rel_offset, rel_size, symtab, nsyms, strtab, is_rela)
 
       if (symtab_index)
        {
-         if (symtab != NULL)
+         if (symtab == NULL || symtab_index >= nsyms)
+           printf (" bad symbol index: %08lx", (unsigned long) symtab_index);
+         else
            {
-             if (symtab_index >= nsyms)
-               printf (" bad symbol index: %08lx", (unsigned long) symtab_index);
-             else
-               {
-                 Elf_Internal_Sym * psym;
+             Elf_Internal_Sym * psym;
 
-                 psym = symtab + symtab_index;
+             psym = symtab + symtab_index;
 
-                 printf (" ");
-                 print_vma (psym->st_value, LONG_HEX);
-                 printf ("  ");
+             printf (" ");
+             print_vma (psym->st_value, LONG_HEX);
+             printf ("  ");
 
-                 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 (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);
-               }
+             if (is_rela)
+               printf (" + %lx", (unsigned long) relas [i].r_addend);
            }
        }
       else if (is_rela)
@@ -932,7 +1001,10 @@ dump_relocations (file, rel_offset, rel_size, symtab, nsyms, strtab, is_rela)
       putchar ('\n');
     }
 
-  free (relas);
+  if (is_rela)
+    free (relas);
+  else
+    free (rels);
 
   return 1;
 }
@@ -1070,15 +1142,21 @@ get_dynamic_type (type)
     case DT_PREINIT_ARRAY: return "PREINIT_ARRAY";
     case DT_PREINIT_ARRAYSZ: return "PREINIT_ARRAYSZ";
 
+    case DT_CHECKSUM:  return "CHECKSUM";
     case DT_PLTPADSZ:  return "PLTPADSZ";
     case DT_MOVEENT:   return "MOVEENT";
     case DT_MOVESZ:    return "MOVESZ";
-    case DT_FEATURE_1: return "FEATURE_1";
+    case DT_FEATURE:   return "FEATURE";
     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_CONFIG:    return "CONFIG";
+    case DT_DEPAUDIT:  return "DEPAUDIT";
+    case DT_AUDIT:     return "AUDIT";
+    case DT_PLTPAD:    return "PLTPAD";
+    case DT_MOVETAB:   return "MOVETAB";
     case DT_SYMINFO:   return "SYMINFO"; /* aka ADDRRNGHI */
 
     case DT_VERSYM:    return "VERSYM";
@@ -1091,7 +1169,7 @@ get_dynamic_type (type)
     case DT_VERNEED:   return "VERNEED";
     case DT_VERNEEDNUM:        return "VERNEEDNUM";
 
-    case DT_AUXILIARY: return "AUXILARY";
+    case DT_AUXILIARY: return "AUXILIARY";
     case DT_USED:      return "USED";
     case DT_FILTER:    return "FILTER";
 
@@ -1103,7 +1181,7 @@ get_dynamic_type (type)
          switch (elf_header.e_machine)
            {
            case EM_MIPS:
-           case EM_MIPS_RS4_BE:
+           case EM_MIPS_RS3_LE:
              result = get_mips_dynamic_type (type);
              break;
            case EM_SPARCV9:
@@ -1178,33 +1256,33 @@ get_machine_name (e_machine)
 
   switch (e_machine)
     {
-    case EM_NONE:              return _("None");
-    case EM_M32:               return "WE32100";
-    case EM_SPARC:             return "Sparc";
-    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";
-    case EM_S370:              return "IBM System/370";
-    case EM_MIPS_RS4_BE:       return "MIPS R4000 big-endian";
+    case EM_NONE:              return _("None");
+    case EM_M32:               return "WE32100";
+    case EM_SPARC:             return "Sparc";
+    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";
+    case EM_S370:              return "IBM System/370";
+    case EM_MIPS_RS3_LE:       return "MIPS R4000 big-endian";
     case EM_OLD_SPARCV9:       return "Sparc v9 (old)";
-    case EM_PARISC:            return "HPPA";
+    case EM_PARISC:            return "HPPA";
     case EM_PPC_OLD:           return "Power PC (old)";
-    case EM_SPARC32PLUS:       return "Sparc v8+" ;
-    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_SPARC32PLUS:       return "Sparc v8+" ;
+    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_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 "ARC";
     case EM_H8_300:            return "Hitachi H8/300";
     case EM_H8_300H:           return "Hitachi H8/300H";
     case EM_H8S:               return "Hitachi H8S";
@@ -1213,35 +1291,45 @@ get_machine_name (e_machine)
     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_ALPHA:             return "Alpha";
     case EM_CYGNUS_D10V:        return "d10v";
     case EM_CYGNUS_D30V:        return "d30v";
-    case EM_CYGNUS_ARC:                return "Arc";
+    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";
     case EM_PJ:                 return "picoJava";
-    case EM_MMA:               return "Fujitsu Multimedia Accelerator";
-    case EM_PCP:               return "Siemens PCP";
-    case EM_NCPU:              return "Sony nCPU embedded RISC processor";
-    case EM_NDR1:              return "Denso NDR1 microprocesspr";
-    case EM_STARCORE:          return "Motorola Star*Core processor";
-    case EM_ME16:              return "Toyota ME16 processor";
-    case EM_ST100:             return "STMicroelectronics ST100 processor";
-    case EM_TINYJ:             return "Advanced Logic Corp. TinyJ embedded processor";
-    case EM_FX66:              return "Siemens FX66 microcontroller";
-    case EM_ST9PLUS:           return "STMicroelectronics ST9+ 8/16 bit microcontroller";
-    case EM_ST7:               return "STMicroelectronics ST7 8-bit microcontroller";
-    case EM_68HC16:            return "Motorola MC68HC16 Microcontroller";
-    case EM_68HC11:            return "Motorola MC68HC11 Microcontroller";
-    case EM_68HC08:            return "Motorola MC68HC08 Microcontroller";
-    case EM_68HC05:            return "Motorola MC68HC05 Microcontroller";
-    case EM_SVX:               return "Silicon Graphics SVx";
-    case EM_ST19:              return "STMicroelectronics ST19 8-bit microcontroller";
-    case EM_VAX:               return "Digital VAX";
+    case EM_MMA:               return "Fujitsu Multimedia Accelerator";
+    case EM_PCP:               return "Siemens PCP";
+    case EM_NCPU:              return "Sony nCPU embedded RISC processor";
+    case EM_NDR1:              return "Denso NDR1 microprocesspr";
+    case EM_STARCORE:          return "Motorola Star*Core processor";
+    case EM_ME16:              return "Toyota ME16 processor";
+    case EM_ST100:             return "STMicroelectronics ST100 processor";
+    case EM_TINYJ:             return "Advanced Logic Corp. TinyJ embedded processor";
+    case EM_FX66:              return "Siemens FX66 microcontroller";
+    case EM_ST9PLUS:           return "STMicroelectronics ST9+ 8/16 bit microcontroller";
+    case EM_ST7:               return "STMicroelectronics ST7 8-bit microcontroller";
+    case EM_68HC16:            return "Motorola MC68HC16 Microcontroller";
+    case EM_68HC11:            return "Motorola MC68HC11 Microcontroller";
+    case EM_68HC08:            return "Motorola MC68HC08 Microcontroller";
+    case EM_68HC05:            return "Motorola MC68HC05 Microcontroller";
+    case EM_SVX:               return "Silicon Graphics SVx";
+    case EM_ST19:              return "STMicroelectronics ST19 8-bit microcontroller";
+    case EM_VAX:               return "Digital VAX";
     case EM_AVR:                return "Atmel AVR 8-bit microcontroller";
+    case EM_CRIS:              return "Axis Communications 32-bit embedded processor";
+    case EM_JAVELIN:           return "Infineon Technologies 32-bit embedded cpu";
+    case EM_FIREPATH:          return "Element 14 64-bit DSP processor";
+    case EM_ZSP:               return "LSI Logic's 16-bit DSP processor";
+    case EM_MMIX:              return "Donald Knuth's educational 64-bit processor";
+    case EM_HUANY:             return "Harvard Universitys's machine-independent object format";
+    case EM_PRISM:             return "SiTera Prism";
+    case EM_X86_64:            return "Advanced Micro Devices X86-64";
+    case EM_S390_OLD:
+    case EM_S390:               return "IBM S/390";
     default:
       sprintf (buff, _("<unknown>: %x"), e_machine);
       return buff;
@@ -1265,87 +1353,120 @@ decode_ARM_machine_flags (e_flags, buf)
       strcat (buf, ", relocatable executable");
       e_flags &= ~ EF_ARM_RELEXEC;
     }
-             
+
   if (e_flags & EF_ARM_HASENTRY)
     {
       strcat (buf, ", has entry point");
       e_flags &= ~ EF_ARM_HASENTRY;
     }
-  
+
   /* Now handle EABI specific flags.  */
   switch (eabi)
     {
     default:
-      strcat (buf, ", <unknown EABI>");
+      strcat (buf, ", <unrecognised EABI>");
       if (e_flags)
        unknown = 1;
       break;
 
     case EF_ARM_EABI_VER1:
+      strcat (buf, ", Version1 EABI");
       while (e_flags)
        {
          unsigned flag;
-         
+
          /* Process flags one bit at a time.  */
          flag = e_flags & - e_flags;
          e_flags &= ~ flag;
-         
+
          switch (flag)
            {
-           case EF_ARM_SYMSARESORTED: /* Conflicts with EF_INTERWORK.  */
+           case EF_ARM_SYMSARESORTED: /* Conflicts with EF_ARM_INTERWORK.  */
              strcat (buf, ", sorted symbol tables");
              break;
-             
+
            default:
              unknown = 1;
              break;
            }
        }
       break;
-      
+
+    case EF_ARM_EABI_VER2:
+      strcat (buf, ", Version2 EABI");
+      while (e_flags)
+       {
+         unsigned flag;
+
+         /* Process flags one bit at a time.  */
+         flag = e_flags & - e_flags;
+         e_flags &= ~ flag;
+
+         switch (flag)
+           {
+           case EF_ARM_SYMSARESORTED: /* Conflicts with EF_ARM_INTERWORK.  */
+             strcat (buf, ", sorted symbol tables");
+             break;
+
+           case EF_ARM_DYNSYMSUSESEGIDX:
+             strcat (buf, ", dynamic symbols use segment index");
+             break;
+
+           case EF_ARM_MAPSYMSFIRST:
+             strcat (buf, ", mapping symbols precede others");
+             break;
+
+           default:
+             unknown = 1;
+             break;
+           }
+       }
+      break;
+
     case EF_ARM_EABI_UNKNOWN:
+      strcat (buf, ", GNU EABI");
       while (e_flags)
        {
          unsigned flag;
-         
+
          /* Process flags one bit at a time.  */
          flag = e_flags & - e_flags;
          e_flags &= ~ flag;
-         
+
          switch (flag)
            {
-           case EF_INTERWORK:
+           case EF_ARM_INTERWORK:
              strcat (buf, ", interworking enabled");
              break;
-         
-           case EF_APCS_26:
+
+           case EF_ARM_APCS_26:
              strcat (buf, ", uses APCS/26");
              break;
-         
-           case EF_APCS_FLOAT:
+
+           case EF_ARM_APCS_FLOAT:
              strcat (buf, ", uses APCS/float");
              break;
-         
-           case EF_PIC:
+
+           case EF_ARM_PIC:
              strcat (buf, ", position independent");
              break;
-         
-           case EF_ALIGN8:
+
+           case EF_ARM_ALIGN8:
              strcat (buf, ", 8 bit structure alignment");
              break;
-         
-           case EF_NEW_ABI:
+
+           case EF_ARM_NEW_ABI:
              strcat (buf, ", uses new ABI");
              break;
-         
-           case EF_OLD_ABI:
+
+           case EF_ARM_OLD_ABI:
              strcat (buf, ", uses old ABI");
              break;
-         
-           case EF_SOFT_FLOAT:
+
+           case EF_ARM_SOFT_FLOAT:
              strcat (buf, ", software FP");
              break;
-         
+
            default:
              unknown = 1;
              break;
@@ -1365,7 +1486,7 @@ get_machine_flags (e_flags, e_machine)
   static char buf [1024];
 
   buf[0] = '\0';
-  
+
   if (e_flags)
     {
       switch (e_machine)
@@ -1376,7 +1497,7 @@ get_machine_flags (e_flags, e_machine)
        case EM_ARM:
          decode_ARM_machine_flags (e_flags, buf);
          break;
-         
+
         case EM_68K:
           if (e_flags & EF_CPU32)
             strcat (buf, ", cpu32");
@@ -1418,7 +1539,7 @@ get_machine_flags (e_flags, e_machine)
          break;
 
        case EM_MIPS:
-       case EM_MIPS_RS4_BE:
+       case EM_MIPS_RS3_LE:
          if (e_flags & EF_MIPS_NOREORDER)
            strcat (buf, ", noreorder");
 
@@ -1442,6 +1563,27 @@ get_machine_flags (e_flags, e_machine)
 
          if ((e_flags & EF_MIPS_ARCH) == E_MIPS_ARCH_4)
            strcat (buf, ", mips4");
+
+         if ((e_flags & EF_MIPS_ARCH) == E_MIPS_ARCH_5)
+           strcat (buf, ", mips5");
+
+         if ((e_flags & EF_MIPS_ARCH) == E_MIPS_ARCH_32)
+           strcat (buf, ", mips32");
+
+         if ((e_flags & EF_MIPS_ARCH) == E_MIPS_ARCH_64)
+           strcat (buf, ", mips64");
+
+         switch ((e_flags & EF_MIPS_MACH))
+           {
+           case E_MIPS_MACH_3900: strcat (buf, ", 3900"); break;
+           case E_MIPS_MACH_4010: strcat (buf, ", 4010"); break;
+           case E_MIPS_MACH_4100: strcat (buf, ", 4100"); break;
+           case E_MIPS_MACH_4650: strcat (buf, ", 4650"); break;
+           case E_MIPS_MACH_4111: strcat (buf, ", 4111"); break;
+           case E_MIPS_MACH_MIPS32_4K: strcat (buf, ", mips32-4k"); break;
+           case E_MIPS_MACH_SB1:  strcat (buf, ", sb1");  break;
+           default: strcat (buf, " UNKNOWN"); break;
+           }
          break;
 
        case EM_SPARCV9:
@@ -1498,7 +1640,7 @@ get_machine_flags (e_flags, e_machine)
          if (e_flags & EF_PARISC_LAZYSWAP)
            strcat (buf, ", lazyswap");
          break;
-         
+
        case EM_PJ:
          if ((e_flags & EF_PICOJAVA_NEWCALLS) == EF_PICOJAVA_NEWCALLS)
            strcat (buf, ", new calling convention");
@@ -1506,6 +1648,21 @@ get_machine_flags (e_flags, e_machine)
          if ((e_flags & EF_PICOJAVA_GNUCALLS) == EF_PICOJAVA_GNUCALLS)
            strcat (buf, ", gnu calling convention");
          break;
+
+       case EM_IA_64:
+         if ((e_flags & EF_IA_64_ABI64))
+           strcat (buf, ", 64-bit");
+         else
+           strcat (buf, ", 32-bit");
+         if ((e_flags & EF_IA_64_REDUCEDFP))
+           strcat (buf, ", reduced fp model");
+         if ((e_flags & EF_IA_64_NOFUNCDESC_CONS_GP))
+           strcat (buf, ", no function descriptors, constant gp");
+         else if ((e_flags & EF_IA_64_CONS_GP))
+           strcat (buf, ", constant gp");
+         if ((e_flags & EF_IA_64_ABSOLUTE))
+           strcat (buf, ", absolute");
+         break;
        }
     }
 
@@ -1558,6 +1715,21 @@ get_parisc_segment_type (type)
   return NULL;
 }
 
+static const char *
+get_ia64_segment_type (type)
+     unsigned long type;
+{
+  switch (type)
+    {
+    case PT_IA_64_ARCHEXT:     return "IA_64_ARCHEXT";
+    case PT_IA_64_UNWIND:      return "IA_64_UNWIND";
+    default:
+      break;
+    }
+
+  return NULL;
+}
+
 static const char *
 get_segment_type (p_type)
      unsigned long p_type;
@@ -1582,12 +1754,15 @@ get_segment_type (p_type)
          switch (elf_header.e_machine)
            {
            case EM_MIPS:
-           case EM_MIPS_RS4_BE:
+           case EM_MIPS_RS3_LE:
              result = get_mips_segment_type (p_type);
              break;
            case EM_PARISC:
              result = get_parisc_segment_type (p_type);
              break;
+           case EM_IA_64:
+             result = get_ia64_segment_type (p_type);
+             break;
            default:
              result = NULL;
              break;
@@ -1690,6 +1865,20 @@ get_parisc_section_type_name (sh_type)
   return NULL;
 }
 
+static const char *
+get_ia64_section_type_name (sh_type)
+     unsigned int sh_type;
+{
+  switch (sh_type)
+    {
+    case SHT_IA_64_EXT:                return "IA_64_EXT";
+    case SHT_IA_64_UNWIND:     return "IA_64_UNWIND";
+    default:
+      break;
+    }
+  return NULL;
+}
+
 static const char *
 get_section_type_name (sh_type)
      unsigned int sh_type;
@@ -1713,6 +1902,8 @@ get_section_type_name (sh_type)
     case SHT_INIT_ARRAY:       return "INIT_ARRAY";
     case SHT_FINI_ARRAY:       return "FINI_ARRAY";
     case SHT_PREINIT_ARRAY:    return "PREINIT_ARRAY";
+    case SHT_GROUP:            return "GROUP";
+    case SHT_SYMTAB_SHNDX:     return "SYMTAB SECTION INDICIES";
     case SHT_GNU_verdef:       return "VERDEF";
     case SHT_GNU_verneed:      return "VERNEED";
     case SHT_GNU_versym:       return "VERSYM";
@@ -1729,12 +1920,15 @@ get_section_type_name (sh_type)
          switch (elf_header.e_machine)
            {
            case EM_MIPS:
-           case EM_MIPS_RS4_BE:
+           case EM_MIPS_RS3_LE:
              result = get_mips_section_type_name (sh_type);
              break;
            case EM_PARISC:
              result = get_parisc_section_type_name (sh_type);
              break;
+           case EM_IA_64:
+             result = get_ia64_section_type_name (sh_type);
+             break;
            default:
              result = NULL;
              break;
@@ -1776,6 +1970,7 @@ struct option options [] =
   {"use-dynamic",      no_argument, 0, 'D'},
   {"hex-dump",         required_argument, 0, 'x'},
   {"debug-dump",       optional_argument, 0, 'w'},
+  {"unwind",          no_argument, 0, 'u'},
 #ifdef SUPPORT_DISASSEMBLY
   {"instruction-dump", required_argument, 0, 'i'},
 #endif
@@ -1800,13 +1995,14 @@ usage ()
   fprintf (stdout, _("  -s or --syms or --symbols Display the symbol table\n"));
   fprintf (stdout, _("  -n or --notes             Display the core notes (if present)\n"));
   fprintf (stdout, _("  -r or --relocs            Display the relocations (if present)\n"));
+  fprintf (stdout, _("  -u or --unwind            Display the unwind info (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, _("  -A or --arch-specific     Display architecture specific information (if any).\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, _("  -w[liaprf] or --debug-dump[=line,=info,=abbrev,=pubnames,=ranges,=frames]\n"));
   fprintf (stdout, _("                            Display the contents of DWARF2 debug sections\n"));
 #ifdef SUPPORT_DISASSEMBLY
   fprintf (stdout, _("  -i <number> or --instruction-dump=<number>\n"));
@@ -1862,7 +2058,7 @@ parse_args (argc, argv)
     usage ();
 
   while ((c = getopt_long
-         (argc, argv, "ersahnldSDAIw::x:i:vV", options, NULL)) != EOF)
+         (argc, argv, "ersuahnldSDAIw::x:i:vV", options, NULL)) != EOF)
     {
       char *    cp;
       int      section;
@@ -1879,6 +2075,7 @@ parse_args (argc, argv)
        case 'a':
          do_syms ++;
          do_reloc ++;
+         do_unwind ++;
          do_dynamic ++;
          do_header ++;
          do_sections ++;
@@ -1902,6 +2099,9 @@ parse_args (argc, argv)
        case 'r':
          do_reloc ++;
          break;
+       case 'u':
+         do_unwind ++;
+         break;
        case 'h':
          do_header ++;
          break;
@@ -1966,6 +2166,12 @@ parse_args (argc, argv)
                  do_debug_aranges = 1;
                  break;
 
+               case 'F':
+                 do_debug_frames_interp = 1;
+               case 'f':
+                 do_debug_frames = 1;
+                 break;
+
                default:
                  warn (_("Unrecognised debug option '%s'\n"), optarg);
                  break;
@@ -1999,7 +2205,7 @@ parse_args (argc, argv)
        }
     }
 
-  if (!do_dynamic && !do_syms && !do_reloc && !do_sections
+  if (!do_dynamic && !do_syms && !do_reloc && !do_unwind && !do_sections
       && !do_segments && !do_header && !do_dump && !do_version
       && !do_histogram && !do_debugging && !do_arch && !do_notes)
     usage ();
@@ -2058,7 +2264,7 @@ get_osabi_name (osabi)
     case ELFOSABI_LINUX:      return _("UNIX - Linux");
     case ELFOSABI_HURD:       return _("GNU/Hurd");
     case ELFOSABI_SOLARIS:    return _("UNIX - Solaris");
-    case ELFOSABI_MONTEREY:   return _("UNIX - Monterey");
+    case ELFOSABI_AIX:        return _("UNIX - AIX");
     case ELFOSABI_IRIX:       return _("UNIX - IRIX");
     case ELFOSABI_FREEBSD:    return _("UNIX - FreeBSD");
     case ELFOSABI_TRU64:      return _("UNIX - TRU64");
@@ -2116,7 +2322,7 @@ process_file_header ()
              get_machine_name (elf_header.e_machine));
       printf (_("  Version:                           0x%lx\n"),
              (unsigned long) elf_header.e_version);
-      
+
       printf (_("  Entry point address:               "));
       print_vma ((bfd_vma) elf_header.e_entry, PREFIX_HEX);
       printf (_("\n  Start of program headers:          "));
@@ -2124,7 +2330,7 @@ process_file_header ()
       printf (_(" (bytes into file)\n  Start of section headers:          "));
       print_vma ((bfd_vma) elf_header.e_shoff, DEC);
       printf (_(" (bytes into file)\n"));
-       
+
       printf (_("  Flags:                             0x%lx%s\n"),
              (unsigned long) elf_header.e_flags,
              get_machine_flags (elf_header.e_flags, elf_header.e_machine));
@@ -2262,7 +2468,7 @@ process_program_headers (file)
     {
       printf
        (_("\nProgram Header%s:\n"), elf_header.e_phnum > 1 ? "s" : "");
-      
+
       if (is_32bit_elf)
        printf
          (_("  Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align\n"));
@@ -2575,14 +2781,14 @@ get_elf_section_flags (sh_flags)
   static char buff [32];
 
   * buff = 0;
-  
+
   while (sh_flags)
     {
       bfd_vma flag;
 
       flag = sh_flags & - sh_flags;
       sh_flags &= ~ flag;
-      
+
       switch (flag)
        {
        case SHF_WRITE:            strcat (buff, "W"); break;
@@ -2593,7 +2799,8 @@ get_elf_section_flags (sh_flags)
        case SHF_INFO_LINK:        strcat (buff, "I"); break;
        case SHF_LINK_ORDER:       strcat (buff, "L"); break;
        case SHF_OS_NONCONFORMING: strcat (buff, "O"); break;
-         
+       case SHF_GROUP:            strcat (buff, "G"); break;
+
        default:
          if (flag & SHF_MASKOS)
            {
@@ -2610,7 +2817,7 @@ get_elf_section_flags (sh_flags)
          break;
        }
     }
-  
+
   return buff;
 }
 
@@ -2648,12 +2855,10 @@ process_section_headers (file)
 
   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");
+
+      string_table_length = section->sh_size;
     }
 
   /* Scan the sections for the dynamic symbol table
@@ -2693,7 +2898,8 @@ process_section_headers (file)
                          dynamic_strings, char *, "dynamic strings");
        }
       else if ((do_debugging || do_debug_info || do_debug_abbrevs
-               || do_debug_lines || do_debug_pubnames || do_debug_aranges)
+               || do_debug_lines || do_debug_pubnames || do_debug_aranges
+               || do_debug_frames)
               && strncmp (name, ".debug_", 7) == 0)
        {
          name += 7;
@@ -2704,16 +2910,23 @@ process_section_headers (file)
              || (do_debug_lines    && (strcmp (name, "line") == 0))
              || (do_debug_pubnames && (strcmp (name, "pubnames") == 0))
              || (do_debug_aranges  && (strcmp (name, "aranges") == 0))
+             || (do_debug_frames   && (strcmp (name, "frame") == 0))
              )
            request_dump (i, DEBUG_DUMP);
        }
+      /* linkonce section to be combined with .debug_info at link time.  */
+      else if ((do_debugging || do_debug_info)
+              && strncmp (name, ".gnu.linkonce.wi.", 17) == 0)
+       request_dump (i, DEBUG_DUMP);
+      else if (do_debug_frames && strcmp (name, ".eh_frame") == 0)
+       request_dump (i, DEBUG_DUMP);
     }
 
   if (! do_sections)
     return 1;
 
   printf (_("\nSection Header%s:\n"), elf_header.e_shnum > 1 ? "s" : "");
-  
+
   if (is_32bit_elf)
     printf
       (_("  [Nr] Name              Type            Addr     Off    Size   ES Flg Lk Inf Al\n"));
@@ -2735,15 +2948,15 @@ process_section_headers (file)
       if (is_32bit_elf)
        {
          print_vma (section->sh_addr, LONG_HEX);
-      
+
          printf ( " %6.6lx %6.6lx %2.2lx",
                   (unsigned long) section->sh_offset,
                   (unsigned long) section->sh_size,
                   (unsigned long) section->sh_entsize);
 
          printf (" %3s ", get_elf_section_flags (section->sh_flags));
-                 
-         printf (" %2ld %3lx %ld\n",
+
+         printf ("%2ld %3lx %2ld\n",
                  (unsigned long) section->sh_link,
                  (unsigned long) section->sh_info,
                  (unsigned long) section->sh_addralign);
@@ -2757,9 +2970,9 @@ process_section_headers (file)
          print_vma (section->sh_size, LONG_HEX);
          printf ("  ");
          print_vma (section->sh_entsize, LONG_HEX);
-         
+
          printf (" %3s ", get_elf_section_flags (section->sh_flags));
-                 
+
          printf ("     %2ld   %3lx     %ld\n",
                  (unsigned long) section->sh_link,
                  (unsigned long) section->sh_info,
@@ -2767,9 +2980,10 @@ process_section_headers (file)
        }
     }
 
-  printf (_("Key to Flags: W (write), A (alloc), X (execute), M (merge), S (strings)\n"));
-  printf (_("              I (info), L (link order), O (extra OS processing required)\n"));
-  printf (_("              o (os specific), p (processor specific) x (unknown)\n"));
+  printf (_("Key to Flags:\n"));
+  printf (_("  W (write), A (alloc), X (execute), M (merge), S (strings)\n"));
+  printf (_("  I (info), L (link order), G (group), x (unknown)\n"));
+  printf (_("  O (extra OS processing required) o (OS specific), p (processor specific)\n"));
 
   return 1;
 }
@@ -2839,8 +3053,8 @@ process_relocs (file)
   else
     {
       Elf32_Internal_Shdr *     section;
-      unsigned long            i;
-      int                      found = 0;
+      unsigned long            i;
+      int              found = 0;
 
       for (i = 0, section = section_headers;
           i < elf_header.e_shnum;
@@ -2856,7 +3070,6 @@ process_relocs (file)
          if (rel_size)
            {
              Elf32_Internal_Shdr * strsec;
-             Elf32_Internal_Shdr * symsec;
              Elf_Internal_Sym *    symtab;
              char *                strtab;
              int                   is_rela;
@@ -2872,25 +3085,34 @@ process_relocs (file)
              printf (_(" at offset 0x%lx contains %lu entries:\n"),
                 rel_offset, (unsigned long) (rel_size / section->sh_entsize));
 
-             symsec = section_headers + section->sh_link;
-
-             nsyms = symsec->sh_size / symsec->sh_entsize;
-             symtab = GET_ELF_SYMBOLS (file, symsec->sh_offset, nsyms);
+             symtab = NULL;
+             strtab = NULL;
+             nsyms = 0;
+             if (section->sh_link)
+               {
+                 Elf32_Internal_Shdr * symsec;
 
-             if (symtab == NULL)
-               continue;
+                 symsec = section_headers + section->sh_link;
+                 nsyms = symsec->sh_size / symsec->sh_entsize;
+                 symtab = GET_ELF_SYMBOLS (file, symsec->sh_offset, nsyms);
 
-             strsec = section_headers + symsec->sh_link;
+                 if (symtab == NULL)
+                   continue;
 
-             GET_DATA_ALLOC (strsec->sh_offset, strsec->sh_size, strtab,
-                             char *, "string table");
+                 strsec = section_headers + symsec->sh_link;
 
+                 GET_DATA_ALLOC (strsec->sh_offset, strsec->sh_size, strtab,
+                                 char *, "string table");
+               }
              is_rela = section->sh_type == SHT_RELA;
 
-             dump_relocations (file, rel_offset, rel_size, symtab, nsyms, strtab, is_rela);
+             dump_relocations (file, rel_offset, rel_size,
+                               symtab, nsyms, strtab, is_rela);
 
-             free (strtab);
-             free (symtab);
+             if (strtab)
+               free (strtab);
+             if (symtab)
+               free (symtab);
 
              found = 1;
            }
@@ -2903,6 +3125,431 @@ process_relocs (file)
   return 1;
 }
 
+#include "unwind-ia64.h"
+
+/* An absolute address consists of a section and an offset.  If the
+   section is NULL, the offset itself is the address, otherwise, the
+   address equals to LOAD_ADDRESS(section) + offset.  */
+
+struct absaddr
+  {
+    unsigned short section;
+    bfd_vma offset;
+  };
+
+struct unw_aux_info
+  {
+    struct unw_table_entry
+      {
+       struct absaddr    start;
+       struct absaddr    end;
+       struct absaddr    info;
+      }
+    *table;                            /* Unwind table.  */
+    unsigned long         table_len;   /* Length of unwind table.  */
+    unsigned char *       info;                /* Unwind info.  */
+    unsigned long         info_size;   /* Size of unwind info.  */
+    bfd_vma               info_addr;   /* starting address of unwind info.  */
+    bfd_vma               seg_base;    /* Starting address of segment.  */
+    Elf_Internal_Sym *    symtab;      /* The symbol table.  */
+    unsigned              long nsyms;  /* Number of symbols.  */
+    char *                strtab;      /* The string table.  */
+    unsigned long         strtab_size; /* Size of string table.  */
+  };
+
+static void find_symbol_for_address PARAMS ((struct unw_aux_info *,
+                                            struct absaddr, const char **,
+                                            bfd_vma *));
+static void dump_ia64_unwind PARAMS ((struct unw_aux_info *));
+static int  slurp_ia64_unwind_table PARAMS ((FILE *, struct unw_aux_info *,
+                                           Elf32_Internal_Shdr *));
+
+static void
+find_symbol_for_address (aux, addr, symname, offset)
+     struct unw_aux_info *aux;
+     struct absaddr addr;
+     const char **symname;
+     bfd_vma *offset;
+{
+  bfd_vma dist = (bfd_vma) 0x100000;
+  Elf_Internal_Sym *sym, *best = NULL;
+  unsigned long i;
+
+  for (i = 0, sym = aux->symtab; i < aux->nsyms; ++i, ++sym)
+    {
+      if (ELF_ST_TYPE (sym->st_info) == STT_FUNC
+         && sym->st_name != 0
+         && (addr.section == SHN_UNDEF || addr.section == sym->st_shndx)
+         && addr.offset >= sym->st_value
+         && addr.offset - sym->st_value < dist)
+       {
+         best = sym;
+         dist = addr.offset - sym->st_value;
+         if (!dist)
+           break;
+       }
+    }
+  if (best)
+    {
+      *symname = (best->st_name >= aux->strtab_size
+                 ? "<corrupt>" : aux->strtab + best->st_name);
+      *offset = dist;
+      return;
+    }
+  *symname = NULL;
+  *offset = addr.offset;
+}
+
+static void
+dump_ia64_unwind (aux)
+     struct unw_aux_info *aux;
+{
+  bfd_vma addr_size;
+  struct unw_table_entry * tp;
+  int in_body;
+
+  addr_size = is_32bit_elf ? 4 : 8;
+
+  for (tp = aux->table; tp < aux->table + aux->table_len; ++tp)
+    {
+      bfd_vma stamp;
+      bfd_vma offset;
+      const unsigned char * dp;
+      const unsigned char * head;
+      const char * procname;
+
+      find_symbol_for_address (aux, tp->start, &procname, &offset);
+
+      fputs ("\n<", stdout);
+
+      if (procname)
+       {
+         fputs (procname, stdout);
+
+         if (offset)
+           printf ("+%lx", (unsigned long) offset);
+       }
+
+      fputs (">: [", stdout);
+      print_vma (tp->start.offset, PREFIX_HEX);
+      fputc ('-', stdout);
+      print_vma (tp->end.offset, PREFIX_HEX);
+      printf ("), info at +0x%lx\n",
+             (unsigned long) (tp->info.offset - aux->seg_base));
+
+      head = aux->info + (tp->info.offset - aux->info_addr);
+      stamp = BYTE_GET8 ((unsigned char *) head);
+
+      printf ("  v%u, flags=0x%lx (%s%s ), len=%lu bytes\n",
+             (unsigned) UNW_VER (stamp),
+             (unsigned long) ((stamp & UNW_FLAG_MASK) >> 32),
+             UNW_FLAG_EHANDLER (stamp) ? " ehandler" : "",
+             UNW_FLAG_UHANDLER (stamp) ? " uhandler" : "",
+             (unsigned long) (addr_size * UNW_LENGTH (stamp)));
+
+      if (UNW_VER (stamp) != 1)
+       {
+         printf ("\tUnknown version.\n");
+         continue;
+       }
+
+      in_body = 0;
+      for (dp = head + 8; dp < head + 8 + addr_size * UNW_LENGTH (stamp);)
+       dp = unw_decode (dp, in_body, & in_body);
+    }
+}
+
+static int
+slurp_ia64_unwind_table (file, aux, sec)
+     FILE *file;
+     struct unw_aux_info *aux;
+     Elf32_Internal_Shdr *sec;
+{
+  unsigned long size, addr_size, nrelas, i;
+  Elf_Internal_Phdr *prog_hdrs, *seg;
+  struct unw_table_entry *tep;
+  Elf32_Internal_Shdr *relsec;
+  Elf_Internal_Rela *rela, *rp;
+  unsigned char *table, *tp;
+  Elf_Internal_Sym *sym;
+  const char *relname;
+  int result;
+
+  addr_size = is_32bit_elf ? 4 : 8;
+
+  /* First, find the starting address of the segment that includes
+     this section: */
+
+  if (elf_header.e_phnum)
+    {
+      prog_hdrs = (Elf_Internal_Phdr *)
+       xmalloc (elf_header.e_phnum * sizeof (Elf_Internal_Phdr));
+
+      if (is_32bit_elf)
+       result = get_32bit_program_headers (file, prog_hdrs);
+      else
+       result = get_64bit_program_headers (file, prog_hdrs);
+
+      if (!result)
+       {
+         free (prog_hdrs);
+         return 0;
+       }
+
+      for (seg = prog_hdrs; seg < prog_hdrs + elf_header.e_phnum; ++seg)
+       {
+         if (seg->p_type != PT_LOAD)
+           continue;
+
+         if (sec->sh_addr >= seg->p_vaddr
+             && (sec->sh_addr + sec->sh_size <= seg->p_vaddr + seg->p_memsz))
+           {
+             aux->seg_base = seg->p_vaddr;
+             break;
+           }
+       }
+
+      free (prog_hdrs);
+    }
+
+  /* Second, build the unwind table from the contents of the unwind section:  */
+  size = sec->sh_size;
+  GET_DATA_ALLOC (sec->sh_offset, size, table, char *, "unwind table");
+
+  tep = aux->table = xmalloc (size / (3 * addr_size) * sizeof (aux->table[0]));
+  for (tp = table; tp < table + size; tp += 3 * addr_size, ++ tep)
+    {
+      tep->start.section = SHN_UNDEF;
+      tep->end.section   = SHN_UNDEF;
+      tep->info.section  = SHN_UNDEF;
+      if (is_32bit_elf)
+       {
+         tep->start.offset = byte_get ((unsigned char *) tp + 0, 4);
+         tep->end.offset   = byte_get ((unsigned char *) tp + 4, 4);
+         tep->info.offset  = byte_get ((unsigned char *) tp + 8, 4);
+       }
+      else
+       {
+         tep->start.offset = BYTE_GET8 ((unsigned char *) tp +  0);
+         tep->end.offset   = BYTE_GET8 ((unsigned char *) tp +  8);
+         tep->info.offset  = BYTE_GET8 ((unsigned char *) tp + 16);
+       }
+      tep->start.offset += aux->seg_base;
+      tep->end.offset   += aux->seg_base;
+      tep->info.offset  += aux->seg_base;
+    }
+  free (table);
+
+  /* Third, apply any relocations to the unwind table: */
+
+  for (relsec = section_headers;
+       relsec < section_headers + elf_header.e_shnum;
+       ++relsec)
+    {
+      if (relsec->sh_type != SHT_RELA
+         || section_headers + relsec->sh_info != sec)
+       continue;
+
+      if (!slurp_rela_relocs (file, relsec->sh_offset, relsec->sh_size,
+                             & rela, & nrelas))
+       return 0;
+
+      for (rp = rela; rp < rela + nrelas; ++rp)
+       {
+         if (is_32bit_elf)
+           {
+             relname = elf_ia64_reloc_type (ELF32_R_TYPE (rp->r_info));
+             sym = aux->symtab + ELF32_R_SYM (rp->r_info);
+
+             if (ELF32_ST_TYPE (sym->st_info) != STT_SECTION)
+               {
+                 warn (_("Skipping unexpected symbol type %u"),
+                       ELF32_ST_TYPE (sym->st_info));
+                 continue;
+               }
+           }
+         else
+           {
+             relname = elf_ia64_reloc_type (ELF64_R_TYPE (rp->r_info));
+             sym = aux->symtab + ELF64_R_SYM (rp->r_info);
+
+             if (ELF64_ST_TYPE (sym->st_info) != STT_SECTION)
+               {
+                 warn (_("Skipping unexpected symbol type %u"),
+                       ELF64_ST_TYPE (sym->st_info));
+                 continue;
+               }
+           }
+
+         if (strncmp (relname, "R_IA64_SEGREL", 13) != 0)
+           {
+             warn (_("Skipping unexpected relocation type %s"), relname);
+             continue;
+           }
+
+         i = rp->r_offset / (3 * addr_size);
+
+         switch (rp->r_offset/addr_size % 3)
+           {
+           case 0:
+             aux->table[i].start.section = sym->st_shndx;
+             aux->table[i].start.offset += rp->r_addend;
+             break;
+           case 1:
+             aux->table[i].end.section   = sym->st_shndx;
+             aux->table[i].end.offset   += rp->r_addend;
+             break;
+           case 2:
+             aux->table[i].info.section  = sym->st_shndx;
+             aux->table[i].info.offset  += rp->r_addend;
+             break;
+           default:
+             break;
+           }
+       }
+
+      free (rela);
+    }
+
+  aux->table_len = size / (3 * addr_size);
+  return 1;
+}
+
+static int
+process_unwind (file)
+     FILE * file;
+{
+  Elf32_Internal_Shdr *sec, *unwsec = NULL, *strsec;
+  unsigned long i, addr_size, unwcount = 0, unwstart = 0;
+  struct unw_aux_info aux;
+
+  if (!do_unwind)
+    return 1;
+
+  if (elf_header.e_machine != EM_IA_64)
+    {
+      printf (_("\nThere are no unwind sections in this file.\n"));
+      return 1;
+    }
+
+  memset (& aux, 0, sizeof (aux));
+
+  addr_size = is_32bit_elf ? 4 : 8;
+
+  for (i = 0, sec = section_headers; i < elf_header.e_shnum; ++i, ++sec)
+    {
+      if (sec->sh_type == SHT_SYMTAB)
+       {
+         aux.nsyms = sec->sh_size / sec->sh_entsize;
+         aux.symtab = GET_ELF_SYMBOLS (file, sec->sh_offset, aux.nsyms);
+
+         strsec = section_headers + sec->sh_link;
+         aux.strtab_size = strsec->sh_size;
+         GET_DATA_ALLOC (strsec->sh_offset, aux.strtab_size,
+                         aux.strtab, char *, "string table");
+       }
+      else if (sec->sh_type == SHT_IA_64_UNWIND)
+       unwcount++;
+    }
+
+  if (!unwcount)
+    printf (_("\nThere are no unwind sections in this file.\n"));
+
+  while (unwcount-- > 0)
+    {
+      char *suffix;
+      size_t len, len2;
+
+      for (i = unwstart, sec = section_headers + unwstart;
+          i < elf_header.e_shnum; ++i, ++sec)
+       if (sec->sh_type == SHT_IA_64_UNWIND)
+         {
+           unwsec = sec;
+           break;
+         }
+
+      unwstart = i + 1;
+      len = sizeof (ELF_STRING_ia64_unwind_once) - 1;
+
+      if (strncmp (SECTION_NAME (unwsec), ELF_STRING_ia64_unwind_once,
+                  len) == 0)
+       {
+         /* .gnu.linkonce.ia64unw.FOO -> .gnu.linkonce.ia64unwi.FOO */
+         len2 = sizeof (ELF_STRING_ia64_unwind_info_once) - 1;
+         suffix = SECTION_NAME (unwsec) + len;
+         for (i = 0, sec = section_headers; i < elf_header.e_shnum;
+              ++i, ++sec)
+           if (strncmp (SECTION_NAME (sec),
+                        ELF_STRING_ia64_unwind_info_once, len2) == 0
+               && strcmp (SECTION_NAME (sec) + len2, suffix) == 0)
+             break;
+       }
+      else
+       {
+         /* .IA_64.unwindFOO -> .IA_64.unwind_infoFOO
+            .IA_64.unwind or BAR -> .IA_64.unwind_info */
+         len = sizeof (ELF_STRING_ia64_unwind) - 1;
+         len2 = sizeof (ELF_STRING_ia64_unwind_info) - 1;
+         suffix = "";
+         if (strncmp (SECTION_NAME (unwsec), ELF_STRING_ia64_unwind,
+                      len) == 0)
+           suffix = SECTION_NAME (unwsec) + len;
+         for (i = 0, sec = section_headers; i < elf_header.e_shnum;
+              ++i, ++sec)
+           if (strncmp (SECTION_NAME (sec),
+                        ELF_STRING_ia64_unwind_info, len2) == 0
+               && strcmp (SECTION_NAME (sec) + len2, suffix) == 0)
+             break;
+       }
+
+      if (i == elf_header.e_shnum)
+       {
+         printf (_("\nCould not find unwind info section for "));
+
+         if (string_table == NULL)
+           printf ("%d", unwsec->sh_name);
+         else
+           printf ("'%s'", SECTION_NAME (unwsec));
+       }
+      else
+       {
+         aux.info_size = sec->sh_size;
+         aux.info_addr = sec->sh_addr;
+         GET_DATA_ALLOC (sec->sh_offset, aux.info_size, aux.info,
+                         char *, "unwind info");
+
+         printf (_("\nUnwind section "));
+
+         if (string_table == NULL)
+           printf ("%d", unwsec->sh_name);
+         else
+           printf ("'%s'", SECTION_NAME (unwsec));
+
+         printf (_(" at offset 0x%lx contains %lu entries:\n"),
+                 unwsec->sh_offset,
+                 (unsigned long) (unwsec->sh_size / (3 * addr_size)));
+
+         (void) slurp_ia64_unwind_table (file, & aux, unwsec);
+
+         if (aux.table_len > 0)
+           dump_ia64_unwind (& aux);
+
+         if (aux.table)
+           free ((char *) aux.table);
+         if (aux.info)
+           free ((char *) aux.info);
+         aux.table = NULL;
+         aux.info = NULL;
+       }
+    }
+
+  if (aux.symtab)
+    free (aux.symtab);
+  if (aux.strtab)
+    free ((char *) aux.strtab);
+
+  return 1;
+}
 
 static void
 dynamic_segment_mips_val (entry)
@@ -3019,7 +3666,7 @@ dynamic_segment_parisc_val (entry)
              first = 0;
              val ^= flags[cnt].bit;
            }
-       
+
        if (val != 0 || first)
          {
            if (! first)
@@ -3028,7 +3675,7 @@ dynamic_segment_parisc_val (entry)
          }
       }
       break;
-      
+
     default:
       print_vma (entry->d_un.d_ptr, PREFIX_HEX);
       break;
@@ -3320,15 +3967,36 @@ process_dynamic_segment (file)
          if (do_dynamic)
            printf ("%s", get_dynamic_flags (entry->d_un.d_val));
          break;
-         
+
        case DT_AUXILIARY:
        case DT_FILTER:
+       case DT_CONFIG:
+       case DT_DEPAUDIT:
+       case DT_AUDIT:
          if (do_dynamic)
            {
-             if (entry->d_tag == DT_AUXILIARY)
-               printf (_("Auxiliary library"));
-             else
-               printf (_("Filter library"));
+             switch (entry->d_tag)
+               {
+               case DT_AUXILIARY:
+                 printf (_("Auxiliary library"));
+                 break;
+
+               case DT_FILTER:
+                 printf (_("Filter library"));
+                 break;
+
+               case DT_CONFIG:
+                 printf (_("Configuration file"));
+                 break;
+
+               case DT_DEPAUDIT:
+                 printf (_("Dependency audit library"));
+                 break;
+
+               case DT_AUDIT:
+                 printf (_("Audit library"));
+                 break;
+               }
 
              if (dynamic_strings)
                printf (": [%s]\n", dynamic_strings + entry->d_un.d_val);
@@ -3341,7 +4009,7 @@ process_dynamic_segment (file)
            }
          break;
 
-       case DT_FEATURE_1:
+       case DT_FEATURE:
          if (do_dynamic)
            {
              printf (_("Flags:"));
@@ -3355,6 +4023,11 @@ process_dynamic_segment (file)
                      printf (" PARINIT");
                      val ^= DTF_1_PARINIT;
                    }
+                 if (val & DTF_1_CONFEXP)
+                   {
+                     printf (" CONFEXP");
+                     val ^= DTF_1_CONFEXP;
+                   }
                  if (val != 0)
                    printf (" %lx", val);
                  puts ("");
@@ -3452,6 +4125,21 @@ process_dynamic_segment (file)
                      printf (" INTERPOSE");
                      val ^= DF_1_INTERPOSE;
                    }
+                 if (val & DF_1_NODEFLIB)
+                   {
+                     printf (" NODEFLIB");
+                     val ^= DF_1_NODEFLIB;
+                   }
+                 if (val & DF_1_NODUMP)
+                   {
+                     printf (" NODUMP");
+                     val ^= DF_1_NODUMP;
+                   }
+                 if (val & DF_1_CONLFAT)
+                   {
+                     printf (" CONLFAT");
+                     val ^= DF_1_CONLFAT;
+                   }
                  if (val != 0)
                    printf (" %lx", val);
                  puts ("");
@@ -3480,6 +4168,7 @@ process_dynamic_segment (file)
        case DT_DEBUG   :
        case DT_TEXTREL :
        case DT_JMPREL  :
+       case DT_RUNPATH :
          dynamic_info[entry->d_tag] = entry->d_un.d_val;
 
          if (do_dynamic)
@@ -3510,6 +4199,10 @@ process_dynamic_segment (file)
                      printf (_("Library rpath: [%s]"), name);
                      break;
 
+                   case DT_RUNPATH:
+                     printf (_("Library runpath: [%s]"), name);
+                     break;
+
                    default:
                      print_vma (entry->d_un.d_val, PREFIX_HEX);
                      break;
@@ -3592,7 +4285,7 @@ process_dynamic_segment (file)
              switch (elf_header.e_machine)
                {
                case EM_MIPS:
-               case EM_MIPS_RS4_BE:
+               case EM_MIPS_RS3_LE:
                  dynamic_segment_mips_val (entry);
                  break;
                case EM_PARISC:
@@ -3832,12 +4525,12 @@ process_version_sections (file)
        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;
+           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;
@@ -3878,6 +4571,7 @@ process_version_sections (file)
            for (cnt = 0; cnt < total; cnt += 4)
              {
                int j, nn;
+               int check_def, check_need;
                char * name;
 
                printf ("  %03x:", cnt);
@@ -3889,119 +4583,28 @@ process_version_sections (file)
                      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);
+                   case 1:
+                     fputs (_("   1 (*global*)   "), stdout);
+                     break;
 
-                                 name = strtab + ivna.vna_name;
-                                 nn += printf ("(%s%-*s",
-                                               name,
-                                               12 - (int) strlen (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);
-
-                                         name = strtab + ivda.vda_name;
-                                         nn +=
-                                           printf ("(%s%-*s",
-                                                   name,
-                                                   12 - (int) strlen (name),
-                                                   ")");
-                                       }
-                                   }
+                   default:
+                     nn = printf ("%4x%c", data [cnt + j] & 0x7fff,
+                                  data [cnt + j] & 0x8000 ? 'h' : ' ');
 
-                                 break;
-                               }
-                             else
-                               offset += ivn.vn_next;
-                           }
-                         while (ivn.vn_next);
+                     check_def = 1;
+                     check_need = 1;
+                     if (symbols [cnt + j].st_shndx >= SHN_LORESERVE
+                         || section_headers[symbols [cnt + j].st_shndx].sh_type
+                         != SHT_NOBITS)
+                       {
+                         if (symbols [cnt + j].st_shndx == SHN_UNDEF)
+                           check_def = 0;
+                         else
+                           check_need = 0;
                        }
-                     else if (symbols [cnt + j].st_shndx == SHN_UNDEF)
+
+                     if (check_need
+                         && version_info [DT_VERSIONTAGIDX (DT_VERNEED)])
                        {
                          Elf_Internal_Verneed     ivn;
                          unsigned long            offset;
@@ -4045,6 +4648,7 @@ process_version_sections (file)
                                                name,
                                                12 - (int) strlen (name),
                                                ")");
+                                 check_def = 0;
                                  break;
                                }
 
@@ -4052,7 +4656,9 @@ process_version_sections (file)
                            }
                          while (ivn.vn_next);
                        }
-                     else if (data [cnt + j] != 0x8001)
+
+                     if (check_def && data [cnt + j] != 0x8001
+                         && version_info [DT_VERSIONTAGIDX (DT_VERDEF)])
                        {
                          Elf_Internal_Verdef  ivd;
                          Elf_External_Verdef  evd;
@@ -4230,10 +4836,10 @@ get_dynamic_data (file, number)
      FILE *       file;
      unsigned int number;
 {
-  char * e_data;
+  unsigned char * e_data;
   int *  i_data;
 
-  e_data = (char *) malloc (number * 4);
+  e_data = (unsigned char *) malloc (number * 4);
 
   if (e_data == NULL)
     {
@@ -4270,8 +4876,8 @@ process_symbol_table (file)
      FILE * file;
 {
   Elf32_Internal_Shdr *   section;
-  char   nb [4];
-  char   nc [4];
+  unsigned char   nb [4];
+  unsigned char   nc [4];
   int    nbuckets = 0;
   int    nchains = 0;
   int *  buckets = NULL;
@@ -4338,7 +4944,7 @@ process_symbol_table (file)
              print_vma (psym->st_value, LONG_HEX);
              putchar (' ' );
              print_vma (psym->st_size, DEC_5);
-                     
+
              printf ("  %6s", get_symbol_type (ELF_ST_TYPE (psym->st_info)));
              printf (" %6s",  get_symbol_binding (ELF_ST_BIND (psym->st_info)));
              printf (" %3s",  get_symbol_visibility (ELF_ST_VISIBILITY (psym->st_other)));
@@ -4429,7 +5035,8 @@ process_symbol_table (file)
 
                  if ((vers_data & 0x8000) || vers_data > 1)
                    {
-                     if (is_nobits || ! check_def)
+                     if (version_info [DT_VERSIONTAGIDX (DT_VERNEED)]
+                         && (is_nobits || ! check_def))
                        {
                          Elf_External_Verneed  evn;
                          Elf_Internal_Verneed  ivn;
@@ -4487,7 +5094,8 @@ process_symbol_table (file)
 
                      if (check_def)
                        {
-                         if (vers_data != 0x8001)
+                         if (vers_data != 0x8001
+                             && version_info [DT_VERSIONTAGIDX (DT_VERDEF)])
                            {
                              Elf_Internal_Verdef     ivd;
                              Elf_Internal_Verdaux    ivda;
@@ -4543,13 +5151,13 @@ process_symbol_table (file)
 
   if (do_histogram && buckets != NULL)
     {
-      int *lengths;
-      int *counts;
-      int hn;
-      int si;
-      int maxlength = 0;
-      int nzero_counts = 0;
-      int nsyms = 0;
+      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);
@@ -4885,7 +5493,7 @@ process_extended_line_op (data, is_stmt, pointer_size)
 
       printf (_("   %d\t"), ++ state_machine_regs.last_file_entry);
       name = data;
-      data += strlen (data) + 1;
+      data += strlen ((char *) data) + 1;
       printf (_("%lu\t"), read_leb128 (data, & bytes_read, 0));
       data += bytes_read;
       printf (_("%lu\t"), read_leb128 (data, & bytes_read, 0));
@@ -4930,7 +5538,7 @@ display_debug_lines (section, start, file)
 
       /* Check the length of the block.  */
       info.li_length = BYTE_GET (external->li_length);
-      if (info.li_length > section->sh_size)
+      if (info.li_length + sizeof (external->li_length) > section->sh_size)
        {
          warn
            (_("The line info appears to be corrupt - the section is too small\n"));
@@ -4958,14 +5566,14 @@ display_debug_lines (section, start, file)
 
       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 (_("  Prologue 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);
+      end_of_sequence = data + info.li_length + sizeof (external->li_length);
 
       reset_state_machine (info.li_default_is_stmt);
 
@@ -4990,7 +5598,7 @@ display_debug_lines (section, start, file)
            {
              printf (_("  %s\n"), data);
 
-             data += strlen (data) + 1;
+             data += strlen ((char *) data) + 1;
            }
        }
 
@@ -5007,13 +5615,13 @@ display_debug_lines (section, start, file)
 
          while (* data != 0)
            {
-             char * name;
+             unsigned char * name;
              int bytes_read;
 
              printf (_("  %d\t"), ++ state_machine_regs.last_file_entry);
              name = data;
 
-             data += strlen (data) + 1;
+             data += strlen ((char *) data) + 1;
 
              printf (_("%lu\t"), read_leb128 (data, & bytes_read, 0));
              data += bytes_read;
@@ -5160,7 +5768,14 @@ display_debug_pubnames (section, start, file)
 
       if (pubnames.pn_version != 2)
        {
-         warn (_("Only DWARF 2 pubnames are currently supported"));
+         static int warned = 0;
+
+         if (! warned)
+           {
+             warn (_("Only DWARF 2 pubnames are currently supported\n"));
+             warned = 1;
+           }
+
          continue;
        }
 
@@ -5183,7 +5798,7 @@ display_debug_pubnames (section, start, file)
            {
              data += 4;
              printf ("    %ld\t\t%s\n", offset, data);
-             data += strlen (data) + 1;
+             data += strlen ((char *) data) + 1;
            }
        }
       while (offset != 0);
@@ -5560,7 +6175,7 @@ display_debug_abbrev (section, start, file)
      unsigned char *       start;
      FILE *                file ATTRIBUTE_UNUSED;
 {
-  abbrev_entry * entry;
+  abbrev_entry *  entry;
   unsigned char * end = start + section->sh_size;
 
   printf (_("Contents of the %s section:\n\n"), SECTION_NAME (section));
@@ -5613,12 +6228,12 @@ static void
 decode_location_expression (data, pointer_size, length)
      unsigned char * data;
      unsigned int    pointer_size;
-     unsigned long length;
+     unsigned long   length;
 {
-  unsigned op;
-  int           bytes_read;
-  unsigned long uvalue;
-  unsigned char *end = data + length;
+  unsigned        op;
+  int             bytes_read;
+  unsigned long   uvalue;
+  unsigned char * end = data + length;
 
   while (data < end)
     {
@@ -5936,7 +6551,7 @@ read_and_display_attr (attribute, form, data, cu_offset, pointer_size)
     {
     default:
       break;
-      
+
     case DW_FORM_ref_addr:
     case DW_FORM_addr:
       uvalue = byte_get (data, pointer_size);
@@ -5978,7 +6593,7 @@ read_and_display_attr (attribute, form, data, cu_offset, pointer_size)
     case DW_FORM_ref_addr:
       printf (" <#%lx>", uvalue);
       break;
-      
+
     case DW_FORM_ref1:
     case DW_FORM_ref2:
     case DW_FORM_ref4:
@@ -6008,7 +6623,7 @@ read_and_display_attr (attribute, form, data, cu_offset, pointer_size)
 
     case DW_FORM_string:
       printf (" %s", data);
-      data += strlen (data) + 1;
+      data += strlen ((char *) data) + 1;
       break;
 
     case DW_FORM_block:
@@ -6209,18 +6824,18 @@ display_debug_info (section, start, file)
       cu_offset = start - section_begin;
       start += compunit.cu_length + sizeof (external->cu_length);
 
+      printf (_("  Compilation Unit @ %lx:\n"), cu_offset);
+      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 (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 ();
 
@@ -6332,6 +6947,12 @@ display_debug_aranges (section, start, file)
       arange.ar_pointer_size = BYTE_GET (external->ar_pointer_size);
       arange.ar_segment_size = BYTE_GET (external->ar_segment_size);
 
+      if (arange.ar_version != 2)
+       {
+         warn (_("Only DWARF 2 aranges are currently supported.\n"));
+         break;
+       }
+
       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);
@@ -6343,7 +6964,7 @@ display_debug_aranges (section, start, file)
       ranges = start + sizeof (* external);
 
       /* Must pad to an alignment boundary that is twice the pointer size.  */
-      excess = sizeof (*external) % (2 * arange.ar_pointer_size);
+      excess = sizeof (* external) % (2 * arange.ar_pointer_size);
       if (excess)
        ranges += (2 * arange.ar_pointer_size) - excess;
 
@@ -6372,6 +6993,671 @@ display_debug_aranges (section, start, file)
   return 1;
 }
 
+typedef struct Frame_Chunk
+{
+  struct Frame_Chunk * next;
+  unsigned char *      chunk_start;
+  int                  ncols;
+  /* DW_CFA_{undefined,same_value,offset,register,unreferenced}  */
+  short int *          col_type;
+  int *                col_offset;
+  char *               augmentation;
+  unsigned int         code_factor;
+  int                  data_factor;
+  unsigned long        pc_begin;
+  unsigned long        pc_range;
+  int                  cfa_reg;
+  int                  cfa_offset;
+  int                  ra;
+  unsigned char        fde_encoding;
+}
+Frame_Chunk;
+
+/* A marker for a col_type that means this column was never referenced
+   in the frame info.  */
+#define DW_CFA_unreferenced (-1)
+
+static void
+frame_need_space (fc, reg)
+     Frame_Chunk * fc;
+     int reg;
+{
+  int prev = fc->ncols;
+
+  if (reg < fc->ncols)
+    return;
+
+  fc->ncols = reg + 1;
+  fc->col_type = (short int *) xrealloc (fc->col_type,
+                                        fc->ncols * sizeof (short int));
+  fc->col_offset = (int *) xrealloc (fc->col_offset,
+                                    fc->ncols * sizeof (int));
+
+  while (prev < fc->ncols)
+    {
+      fc->col_type[prev] = DW_CFA_unreferenced;
+      fc->col_offset[prev] = 0;
+      prev++;
+    }
+}
+
+static void
+frame_display_row (fc, need_col_headers, max_regs)
+     Frame_Chunk * fc;
+     int *         need_col_headers;
+     int *         max_regs;
+{
+  int r;
+  char tmp[100];
+
+  if (* max_regs < fc->ncols)
+    * max_regs = fc->ncols;
+
+  if (* need_col_headers)
+    {
+      * need_col_headers = 0;
+
+      printf ("   LOC   CFA      ");
+
+      for (r = 0; r < * max_regs; r++)
+       if (fc->col_type[r] != DW_CFA_unreferenced)
+         {
+           if (r == fc->ra)
+             printf ("ra   ");
+           else
+             printf ("r%-4d", r);
+         }
+
+      printf ("\n");
+    }
+
+  printf ("%08lx ", fc->pc_begin);
+  sprintf (tmp, "r%d%+d", fc->cfa_reg, fc->cfa_offset);
+  printf ("%-8s ", tmp);
+
+  for (r = 0; r < fc->ncols; r++)
+    {
+      if (fc->col_type[r] != DW_CFA_unreferenced)
+       {
+         switch (fc->col_type[r])
+           {
+           case DW_CFA_undefined:
+             strcpy (tmp, "u");
+             break;
+           case DW_CFA_same_value:
+             strcpy (tmp, "s");
+             break;
+           case DW_CFA_offset:
+             sprintf (tmp, "c%+d", fc->col_offset[r]);
+             break;
+           case DW_CFA_register:
+             sprintf (tmp, "r%d", fc->col_offset[r]);
+             break;
+           default:
+             strcpy (tmp, "n/a");
+             break;
+           }
+         printf ("%-5s", tmp);
+       }
+    }
+  printf ("\n");
+}
+
+static int
+size_of_encoded_value (encoding)
+     int encoding;
+{
+  switch (encoding & 0x7)
+    {
+    default:   /* ??? */
+    case 0:    return is_32bit_elf ? 4 : 8;
+    case 2:    return 2;
+    case 3:    return 4;
+    case 4:    return 8;
+    }
+}
+
+#define GET(N) byte_get (start, N); start += N
+#define LEB()  read_leb128 (start, & length_return, 0); start += length_return
+#define SLEB() read_leb128 (start, & length_return, 1); start += length_return
+
+static int
+display_debug_frames (section, start, file)
+     Elf32_Internal_Shdr * section;
+     unsigned char *       start;
+     FILE *                file ATTRIBUTE_UNUSED;
+{
+  unsigned char * end = start + section->sh_size;
+  unsigned char * section_start = start;
+  Frame_Chunk *   chunks = 0;
+  Frame_Chunk *   remembered_state = 0;
+  Frame_Chunk *   rs;
+  int             is_eh = (strcmp (SECTION_NAME (section), ".eh_frame") == 0);
+  int             length_return;
+  int             max_regs = 0;
+  int             addr_size = is_32bit_elf ? 4 : 8;
+
+  printf (_("The section %s contains:\n"), SECTION_NAME (section));
+
+  while (start < end)
+    {
+      unsigned char * saved_start;
+      unsigned char * block_end;
+      unsigned long   length;
+      unsigned long   cie_id;
+      Frame_Chunk *   fc;
+      Frame_Chunk *   cie;
+      int             need_col_headers = 1;
+      unsigned char * augmentation_data = NULL;
+      unsigned long   augmentation_data_len = 0;
+      int            encoded_ptr_size = addr_size;
+
+      saved_start = start;
+      length = byte_get (start, 4); start += 4;
+
+      if (length == 0)
+       return 1;
+
+      block_end = saved_start + length + 4;
+      cie_id = byte_get (start, 4); start += 4;
+
+      if (is_eh ? (cie_id == 0) : (cie_id == DW_CIE_ID))
+       {
+         int version;
+
+         fc = (Frame_Chunk *) xmalloc (sizeof (Frame_Chunk));
+         memset (fc, 0, sizeof (Frame_Chunk));
+
+         fc->next = chunks;
+         chunks = fc;
+         fc->chunk_start = saved_start;
+         fc->ncols = 0;
+         fc->col_type = (short int *) xmalloc (sizeof (short int));
+         fc->col_offset = (int *) xmalloc (sizeof (int));
+         frame_need_space (fc, max_regs-1);
+
+         version = *start++;
+
+         fc->augmentation = start;
+         start = strchr (start, '\0') + 1;
+
+         if (fc->augmentation[0] == 'z')
+           {
+             fc->code_factor = LEB ();
+             fc->data_factor = SLEB ();
+             fc->ra = byte_get (start, 1); start += 1;
+             augmentation_data_len = LEB ();
+             augmentation_data = start;
+             start += augmentation_data_len;
+           }
+         else if (strcmp (fc->augmentation, "eh") == 0)
+           {
+             start += addr_size;
+             fc->code_factor = LEB ();
+             fc->data_factor = SLEB ();
+             fc->ra = byte_get (start, 1); start += 1;
+           }
+         else
+           {
+             fc->code_factor = LEB ();
+             fc->data_factor = SLEB ();
+             fc->ra = byte_get (start, 1); start += 1;
+           }
+         cie = fc;
+
+         if (do_debug_frames_interp)
+           printf ("\n%08lx %08lx %08lx CIE \"%s\" cf=%d df=%d ra=%d\n",
+                   (unsigned long)(saved_start - section_start), length, cie_id,
+                   fc->augmentation, fc->code_factor, fc->data_factor,
+                   fc->ra);
+         else
+           {
+             printf ("\n%08lx %08lx %08lx CIE\n",
+                     (unsigned long)(saved_start - section_start), length, cie_id);
+             printf ("  Version:               %d\n", version);
+             printf ("  Augmentation:          \"%s\"\n", fc->augmentation);
+             printf ("  Code alignment factor: %u\n", fc->code_factor);
+             printf ("  Data alignment factor: %d\n", fc->data_factor);
+             printf ("  Return address column: %d\n", fc->ra);
+
+             if (augmentation_data_len)
+               {
+                 unsigned long i;
+                 printf ("  Augmentation data:    ");
+                 for (i = 0; i < augmentation_data_len; ++i)
+                   printf (" %02x", augmentation_data[i]);
+                 putchar ('\n');
+               }
+             putchar ('\n');
+           }
+
+         if (augmentation_data_len)
+           {
+             unsigned char *p, *q;
+             p = fc->augmentation + 1;
+             q = augmentation_data;
+
+             while (1)
+               {
+                 if (*p == 'L')
+                   q++;
+                 else if (*p == 'P')
+                   q += 1 + size_of_encoded_value (*q);
+                 else if (*p == 'R')
+                   fc->fde_encoding = *q++;
+                 else
+                   break;
+                 p++;
+               }
+
+             if (fc->fde_encoding)
+               encoded_ptr_size = size_of_encoded_value (fc->fde_encoding);
+           }
+
+         frame_need_space (fc, fc->ra);
+       }
+      else
+       {
+         unsigned char *    look_for;
+         static Frame_Chunk fde_fc;
+
+         fc = & fde_fc;
+         memset (fc, 0, sizeof (Frame_Chunk));
+
+         look_for = is_eh ? start - 4 - cie_id : section_start + cie_id;
+
+         for (cie=chunks; cie ; cie = cie->next)
+           if (cie->chunk_start == look_for)
+             break;
+
+         if (!cie)
+           {
+             warn ("Invalid CIE pointer %08lx in FDE at %08lx\n",
+                   cie_id, saved_start);
+             start = block_end;
+             fc->ncols = 0;
+             fc->col_type = (short int *) xmalloc (sizeof (short int));
+             fc->col_offset = (int *) xmalloc (sizeof (int));
+             frame_need_space (fc, max_regs - 1);
+             cie = fc;
+             fc->augmentation = "";
+             fc->fde_encoding = 0;
+           }
+         else
+           {
+             fc->ncols = cie->ncols;
+             fc->col_type = (short int *) xmalloc (fc->ncols * sizeof (short int));
+             fc->col_offset = (int *) xmalloc (fc->ncols * sizeof (int));
+             memcpy (fc->col_type, cie->col_type, fc->ncols * sizeof (short int));
+             memcpy (fc->col_offset, cie->col_offset, fc->ncols * sizeof (int));
+             fc->augmentation = cie->augmentation;
+             fc->code_factor = cie->code_factor;
+             fc->data_factor = cie->data_factor;
+             fc->cfa_reg = cie->cfa_reg;
+             fc->cfa_offset = cie->cfa_offset;
+             fc->ra = cie->ra;
+             frame_need_space (fc, max_regs-1);
+             fc->fde_encoding = cie->fde_encoding;
+           }
+
+         if (fc->fde_encoding)
+           encoded_ptr_size = size_of_encoded_value (fc->fde_encoding);
+
+         fc->pc_begin = byte_get (start, encoded_ptr_size);
+         start += encoded_ptr_size;
+         fc->pc_range = byte_get (start, encoded_ptr_size);
+         start += encoded_ptr_size;
+
+         if (cie->augmentation[0] == 'z')
+           {
+             augmentation_data_len = LEB ();
+             augmentation_data = start;
+             start += augmentation_data_len;
+           }
+
+         printf ("\n%08lx %08lx %08lx FDE cie=%08x pc=%08lx..%08lx\n",
+                 (unsigned long)(saved_start - section_start), length, cie_id,
+                 cie->chunk_start - section_start, fc->pc_begin,
+                 fc->pc_begin + fc->pc_range);
+         if (! do_debug_frames_interp && augmentation_data_len)
+           {
+             unsigned long i;
+             printf ("  Augmentation data:    ");
+             for (i = 0; i < augmentation_data_len; ++i)
+               printf (" %02x", augmentation_data[i]);
+             putchar ('\n');
+             putchar ('\n');
+           }
+       }
+
+      /* At this point, fc is the current chunk, cie (if any) is set, and we're
+        about to interpret instructions for the chunk.  */
+
+      if (do_debug_frames_interp)
+      {
+       /* Start by making a pass over the chunk, allocating storage
+           and taking note of what registers are used.  */
+       unsigned char * tmp = start;
+
+       while (start < block_end)
+         {
+           unsigned op, opa;
+           unsigned long reg;
+
+           op = * start ++;
+           opa = op & 0x3f;
+           if (op & 0xc0)
+             op &= 0xc0;
+
+           /* Warning: if you add any more cases to this switch, be
+              sure to add them to the corresponding switch below.  */
+           switch (op)
+             {
+             case DW_CFA_advance_loc:
+               break;
+             case DW_CFA_offset:
+               LEB ();
+               frame_need_space (fc, opa);
+               fc->col_type[opa] = DW_CFA_undefined;
+               break;
+             case DW_CFA_restore:
+               frame_need_space (fc, opa);
+               fc->col_type[opa] = DW_CFA_undefined;
+               break;
+             case DW_CFA_set_loc:
+               start += encoded_ptr_size;
+               break;
+             case DW_CFA_advance_loc1:
+               start += 1;
+               break;
+             case DW_CFA_advance_loc2:
+               start += 2;
+               break;
+             case DW_CFA_advance_loc4:
+               start += 4;
+               break;
+             case DW_CFA_offset_extended:
+               reg = LEB (); LEB ();
+               frame_need_space (fc, reg);
+               fc->col_type[reg] = DW_CFA_undefined;
+               break;
+             case DW_CFA_restore_extended:
+               reg = LEB ();
+               frame_need_space (fc, reg);
+               fc->col_type[reg] = DW_CFA_undefined;
+               break;
+             case DW_CFA_undefined:
+               reg = LEB ();
+               frame_need_space (fc, reg);
+               fc->col_type[reg] = DW_CFA_undefined;
+               break;
+             case DW_CFA_same_value:
+               reg = LEB ();
+               frame_need_space (fc, reg);
+               fc->col_type[reg] = DW_CFA_undefined;
+               break;
+             case DW_CFA_register:
+               reg = LEB (); LEB ();
+               frame_need_space (fc, reg);
+               fc->col_type[reg] = DW_CFA_undefined;
+               break;
+             case DW_CFA_def_cfa:
+               LEB (); LEB ();
+               break;
+             case DW_CFA_def_cfa_register:
+               LEB ();
+               break;
+             case DW_CFA_def_cfa_offset:
+               LEB ();
+               break;
+#ifndef DW_CFA_GNU_args_size
+#define DW_CFA_GNU_args_size 0x2e
+#endif
+             case DW_CFA_GNU_args_size:
+               LEB ();
+               break;
+#ifndef DW_CFA_GNU_negative_offset_extended
+#define DW_CFA_GNU_negative_offset_extended 0x2f
+#endif
+             case DW_CFA_GNU_negative_offset_extended:
+               reg = LEB (); LEB ();
+               frame_need_space (fc, reg);
+               fc->col_type[reg] = DW_CFA_undefined;
+
+             default:
+               break;
+             }
+         }
+       start = tmp;
+      }
+
+      /* Now we know what registers are used, make a second pass over
+         the chunk, this time actually printing out the info.  */
+
+      while (start < block_end)
+       {
+         unsigned op, opa;
+         unsigned long ul, reg, roffs;
+         long l, ofs;
+         bfd_vma vma;
+
+         op = * start ++;
+         opa = op & 0x3f;
+         if (op & 0xc0)
+           op &= 0xc0;
+
+           /* Warning: if you add any more cases to this switch, be
+              sure to add them to the corresponding switch above.  */
+         switch (op)
+           {
+           case DW_CFA_advance_loc:
+             if (do_debug_frames_interp)
+               frame_display_row (fc, &need_col_headers, &max_regs);
+             else
+               printf ("  DW_CFA_advance_loc: %d to %08lx\n",
+                       opa * fc->code_factor,
+                       fc->pc_begin + opa * fc->code_factor);
+             fc->pc_begin += opa * fc->code_factor;
+             break;
+
+           case DW_CFA_offset:
+             roffs = LEB ();
+             if (! do_debug_frames_interp)
+               printf ("  DW_CFA_offset: r%d at cfa%+ld\n",
+                       opa, roffs * fc->data_factor);
+             fc->col_type[opa] = DW_CFA_offset;
+             fc->col_offset[opa] = roffs * fc->data_factor;
+             break;
+
+           case DW_CFA_restore:
+             if (! do_debug_frames_interp)
+               printf ("  DW_CFA_restore: r%d\n", opa);
+             fc->col_type[opa] = cie->col_type[opa];
+             fc->col_offset[opa] = cie->col_offset[opa];
+             break;
+
+           case DW_CFA_set_loc:
+             vma = byte_get (start, encoded_ptr_size);
+             start += encoded_ptr_size;
+             if (do_debug_frames_interp)
+               frame_display_row (fc, &need_col_headers, &max_regs);
+             else
+               printf ("  DW_CFA_set_loc: %08lx\n", (unsigned long)vma);
+             fc->pc_begin = vma;
+             break;
+
+           case DW_CFA_advance_loc1:
+             ofs = byte_get (start, 1); start += 1;
+             if (do_debug_frames_interp)
+               frame_display_row (fc, &need_col_headers, &max_regs);
+             else
+               printf ("  DW_CFA_advance_loc1: %ld to %08lx\n",
+                       ofs * fc->code_factor,
+                       fc->pc_begin + ofs * fc->code_factor);
+             fc->pc_begin += ofs * fc->code_factor;
+             break;
+
+           case DW_CFA_advance_loc2:
+             ofs = byte_get (start, 2); start += 2;
+             if (do_debug_frames_interp)
+               frame_display_row (fc, &need_col_headers, &max_regs);
+             else
+               printf ("  DW_CFA_advance_loc2: %ld to %08lx\n",
+                       ofs * fc->code_factor,
+                       fc->pc_begin + ofs * fc->code_factor);
+             fc->pc_begin += ofs * fc->code_factor;
+             break;
+
+           case DW_CFA_advance_loc4:
+             ofs = byte_get (start, 4); start += 4;
+             if (do_debug_frames_interp)
+               frame_display_row (fc, &need_col_headers, &max_regs);
+             else
+               printf ("  DW_CFA_advance_loc4: %ld to %08lx\n",
+                       ofs * fc->code_factor,
+                       fc->pc_begin + ofs * fc->code_factor);
+             fc->pc_begin += ofs * fc->code_factor;
+             break;
+
+           case DW_CFA_offset_extended:
+             reg = LEB ();
+             roffs = LEB ();
+             if (! do_debug_frames_interp)
+               printf ("  DW_CFA_offset_extended: r%ld at cfa%+ld\n",
+                       reg, roffs * fc->data_factor);
+             fc->col_type[reg] = DW_CFA_offset;
+             fc->col_offset[reg] = roffs * fc->data_factor;
+             break;
+
+           case DW_CFA_restore_extended:
+             reg = LEB ();
+             if (! do_debug_frames_interp)
+               printf ("  DW_CFA_restore_extended: r%ld\n", reg);
+             fc->col_type[reg] = cie->col_type[reg];
+             fc->col_offset[reg] = cie->col_offset[reg];
+             break;
+
+           case DW_CFA_undefined:
+             reg = LEB ();
+             if (! do_debug_frames_interp)
+               printf ("  DW_CFA_undefined: r%ld\n", reg);
+             fc->col_type[reg] = DW_CFA_undefined;
+             fc->col_offset[reg] = 0;
+             break;
+
+           case DW_CFA_same_value:
+             reg = LEB ();
+             if (! do_debug_frames_interp)
+               printf ("  DW_CFA_same_value: r%ld\n", reg);
+             fc->col_type[reg] = DW_CFA_same_value;
+             fc->col_offset[reg] = 0;
+             break;
+
+           case DW_CFA_register:
+             reg = LEB ();
+             roffs = LEB ();
+             if (! do_debug_frames_interp)
+               printf ("  DW_CFA_register: r%ld\n", reg);
+             fc->col_type[reg] = DW_CFA_register;
+             fc->col_offset[reg] = roffs;
+             break;
+
+           case DW_CFA_remember_state:
+             if (! do_debug_frames_interp)
+               printf ("  DW_CFA_remember_state\n");
+             rs = (Frame_Chunk *) xmalloc (sizeof (Frame_Chunk));
+             rs->ncols = fc->ncols;
+             rs->col_type = (short int *) xmalloc (rs->ncols * sizeof (short int));
+             rs->col_offset = (int *) xmalloc (rs->ncols * sizeof (int));
+             memcpy (rs->col_type, fc->col_type, rs->ncols);
+             memcpy (rs->col_offset, fc->col_offset, rs->ncols * sizeof (int));
+             rs->next = remembered_state;
+             remembered_state = rs;
+             break;
+
+           case DW_CFA_restore_state:
+             if (! do_debug_frames_interp)
+               printf ("  DW_CFA_restore_state\n");
+             rs = remembered_state;
+             remembered_state = rs->next;
+             frame_need_space (fc, rs->ncols-1);
+             memcpy (fc->col_type, rs->col_type, rs->ncols);
+             memcpy (fc->col_offset, rs->col_offset, rs->ncols * sizeof (int));
+             free (rs->col_type);
+             free (rs->col_offset);
+             free (rs);
+             break;
+
+           case DW_CFA_def_cfa:
+             fc->cfa_reg = LEB ();
+             fc->cfa_offset = LEB ();
+             if (! do_debug_frames_interp)
+               printf ("  DW_CFA_def_cfa: r%d ofs %d\n",
+                       fc->cfa_reg, fc->cfa_offset);
+             break;
+
+           case DW_CFA_def_cfa_register:
+             fc->cfa_reg = LEB ();
+             if (! do_debug_frames_interp)
+               printf ("  DW_CFA_def_cfa_reg: r%d\n", fc->cfa_reg);
+             break;
+
+           case DW_CFA_def_cfa_offset:
+             fc->cfa_offset = LEB ();
+             if (! do_debug_frames_interp)
+               printf ("  DW_CFA_def_cfa_offset: %d\n", fc->cfa_offset);
+             break;
+
+           case DW_CFA_nop:
+             if (! do_debug_frames_interp)
+               printf ("  DW_CFA_nop\n");
+             break;
+
+#ifndef DW_CFA_GNU_window_save
+#define DW_CFA_GNU_window_save 0x2d
+#endif
+           case DW_CFA_GNU_window_save:
+             if (! do_debug_frames_interp)
+               printf ("  DW_CFA_GNU_window_save\n");
+             break;
+
+           case DW_CFA_GNU_args_size:
+             ul = LEB ();
+             if (! do_debug_frames_interp)
+               printf ("  DW_CFA_GNU_args_size: %ld\n", ul);
+             break;
+
+           case DW_CFA_GNU_negative_offset_extended:
+             reg = LEB ();
+             l = - LEB ();
+             frame_need_space (fc, reg);
+             if (! do_debug_frames_interp)
+               printf ("  DW_CFA_GNU_negative_offset_extended: r%ld at cfa%+ld\n",
+                       reg, l * fc->data_factor);
+             fc->col_type[reg] = DW_CFA_offset;
+             fc->col_offset[reg] = l * fc->data_factor;
+             break;
+
+           default:
+             fprintf (stderr, "unsupported or unknown DW_CFA_%d\n", op);
+             start = block_end;
+           }
+       }
+
+      if (do_debug_frames_interp)
+        frame_display_row (fc, &need_col_headers, &max_regs);
+
+      start = block_end;
+    }
+
+  printf ("\n");
+
+  return 1;
+}
+
+#undef GET
+#undef LEB
+#undef SLEB
 
 static int
 display_debug_not_supported (section, start, file)
@@ -6419,8 +7705,9 @@ debug_displays[] =
   { ".debug_line",        display_debug_lines, NULL },
   { ".debug_aranges",     display_debug_aranges, NULL },
   { ".debug_pubnames",    display_debug_pubnames, NULL },
+  { ".debug_frame",       display_debug_frames, NULL },
+  { ".eh_frame",          display_debug_frames, NULL },
   { ".debug_macinfo",     display_debug_not_supported, NULL },
-  { ".debug_frame",       display_debug_not_supported, NULL },
   { ".debug_str",         display_debug_not_supported, NULL },
   { ".debug_static_func", display_debug_not_supported, NULL },
   { ".debug_static_vars", display_debug_not_supported, NULL },
@@ -6449,6 +7736,9 @@ display_debug_section (section, file)
                  "debug section data");
 
   /* See if we know how to display the contents of this section.  */
+  if (strncmp (name, ".gnu.linkonce.wi.", 17) == 0)
+    name = ".debug_info";
+
   for (i = NUM_ELEM (debug_displays); i--;)
     if (strcmp (debug_displays[i].name, name) == 0)
       {
@@ -6474,7 +7764,7 @@ process_section_contents (file)
      FILE * file;
 {
   Elf32_Internal_Shdr * section;
-  unsigned int         i;
+  unsigned int i;
 
   if (! do_dump)
     return 1;
@@ -6685,7 +7975,7 @@ process_mips_specific (file)
                      Elf_External_Options *, "options");
 
       iopt = (Elf_Internal_Options *) malloc ((sect->sh_size / sizeof (eopt))
-                                             * sizeof (*iopt));
+                                             * sizeof (* iopt));
       if (iopt == NULL)
        {
          error (_("Out of memory"));
@@ -6694,7 +7984,7 @@ process_mips_specific (file)
 
       offset = cnt = 0;
       option = iopt;
-      
+
       while (offset < sect->sh_size)
        {
          Elf_External_Options * eoption;
@@ -6707,16 +7997,16 @@ process_mips_specific (file)
          option->info = BYTE_GET (eoption->info);
 
          offset += option->size;
-         
+
          ++option;
          ++cnt;
        }
 
       printf (_("\nSection '%s' contains %d entries:\n"),
-             string_table + sect->sh_name, cnt);
+             SECTION_NAME (sect), cnt);
 
       option = iopt;
-      
+
       while (cnt-- > 0)
        {
          size_t len;
@@ -6732,8 +8022,8 @@ process_mips_specific (file)
              if (elf_header.e_machine == EM_MIPS)
                {
                  /* 32bit form.  */
-                 Elf32_External_RegInfo *ereg;
-                 Elf32_RegInfo reginfo;
+                 Elf32_External_RegInfo * ereg;
+                 Elf32_RegInfo            reginfo;
 
                  ereg = (Elf32_External_RegInfo *) (option + 1);
                  reginfo.ri_gprmask = BYTE_GET (ereg->ri_gprmask);
@@ -6850,7 +8140,7 @@ process_mips_specific (file)
              break;
            }
 
-         len = sizeof (*eopt);
+         len = sizeof (* eopt);
          while (len < option->size)
            if (((char *) option)[len] >= ' '
                && ((char *) option)[len] < 0x7f)
@@ -6878,7 +8168,7 @@ process_mips_specific (file)
          return 0;
        }
 
-      iconf = (Elf32_Conflict *) malloc (conflictsno * sizeof (*iconf));
+      iconf = (Elf32_Conflict *) malloc (conflictsno * sizeof (* iconf));
       if (iconf == NULL)
        {
          error (_("Out of memory"));
@@ -6887,7 +8177,7 @@ process_mips_specific (file)
 
       if (is_32bit_elf)
        {
-         GET_DATA_ALLOC (conflicts_offset, conflictsno * sizeof (*econf32),
+         GET_DATA_ALLOC (conflicts_offset, conflictsno * sizeof (* econf32),
                          econf32, Elf32_External_Conflict *, "conflict");
 
          for (cnt = 0; cnt < conflictsno; ++cnt)
@@ -6895,7 +8185,7 @@ process_mips_specific (file)
        }
       else
        {
-         GET_DATA_ALLOC (conflicts_offset, conflictsno * sizeof (*econf64),
+         GET_DATA_ALLOC (conflicts_offset, conflictsno * sizeof (* econf64),
                          econf64, Elf64_External_Conflict *, "conflict");
 
          for (cnt = 0; cnt < conflictsno; ++cnt)
@@ -6956,7 +8246,7 @@ process_note (pnote)
 {
   printf ("  %s\t\t0x%08lx\t%s\n",
          pnote->namesz ? pnote->namedata : "(NONE)",
-         pnote->descsz, get_note_type (pnote->type));
+         pnote->descsz, get_note_type (pnote->type));
   return 1;
 }
 
@@ -6993,7 +8283,7 @@ process_corefile_note_segment (file, offset, length)
       inote.descsz   = BYTE_GET (external->descsz);
       inote.descdata = inote.namedata + align_power (inote.namesz, 2);
       inote.descpos  = offset + (inote.descdata - (char *) pnotes);
-      
+
       external = (Elf_External_Note *)(inote.descdata + align_power (inote.descsz, 2));
 
       /* Verify that name is null terminated.  It appears that at least
@@ -7003,17 +8293,17 @@ process_corefile_note_segment (file, offset, length)
       if (inote.namedata[inote.namesz] != '\0')
        {
          temp = malloc (inote.namesz + 1);
-         
+
          if (temp == NULL)
            {
              error (_("Out of memory\n"));
              res = 0;
              break;
            }
-         
+
          strncpy (temp, inote.namedata, inote.namesz);
          temp[inote.namesz] = 0;
-         
+
          /* warn (_("'%s' NOTE name not properly null terminated\n"), temp);  */
          inote.namedata = temp;
        }
@@ -7108,7 +8398,7 @@ process_arch_specific (file)
   switch (elf_header.e_machine)
     {
     case EM_MIPS:
-    case EM_MIPS_RS4_BE:
+    case EM_MIPS_RS3_LE:
       return process_mips_specific (file);
       break;
     default:
@@ -7248,6 +8538,8 @@ process_file (file_name)
 
   process_relocs (file);
 
+  process_unwind (file);
+
   process_symbol_table (file);
 
   process_syminfo (file);
@@ -7272,6 +8564,7 @@ process_file (file_name)
     {
       free (string_table);
       string_table = NULL;
+      string_table_length = 0;
     }
 
   if (dynamic_strings)