Fix all failing FPXX tests for tx39-elf.
[platform/upstream/binutils.git] / binutils / dwarf.c
index 17a608c..84e628a 100644 (file)
@@ -1,6 +1,5 @@
 /* dwarf.c -- display DWARF contents of a BFD binary file
-   Copyright 2005, 2006, 2007, 2008, 2009, 2010
-   Free Software Foundation, Inc.
+   Copyright (C) 2005-2014 Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
 
 #include "sysdep.h"
 #include "libiberty.h"
 #include "bfd.h"
+#include "bfd_stdint.h"
 #include "bucomm.h"
+#include "elfcomm.h"
 #include "elf/common.h"
 #include "dwarf2.h"
 #include "dwarf.h"
+#include "gdb/gdb-index.h"
 
 static const char *regname (unsigned int regno, int row);
 
@@ -55,133 +57,52 @@ int do_debug_frames_interp;
 int do_debug_macinfo;
 int do_debug_str;
 int do_debug_loc;
+int do_gdb_index;
 int do_trace_info;
 int do_trace_abbrevs;
 int do_trace_aranges;
+int do_debug_addr;
+int do_debug_cu_index;
 int do_wide;
 
-/* Values for do_debug_lines.  */
-#define FLAG_DEBUG_LINES_RAW    1
-#define FLAG_DEBUG_LINES_DECODED 2
+int dwarf_cutoff_level = -1;
+unsigned long dwarf_start_die;
 
-dwarf_vma (*byte_get) (unsigned char *, int);
+int dwarf_check = 0;
 
-dwarf_vma
-byte_get_little_endian (unsigned char *field, int size)
-{
-  switch (size)
-    {
-    case 1:
-      return *field;
-
-    case 2:
-      return  ((unsigned int) (field[0]))
-       |    (((unsigned int) (field[1])) << 8);
-
-    case 3:
-      return  ((unsigned long) (field[0]))
-       |    (((unsigned long) (field[1])) << 8)
-       |    (((unsigned long) (field[2])) << 16);
-
-    case 4:
-      return  ((unsigned long) (field[0]))
-       |    (((unsigned long) (field[1])) << 8)
-       |    (((unsigned long) (field[2])) << 16)
-       |    (((unsigned long) (field[3])) << 24);
-
-    case 8:
-      if (sizeof (dwarf_vma) == 8)
-       return  ((dwarf_vma) (field[0]))
-         |    (((dwarf_vma) (field[1])) << 8)
-         |    (((dwarf_vma) (field[2])) << 16)
-         |    (((dwarf_vma) (field[3])) << 24)
-         |    (((dwarf_vma) (field[4])) << 32)
-         |    (((dwarf_vma) (field[5])) << 40)
-         |    (((dwarf_vma) (field[6])) << 48)
-         |    (((dwarf_vma) (field[7])) << 56);
-      else if (sizeof (dwarf_vma) == 4)
-       /* 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 just use the 4 byte extraction code.  */
-       return  ((unsigned long) (field[0]))
-         |    (((unsigned long) (field[1])) << 8)
-         |    (((unsigned long) (field[2])) << 16)
-         |    (((unsigned long) (field[3])) << 24);
+/* Collection of CU/TU section sets from .debug_cu_index and .debug_tu_index
+   sections.  For version 1 package files, each set is stored in SHNDX_POOL
+   as a zero-terminated list of section indexes comprising one set of debug
+   sections from a .dwo file.  */
 
-    default:
-      error (_("Unhandled data length: %d\n"), size);
-      abort ();
-    }
-}
+static int cu_tu_indexes_read = 0;
+static unsigned int *shndx_pool = NULL;
+static unsigned int shndx_pool_size = 0;
+static unsigned int shndx_pool_used = 0;
 
-dwarf_vma
-byte_get_big_endian (unsigned char *field, int size)
+/* For version 2 package files, each set contains an array of section offsets
+   and an array of section sizes, giving the offset and size of the
+   contribution from a CU or TU within one of the debug sections.
+   When displaying debug info from a package file, we need to use these
+   tables to locate the corresponding contributions to each section.  */
+
+struct cu_tu_set
 {
-  switch (size)
-    {
-    case 1:
-      return *field;
-
-    case 2:
-      return ((unsigned int) (field[1])) | (((int) (field[0])) << 8);
-
-    case 3:
-      return ((unsigned long) (field[2]))
-       |   (((unsigned long) (field[1])) << 8)
-       |   (((unsigned long) (field[0])) << 16);
-
-    case 4:
-      return ((unsigned long) (field[3]))
-       |   (((unsigned long) (field[2])) << 8)
-       |   (((unsigned long) (field[1])) << 16)
-       |   (((unsigned long) (field[0])) << 24);
-
-    case 8:
-      if (sizeof (dwarf_vma) == 8)
-       return ((dwarf_vma) (field[7]))
-         |   (((dwarf_vma) (field[6])) << 8)
-         |   (((dwarf_vma) (field[5])) << 16)
-         |   (((dwarf_vma) (field[4])) << 24)
-         |   (((dwarf_vma) (field[3])) << 32)
-         |   (((dwarf_vma) (field[2])) << 40)
-         |   (((dwarf_vma) (field[1])) << 48)
-         |   (((dwarf_vma) (field[0])) << 56);
-      else if (sizeof (dwarf_vma) == 4)
-       {
-         /* Although we are extracing data from an 8 byte wide field,
-            we are returning only 4 bytes of data.  */
-         field += 4;
-         return ((unsigned long) (field[3]))
-           |   (((unsigned long) (field[2])) << 8)
-           |   (((unsigned long) (field[1])) << 16)
-           |   (((unsigned long) (field[0])) << 24);
-       }
+  uint64_t signature;
+  dwarf_vma section_offsets[DW_SECT_MAX];
+  size_t section_sizes[DW_SECT_MAX];
+};
 
-    default:
-      error (_("Unhandled data length: %d\n"), size);
-      abort ();
-    }
-}
+static int cu_count = 0;
+static int tu_count = 0;
+static struct cu_tu_set *cu_sets = NULL;
+static struct cu_tu_set *tu_sets = NULL;
 
-static dwarf_vma
-byte_get_signed (unsigned char *field, int size)
-{
-  dwarf_vma x = byte_get (field, size);
+static void load_cu_tu_indexes (void *file);
 
-  switch (size)
-    {
-    case 1:
-      return (x ^ 0x80) - 0x80;
-    case 2:
-      return (x ^ 0x8000) - 0x8000;
-    case 4:
-      return (x ^ 0x80000000) - 0x80000000;
-    case 8:
-      return x;
-    default:
-      abort ();
-    }
-}
+/* Values for do_debug_lines.  */
+#define FLAG_DEBUG_LINES_RAW    1
+#define FLAG_DEBUG_LINES_DECODED 2
 
 static int
 size_of_encoded_value (int encoding)
@@ -197,73 +118,250 @@ size_of_encoded_value (int encoding)
 }
 
 static dwarf_vma
-get_encoded_value (unsigned char *data, int encoding)
+get_encoded_value (unsigned char **pdata,
+                  int encoding,
+                  struct dwarf_section *section,
+                  unsigned char * end)
 {
+  unsigned char * data = * pdata;
   int size = size_of_encoded_value (encoding);
+  dwarf_vma val;
+
+  if (data + size >= end)
+    {
+      warn (_("Encoded value extends past end of section\n"));
+      * pdata = end;
+      return 0;
+    }
 
   if (encoding & DW_EH_PE_signed)
-    return byte_get_signed (data, size);
+    val = byte_get_signed (data, size);
   else
-    return byte_get (data, size);
-}
+    val = byte_get (data, size);
 
-/* Print a dwarf_vma value (typically an address, offset or length) in
-   hexadecimal format, followed by a space.  The length of the value (and
-   hence the precision displayed) is determined by the byte_size parameter.  */
+  if ((encoding & 0x70) == DW_EH_PE_pcrel)
+    val += section->address + (data - section->start);
 
-static void
-print_dwarf_vma (dwarf_vma val, unsigned byte_size)
-{
-  static char buff[18];
+  * pdata = data + size;
+  return val;
+}
 
-  /* Printf does not have a way of specifiying a maximum field width for an
-     integer value, so we print the full value into a buffer and then select
-     the precision we need.  */
 #if __STDC_VERSION__ >= 199901L || (defined(__GNUC__) && __GNUC__ >= 2)
-#ifndef __MSVCRT__
-  snprintf (buff, sizeof (buff), "%16.16llx ", val);
+#ifndef __MINGW32__
+#define  DWARF_VMA_FMT       "ll"
+#define  DWARF_VMA_FMT_LONG  "%16.16llx"
 #else
-  snprintf (buff, sizeof (buff), "%016I64x ", val);
+#define  DWARF_VMA_FMT       "I64"
+#define  DWARF_VMA_FMT_LONG  "%016I64x"
 #endif
 #else
-  snprintf (buff, sizeof (buff), "%16.16lx ", val);
+#define  DWARF_VMA_FMT       "l"
+#define  DWARF_VMA_FMT_LONG  "%16.16lx"
 #endif
 
-  fputs (buff + (byte_size == 4 ? 8 : 0), stdout);
+/* Convert a dwarf vma value into a string.  Returns a pointer to a static
+   buffer containing the converted VALUE.  The value is converted according
+   to the printf formating character FMTCH.  If NUM_BYTES is non-zero then
+   it specifies the maximum number of bytes to be displayed in the converted
+   value and FMTCH is ignored - hex is always used.  */
+
+static const char *
+dwarf_vmatoa_1 (const char *fmtch, dwarf_vma value, unsigned num_bytes)
+{
+  /* As dwarf_vmatoa is used more then once in a printf call
+     for output, we are cycling through an fixed array of pointers
+     for return address.  */
+  static int buf_pos = 0;
+  static struct dwarf_vmatoa_buf
+  {
+    char place[64];
+  } buf[16];
+  char *ret;
+
+  ret = buf[buf_pos++].place;
+  buf_pos %= ARRAY_SIZE (buf);
+
+  if (num_bytes)
+    {
+      /* Printf does not have a way of specifiying a maximum field width for an
+        integer value, so we print the full value into a buffer and then select
+        the precision we need.  */
+      snprintf (ret, sizeof (buf[0].place), DWARF_VMA_FMT_LONG, value);
+      if (num_bytes > 8)
+       num_bytes = 8;
+      return ret + (16 - 2 * num_bytes);
+    }
+  else
+    {
+      char fmt[32];
+
+      sprintf (fmt, "%%%s%s", DWARF_VMA_FMT, fmtch);
+      snprintf (ret, sizeof (buf[0].place), fmt, value);
+      return ret;
+    }
+}
+
+static inline const char *
+dwarf_vmatoa (const char * fmtch, dwarf_vma value)
+{
+  return dwarf_vmatoa_1 (fmtch, value, 0);
+}
+
+/* Print a dwarf_vma value (typically an address, offset or length) in
+   hexadecimal format, followed by a space.  The length of the VALUE (and
+   hence the precision displayed) is determined by the NUM_BYTES parameter.  */
+
+static void
+print_dwarf_vma (dwarf_vma value, unsigned num_bytes)
+{
+  printf ("%s ", dwarf_vmatoa_1 (NULL, value, num_bytes));
+}
+
+/* Format a 64-bit value, given as two 32-bit values, in hex.
+   For reentrancy, this uses a buffer provided by the caller.  */
+
+static const char *
+dwarf_vmatoa64 (dwarf_vma hvalue, dwarf_vma lvalue, char *buf,
+               unsigned int buf_len)
+{
+  int len = 0;
+
+  if (hvalue == 0)
+    snprintf (buf, buf_len, "%" DWARF_VMA_FMT "x", lvalue);
+  else
+    {
+      len = snprintf (buf, buf_len, "%" DWARF_VMA_FMT "x", hvalue);
+      snprintf (buf + len, buf_len - len,
+               "%08" DWARF_VMA_FMT "x", lvalue);
+    }
+
+  return buf;
 }
 
-unsigned long int
-read_leb128 (unsigned char *data, unsigned int *length_return, int sign)
+/* Read in a LEB128 encoded value starting at address DATA.
+   If SIGN is true, return a signed LEB128 value.
+   If LENGTH_RETURN is not NULL, return in it the number of bytes read.
+   No bytes will be read at address END or beyond.  */
+
+dwarf_vma
+read_leb128 (unsigned char *data,
+            unsigned int *length_return,
+            bfd_boolean sign,
+            const unsigned char * const end)
 {
-  unsigned long int result = 0;
+  dwarf_vma result = 0;
   unsigned int num_read = 0;
   unsigned int shift = 0;
-  unsigned char byte;
+  unsigned char byte = 0;
 
-  do
+  while (data < end)
     {
       byte = *data++;
       num_read++;
 
-      result |= ((unsigned long int) (byte & 0x7f)) << shift;
+      result |= ((dwarf_vma) (byte & 0x7f)) << shift;
 
       shift += 7;
-
+      if ((byte & 0x80) == 0)
+       break;
     }
-  while (byte & 0x80);
 
   if (length_return != NULL)
     *length_return = num_read;
 
   if (sign && (shift < 8 * sizeof (result)) && (byte & 0x40))
-    result |= -1L << shift;
+    result |= (dwarf_vma) -1 << shift;
 
   return result;
 }
 
+/* Create a signed version to avoid painful typecasts.  */
+static inline dwarf_signed_vma
+read_sleb128 (unsigned char * data,
+             unsigned int *  length_return,
+             const unsigned char * const end)
+{
+  return (dwarf_signed_vma) read_leb128 (data, length_return, TRUE, end);
+}
+
+static inline dwarf_vma
+read_uleb128 (unsigned char * data,
+             unsigned int *  length_return,
+             const unsigned char * const end)
+{
+  return read_leb128 (data, length_return, FALSE, end);
+}
+
+#define SAFE_BYTE_GET(VAL, PTR, AMOUNT, END)   \
+  do                                           \
+    {                                          \
+      int dummy [sizeof (VAL) < (AMOUNT) ? -1 : 1] ATTRIBUTE_UNUSED ; \
+      unsigned int amount = (AMOUNT);          \
+      if (((PTR) + amount) >= (END))           \
+       {                                       \
+         if ((PTR) < (END))                    \
+           amount = (END) - (PTR);             \
+         else                                  \
+           amount = 0;                         \
+       }                                       \
+      if (amount)                              \
+       VAL = byte_get ((PTR), amount);         \
+      else                                     \
+       VAL = 0;                                \
+    }                                          \
+  while (0)
+
+#define SAFE_BYTE_GET_AND_INC(VAL, PTR, AMOUNT, END)   \
+  do                                                   \
+    {                                                  \
+      SAFE_BYTE_GET (VAL, PTR, AMOUNT, END);           \
+      PTR += AMOUNT;                                   \
+    }                                                  \
+  while (0)
+
+#define SAFE_SIGNED_BYTE_GET(VAL, PTR, AMOUNT, END)    \
+  do                                                   \
+    {                                                  \
+      unsigned int amount = (AMOUNT);                  \
+      if (((PTR) + amount) >= (END))                   \
+       {                                               \
+         if ((PTR) < (END))                            \
+           amount = (END) - (PTR);                     \
+         else                                          \
+           amount = 0;                                 \
+       }                                               \
+      if (amount)                                      \
+       VAL = byte_get_signed ((PTR), amount);          \
+      else                                             \
+       VAL = 0;                                        \
+    }                                                  \
+  while (0)
+
+#define SAFE_SIGNED_BYTE_GET_AND_INC(VAL, PTR, AMOUNT, END)    \
+  do                                                           \
+    {                                                          \
+      SAFE_SIGNED_BYTE_GET (VAL, PTR, AMOUNT, END);            \
+      PTR += AMOUNT;                                           \
+    }                                                          \
+  while (0)
+
+#define SAFE_BYTE_GET64(PTR, HIGH, LOW, END)           \
+  do                                                   \
+    {                                                  \
+      if (((PTR) + 8) <= (END))                                \
+       {                                               \
+         byte_get_64 ((PTR), (HIGH), (LOW));           \
+       }                                               \
+      else                                             \
+       {                                               \
+         * (LOW) = * (HIGH) = 0;                       \
+       }                                               \
+    }                                                  \
+  while (0)
+
 typedef struct State_Machine_Registers
 {
-  unsigned long address;
+  dwarf_vma address;
   unsigned int file;
   unsigned int line;
   unsigned int column;
@@ -296,20 +394,23 @@ reset_state_machine (int is_stmt)
    Returns the number of bytes read.  */
 
 static int
-process_extended_line_op (unsigned char *data, int is_stmt)
+process_extended_line_op (unsigned char * data,
+                         int is_stmt,
+                         unsigned char * end)
 {
   unsigned char op_code;
   unsigned int bytes_read;
   unsigned int len;
   unsigned char *name;
-  unsigned long adr;
+  unsigned char *orig_data = data;
+  dwarf_vma adr;
 
-  len = read_leb128 (data, & bytes_read, 0);
+  len = read_uleb128 (data, & bytes_read, end);
   data += bytes_read;
 
-  if (len == 0)
+  if (len == 0 || data == end)
     {
-      warn (_("badly formed extended line op encountered!\n"));
+      warn (_("Badly formed extended line op encountered!\n"));
       return bytes_read;
     }
 
@@ -326,30 +427,34 @@ process_extended_line_op (unsigned char *data, int is_stmt)
       break;
 
     case DW_LNE_set_address:
-      adr = byte_get (data, len - bytes_read - 1);
-      printf (_("set Address to 0x%lx\n"), adr);
+      SAFE_BYTE_GET (adr, data, len - bytes_read - 1, end);
+      printf (_("set Address to 0x%s\n"), dwarf_vmatoa ("x", adr));
       state_machine_regs.address = adr;
       state_machine_regs.op_index = 0;
       break;
 
     case DW_LNE_define_file:
-      printf (_("  define new File Table entry\n"));
+      printf (_("define new File Table entry\n"));
       printf (_("  Entry\tDir\tTime\tSize\tName\n"));
+      printf ("   %d\t", ++state_machine_regs.last_file_entry);
 
-      printf (_("   %d\t"), ++state_machine_regs.last_file_entry);
       name = data;
-      data += strlen ((char *) data) + 1;
-      printf (_("%lu\t"), read_leb128 (data, & bytes_read, 0));
+      data += strnlen ((char *) data, end - data) + 1;
+      printf ("%s\t", dwarf_vmatoa ("u", read_uleb128 (data, & bytes_read, end)));
       data += bytes_read;
-      printf (_("%lu\t"), read_leb128 (data, & bytes_read, 0));
+      printf ("%s\t", dwarf_vmatoa ("u", read_uleb128 (data, & bytes_read, end)));
       data += bytes_read;
-      printf (_("%lu\t"), read_leb128 (data, & bytes_read, 0));
-      printf (_("%s\n\n"), name);
+      printf ("%s\t", dwarf_vmatoa ("u", read_uleb128 (data, & bytes_read, end)));
+      data += bytes_read;
+      printf ("%s\n\n", name);
+
+      if (((unsigned int) (data - orig_data) != len) || data == end)
+        warn (_("DW_LNE_define_file: Bad opcode length\n"));
       break;
 
     case DW_LNE_set_discriminator:
-      printf (_("set Discriminator to %lu\n"),
-              read_leb128 (data, & bytes_read, 0));
+      printf (_("set Discriminator to %s\n"),
+             dwarf_vmatoa ("u", read_uleb128 (data, & bytes_read, end)));
       break;
 
     /* HP extensions.  */
@@ -383,41 +488,154 @@ process_extended_line_op (unsigned char *data, int is_stmt)
     case DW_LNE_HP_define_proc:
       printf ("DW_LNE_HP_define_proc\n");
       break;
+    case DW_LNE_HP_source_file_correlation:
+      {
+        unsigned char *edata = data + len - bytes_read - 1;
+
+        printf ("DW_LNE_HP_source_file_correlation\n");
+
+        while (data < edata)
+          {
+            unsigned int opc;
+
+            opc = read_uleb128 (data, & bytes_read, edata);
+            data += bytes_read;
+
+            switch (opc)
+              {
+              case DW_LNE_HP_SFC_formfeed:
+                printf ("    DW_LNE_HP_SFC_formfeed\n");
+                break;
+              case DW_LNE_HP_SFC_set_listing_line:
+                printf ("    DW_LNE_HP_SFC_set_listing_line (%s)\n",
+                        dwarf_vmatoa ("u",
+                                      read_uleb128 (data, & bytes_read, edata)));
+                data += bytes_read;
+                break;
+              case DW_LNE_HP_SFC_associate:
+                printf ("    DW_LNE_HP_SFC_associate ");
+                printf ("(%s",
+                        dwarf_vmatoa ("u",
+                                      read_uleb128 (data, & bytes_read, edata)));
+                data += bytes_read;
+                printf (",%s",
+                        dwarf_vmatoa ("u",
+                                      read_uleb128 (data, & bytes_read, edata)));
+                data += bytes_read;
+                printf (",%s)\n",
+                        dwarf_vmatoa ("u",
+                                      read_uleb128 (data, & bytes_read, edata)));
+                data += bytes_read;
+                break;
+              default:
+                printf (_("    UNKNOWN DW_LNE_HP_SFC opcode (%u)\n"), opc);
+                data = edata;
+                break;
+              }
+          }
+      }
+      break;
 
     default:
-      if (op_code >= DW_LNE_lo_user
-         /* The test against DW_LNW_hi_user is redundant due to
-            the limited range of the unsigned char data type used
-            for op_code.  */
-         /*&& op_code <= DW_LNE_hi_user*/)
-       printf (_("user defined: length %d\n"), len - bytes_read);
-      else
-       printf (_("UNKNOWN: length %d\n"), len - bytes_read);
+      {
+        unsigned int rlen = len - bytes_read - 1;
+
+        if (op_code >= DW_LNE_lo_user
+            /* The test against DW_LNW_hi_user is redundant due to
+               the limited range of the unsigned char data type used
+               for op_code.  */
+            /*&& op_code <= DW_LNE_hi_user*/)
+          printf (_("user defined: "));
+        else
+          printf (_("UNKNOWN: "));
+        printf (_("length %d ["), rlen);
+        for (; rlen; rlen--)
+          printf (" %02x", *data++);
+        printf ("]\n");
+      }
       break;
     }
 
   return len;
 }
 
-static const char *
-fetch_indirect_string (unsigned long offset)
+static const unsigned char *
+fetch_indirect_string (dwarf_vma offset)
 {
   struct dwarf_section *section = &debug_displays [str].section;
 
   if (section->start == NULL)
-    return _("<no .debug_str section>");
+    return (const unsigned char *) _("<no .debug_str section>");
 
-  /* DWARF sections under Mach-O have non-zero addresses.  */
-  offset -= section->address;
   if (offset > section->size)
     {
-      warn (_("DW_FORM_strp offset too big: %lx\n"), offset);
-      return _("<offset is too big>");
+      warn (_("DW_FORM_strp offset too big: %s\n"),
+           dwarf_vmatoa ("x", offset));
+      return (const unsigned char *) _("<offset is too big>");
+    }
+
+  return (const unsigned char *) section->start + offset;
+}
+
+static const char *
+fetch_indexed_string (dwarf_vma idx, struct cu_tu_set *this_set,
+                     dwarf_vma offset_size, int dwo)
+{
+  enum dwarf_section_display_enum str_sec_idx = dwo ? str_dwo : str;
+  enum dwarf_section_display_enum idx_sec_idx = dwo ? str_index_dwo : str_index;
+  struct dwarf_section *index_section = &debug_displays [idx_sec_idx].section;
+  struct dwarf_section *str_section = &debug_displays [str_sec_idx].section;
+  dwarf_vma index_offset = idx * offset_size;
+  dwarf_vma str_offset;
+
+  if (index_section->start == NULL)
+    return (dwo ? _("<no .debug_str_offsets.dwo section>")
+               : _("<no .debug_str_offsets section>"));
+
+  if (this_set != NULL)
+    index_offset += this_set->section_offsets [DW_SECT_STR_OFFSETS];
+  if (index_offset > index_section->size)
+    {
+      warn (_("DW_FORM_GNU_str_index offset too big: %s\n"),
+           dwarf_vmatoa ("x", index_offset));
+      return _("<index offset is too big>");
+    }
+
+  if (str_section->start == NULL)
+    return (dwo ? _("<no .debug_str.dwo section>")
+               : _("<no .debug_str section>"));
+
+  str_offset = byte_get (index_section->start + index_offset, offset_size);
+  str_offset -= str_section->address;
+  if (str_offset > str_section->size)
+    {
+      warn (_("DW_FORM_GNU_str_index indirect offset too big: %s\n"),
+           dwarf_vmatoa ("x", str_offset));
+      return _("<indirect index offset is too big>");
+    }
+
+  return (const char *) str_section->start + str_offset;
+}
+
+static const char *
+fetch_indexed_value (dwarf_vma offset, dwarf_vma bytes)
+{
+  struct dwarf_section *section = &debug_displays [debug_addr].section;
+
+  if (section->start == NULL)
+    return (_("<no .debug_addr section>"));
+
+  if (offset + bytes > section->size)
+    {
+      warn (_("Offset into section %s too big: %s\n"),
+            section->name, dwarf_vmatoa ("x", offset));
+      return "<offset too big>";
     }
 
-  return (const char *) section->start + offset;
+  return dwarf_vmatoa ("x", byte_get (section->start + offset, bytes));
 }
 
+
 /* FIXME:  There are better and more efficient ways to handle
    these structures.  For now though, I just want something that
    is simple to implement.  */
@@ -474,7 +692,6 @@ add_abbrev (unsigned long number, unsigned long tag, int children)
   abbrev_entry *entry;
 
   entry = (abbrev_entry *) malloc (sizeof (*entry));
-
   if (entry == NULL)
     /* ugg */
     return;
@@ -500,7 +717,6 @@ add_abbrev_attr (unsigned long attribute, unsigned long form)
   abbrev_attr *attr;
 
   attr = (abbrev_attr *) malloc (sizeof (*attr));
-
   if (attr == NULL)
     /* ugg */
     return;
@@ -536,17 +752,21 @@ process_abbrev_section (unsigned char *start, unsigned char *end)
       unsigned long attribute;
       int children;
 
-      entry = read_leb128 (start, & bytes_read, 0);
+      entry = read_uleb128 (start, & bytes_read, end);
       start += bytes_read;
 
       /* A single zero is supposed to end the section according
         to the standard.  If there's more, then signal that to
         the caller.  */
+      if (start == end)
+       return NULL;
       if (entry == 0)
-       return start == end ? NULL : start;
+       return start;
 
-      tag = read_leb128 (start, & bytes_read, 0);
+      tag = read_uleb128 (start, & bytes_read, end);
       start += bytes_read;
+      if (start == end)
+       return NULL;
 
       children = *start++;
 
@@ -556,152 +776,74 @@ process_abbrev_section (unsigned char *start, unsigned char *end)
        {
          unsigned long form;
 
-         attribute = read_leb128 (start, & bytes_read, 0);
+         attribute = read_uleb128 (start, & bytes_read, end);
          start += bytes_read;
+         if (start == end)
+           break;
 
-         form = read_leb128 (start, & bytes_read, 0);
+         form = read_uleb128 (start, & bytes_read, end);
          start += bytes_read;
+         if (start == end)
+           break;
 
-         if (attribute != 0)
-           add_abbrev_attr (attribute, form);
+         add_abbrev_attr (attribute, form);
        }
       while (attribute != 0);
     }
 
+  /* Report the missing single zero which ends the section.  */
+  error (_(".debug_abbrev section not zero terminated\n"));
+
   return NULL;
 }
 
-static char *
+static const char *
 get_TAG_name (unsigned long tag)
 {
-  switch (tag)
+  const char *name = get_DW_TAG_name ((unsigned int)tag);
+
+  if (name == NULL)
     {
-    case DW_TAG_padding:               return "DW_TAG_padding";
-    case DW_TAG_array_type:            return "DW_TAG_array_type";
-    case DW_TAG_class_type:            return "DW_TAG_class_type";
-    case DW_TAG_entry_point:           return "DW_TAG_entry_point";
-    case DW_TAG_enumeration_type:      return "DW_TAG_enumeration_type";
-    case DW_TAG_formal_parameter:      return "DW_TAG_formal_parameter";
-    case DW_TAG_imported_declaration:  return "DW_TAG_imported_declaration";
-    case DW_TAG_label:                 return "DW_TAG_label";
-    case DW_TAG_lexical_block:         return "DW_TAG_lexical_block";
-    case DW_TAG_member:                        return "DW_TAG_member";
-    case DW_TAG_pointer_type:          return "DW_TAG_pointer_type";
-    case DW_TAG_reference_type:                return "DW_TAG_reference_type";
-    case DW_TAG_compile_unit:          return "DW_TAG_compile_unit";
-    case DW_TAG_string_type:           return "DW_TAG_string_type";
-    case DW_TAG_structure_type:                return "DW_TAG_structure_type";
-    case DW_TAG_subroutine_type:       return "DW_TAG_subroutine_type";
-    case DW_TAG_typedef:               return "DW_TAG_typedef";
-    case DW_TAG_union_type:            return "DW_TAG_union_type";
-    case DW_TAG_unspecified_parameters: return "DW_TAG_unspecified_parameters";
-    case DW_TAG_variant:               return "DW_TAG_variant";
-    case DW_TAG_common_block:          return "DW_TAG_common_block";
-    case DW_TAG_common_inclusion:      return "DW_TAG_common_inclusion";
-    case DW_TAG_inheritance:           return "DW_TAG_inheritance";
-    case DW_TAG_inlined_subroutine:    return "DW_TAG_inlined_subroutine";
-    case DW_TAG_module:                        return "DW_TAG_module";
-    case DW_TAG_ptr_to_member_type:    return "DW_TAG_ptr_to_member_type";
-    case DW_TAG_set_type:              return "DW_TAG_set_type";
-    case DW_TAG_subrange_type:         return "DW_TAG_subrange_type";
-    case DW_TAG_with_stmt:             return "DW_TAG_with_stmt";
-    case DW_TAG_access_declaration:    return "DW_TAG_access_declaration";
-    case DW_TAG_base_type:             return "DW_TAG_base_type";
-    case DW_TAG_catch_block:           return "DW_TAG_catch_block";
-    case DW_TAG_const_type:            return "DW_TAG_const_type";
-    case DW_TAG_constant:              return "DW_TAG_constant";
-    case DW_TAG_enumerator:            return "DW_TAG_enumerator";
-    case DW_TAG_file_type:             return "DW_TAG_file_type";
-    case DW_TAG_friend:                        return "DW_TAG_friend";
-    case DW_TAG_namelist:              return "DW_TAG_namelist";
-    case DW_TAG_namelist_item:         return "DW_TAG_namelist_item";
-    case DW_TAG_packed_type:           return "DW_TAG_packed_type";
-    case DW_TAG_subprogram:            return "DW_TAG_subprogram";
-    case DW_TAG_template_type_param:   return "DW_TAG_template_type_param";
-    case DW_TAG_template_value_param:  return "DW_TAG_template_value_param";
-    case DW_TAG_thrown_type:           return "DW_TAG_thrown_type";
-    case DW_TAG_try_block:             return "DW_TAG_try_block";
-    case DW_TAG_variant_part:          return "DW_TAG_variant_part";
-    case DW_TAG_variable:              return "DW_TAG_variable";
-    case DW_TAG_volatile_type:         return "DW_TAG_volatile_type";
-    case DW_TAG_MIPS_loop:             return "DW_TAG_MIPS_loop";
-    case DW_TAG_format_label:          return "DW_TAG_format_label";
-    case DW_TAG_function_template:     return "DW_TAG_function_template";
-    case DW_TAG_class_template:                return "DW_TAG_class_template";
-      /* DWARF 2.1 values.  */
-    case DW_TAG_dwarf_procedure:       return "DW_TAG_dwarf_procedure";
-    case DW_TAG_restrict_type:         return "DW_TAG_restrict_type";
-    case DW_TAG_interface_type:                return "DW_TAG_interface_type";
-    case DW_TAG_namespace:             return "DW_TAG_namespace";
-    case DW_TAG_imported_module:       return "DW_TAG_imported_module";
-    case DW_TAG_unspecified_type:      return "DW_TAG_unspecified_type";
-    case DW_TAG_partial_unit:          return "DW_TAG_partial_unit";
-    case DW_TAG_imported_unit:         return "DW_TAG_imported_unit";
-    case DW_TAG_condition:             return "DW_TAG_condition";
-    case DW_TAG_shared_type:           return "DW_TAG_shared_type";
-      /* DWARF 4 values.  */
-    case DW_TAG_type_unit:             return "DW_TAG_type_unit";
-    case DW_TAG_rvalue_reference_type: return "DW_TAG_rvalue_reference_type";
-    case DW_TAG_template_alias:                return "DW_TAG_template_alias";
-      /* UPC values.  */
-    case DW_TAG_upc_shared_type:       return "DW_TAG_upc_shared_type";
-    case DW_TAG_upc_strict_type:       return "DW_TAG_upc_strict_type";
-    case DW_TAG_upc_relaxed_type:      return "DW_TAG_upc_relaxed_type";
-    default:
-      {
-       static char buffer[100];
+      static char buffer[100];
 
-       snprintf (buffer, sizeof (buffer), _("Unknown TAG value: %lx"), tag);
-       return buffer;
-      }
+      snprintf (buffer, sizeof (buffer), _("Unknown TAG value: %lx"), tag);
+      return buffer;
     }
+
+  return name;
 }
 
-static char *
+static const char *
 get_FORM_name (unsigned long form)
 {
-  switch (form)
+  const char *name;
+
+  if (form == 0)
+    return "DW_FORM value: 0";
+
+  name = get_DW_FORM_name (form);
+  if (name == NULL)
     {
-    case DW_FORM_addr:         return "DW_FORM_addr";
-    case DW_FORM_block2:       return "DW_FORM_block2";
-    case DW_FORM_block4:       return "DW_FORM_block4";
-    case DW_FORM_data2:                return "DW_FORM_data2";
-    case DW_FORM_data4:                return "DW_FORM_data4";
-    case DW_FORM_data8:                return "DW_FORM_data8";
-    case DW_FORM_string:       return "DW_FORM_string";
-    case DW_FORM_block:                return "DW_FORM_block";
-    case DW_FORM_block1:       return "DW_FORM_block1";
-    case DW_FORM_data1:                return "DW_FORM_data1";
-    case DW_FORM_flag:         return "DW_FORM_flag";
-    case DW_FORM_sdata:                return "DW_FORM_sdata";
-    case DW_FORM_strp:         return "DW_FORM_strp";
-    case DW_FORM_udata:                return "DW_FORM_udata";
-    case DW_FORM_ref_addr:     return "DW_FORM_ref_addr";
-    case DW_FORM_ref1:         return "DW_FORM_ref1";
-    case DW_FORM_ref2:         return "DW_FORM_ref2";
-    case DW_FORM_ref4:         return "DW_FORM_ref4";
-    case DW_FORM_ref8:         return "DW_FORM_ref8";
-    case DW_FORM_ref_udata:    return "DW_FORM_ref_udata";
-    case DW_FORM_indirect:     return "DW_FORM_indirect";
-      /* DWARF 4 values.  */
-    case DW_FORM_sec_offset:   return "DW_FORM_sec_offset";
-    case DW_FORM_exprloc:      return "DW_FORM_exprloc";
-    case DW_FORM_flag_present: return "DW_FORM_flag_present";
-    case DW_FORM_ref_sig8:     return "DW_FORM_ref_sig8";
-    default:
-      {
-       static char buffer[100];
+      static char buffer[100];
 
-       snprintf (buffer, sizeof (buffer), _("Unknown FORM value: %lx"), form);
-       return buffer;
-      }
+      snprintf (buffer, sizeof (buffer), _("Unknown FORM value: %lx"), form);
+      return buffer;
     }
+
+  return name;
 }
 
 static unsigned char *
-display_block (unsigned char *data, unsigned long length)
+display_block (unsigned char *data,
+              dwarf_vma length,
+              const unsigned char * const end)
 {
-  printf (_(" %lu byte block: "), length);
+  dwarf_vma maxlen;
+
+  printf (_(" %s byte block: "), dwarf_vmatoa ("u", length));
+
+  maxlen = (dwarf_vma) (end - data);
+  length = length > maxlen ? maxlen : length;
 
   while (length --)
     printf ("%lx ", (unsigned long) byte_get (data++, 1));
@@ -714,13 +856,14 @@ decode_location_expression (unsigned char * data,
                            unsigned int pointer_size,
                            unsigned int offset_size,
                            int dwarf_version,
-                           unsigned long length,
-                           unsigned long cu_offset,
+                           dwarf_vma length,
+                           dwarf_vma cu_offset,
                            struct dwarf_section * section)
 {
   unsigned op;
   unsigned int bytes_read;
-  unsigned long uvalue;
+  dwarf_vma uvalue;
+  dwarf_signed_vma svalue;
   unsigned char *end = data + length;
   int need_frame_base = 0;
 
@@ -731,51 +874,56 @@ decode_location_expression (unsigned char * data,
       switch (op)
        {
        case DW_OP_addr:
-         printf ("DW_OP_addr: %lx",
-                 (unsigned long) byte_get (data, pointer_size));
-         data += pointer_size;
+         SAFE_BYTE_GET_AND_INC (uvalue, data, pointer_size, end);
+         printf ("DW_OP_addr: %s", dwarf_vmatoa ("x", uvalue));
          break;
        case DW_OP_deref:
          printf ("DW_OP_deref");
          break;
        case DW_OP_const1u:
-         printf ("DW_OP_const1u: %lu", (unsigned long) byte_get (data++, 1));
+         SAFE_BYTE_GET_AND_INC (uvalue, data, 1, end);
+         printf ("DW_OP_const1u: %lu", (unsigned long) uvalue);
          break;
        case DW_OP_const1s:
-         printf ("DW_OP_const1s: %ld", (long) byte_get_signed (data++, 1));
+         SAFE_SIGNED_BYTE_GET_AND_INC (svalue, data, 1, end);
+         printf ("DW_OP_const1s: %ld", (long) svalue);
          break;
        case DW_OP_const2u:
-         printf ("DW_OP_const2u: %lu", (unsigned long) byte_get (data, 2));
-         data += 2;
+         SAFE_BYTE_GET_AND_INC (uvalue, data, 2, end);
+         printf ("DW_OP_const2u: %lu", (unsigned long) uvalue);
          break;
        case DW_OP_const2s:
-         printf ("DW_OP_const2s: %ld", (long) byte_get_signed (data, 2));
-         data += 2;
+         SAFE_SIGNED_BYTE_GET_AND_INC (svalue, data, 2, end);
+         printf ("DW_OP_const2s: %ld", (long) svalue);
          break;
        case DW_OP_const4u:
-         printf ("DW_OP_const4u: %lu", (unsigned long) byte_get (data, 4));
-         data += 4;
+         SAFE_BYTE_GET_AND_INC (uvalue, data, 4, end);
+         printf ("DW_OP_const4u: %lu", (unsigned long) uvalue);
          break;
        case DW_OP_const4s:
-         printf ("DW_OP_const4s: %ld", (long) byte_get_signed (data, 4));
-         data += 4;
+         SAFE_SIGNED_BYTE_GET_AND_INC (svalue, data, 4, end);
+         printf ("DW_OP_const4s: %ld", (long) svalue);
          break;
        case DW_OP_const8u:
-         printf ("DW_OP_const8u: %lu %lu", (unsigned long) byte_get (data, 4),
-                 (unsigned long) byte_get (data + 4, 4));
-         data += 8;
+         SAFE_BYTE_GET_AND_INC (uvalue, data, 4, end);
+         printf ("DW_OP_const8u: %lu ", (unsigned long) uvalue);
+         SAFE_BYTE_GET_AND_INC (uvalue, data, 4, end);
+         printf ("%lu", (unsigned long) uvalue);
          break;
        case DW_OP_const8s:
-         printf ("DW_OP_const8s: %ld %ld", (long) byte_get (data, 4),
-                 (long) byte_get (data + 4, 4));
-         data += 8;
+         SAFE_SIGNED_BYTE_GET_AND_INC (svalue, data, 4, end);
+         printf ("DW_OP_const8s: %ld ", (long) svalue);
+         SAFE_SIGNED_BYTE_GET_AND_INC (svalue, data, 4, end);
+         printf ("%ld", (long) svalue);
          break;
        case DW_OP_constu:
-         printf ("DW_OP_constu: %lu", read_leb128 (data, &bytes_read, 0));
+         printf ("DW_OP_constu: %s",
+                 dwarf_vmatoa ("u", read_uleb128 (data, &bytes_read, end)));
          data += bytes_read;
          break;
        case DW_OP_consts:
-         printf ("DW_OP_consts: %ld", read_leb128 (data, &bytes_read, 1));
+         printf ("DW_OP_consts: %s",
+                 dwarf_vmatoa ("d", read_sleb128 (data, &bytes_read, end)));
          data += bytes_read;
          break;
        case DW_OP_dup:
@@ -788,7 +936,8 @@ decode_location_expression (unsigned char * data,
          printf ("DW_OP_over");
          break;
        case DW_OP_pick:
-         printf ("DW_OP_pick: %ld", (unsigned long) byte_get (data++, 1));
+         SAFE_BYTE_GET_AND_INC (uvalue, data, 1, end);
+         printf ("DW_OP_pick: %ld", (unsigned long) uvalue);
          break;
        case DW_OP_swap:
          printf ("DW_OP_swap");
@@ -830,8 +979,8 @@ decode_location_expression (unsigned char * data,
          printf ("DW_OP_plus");
          break;
        case DW_OP_plus_uconst:
-         printf ("DW_OP_plus_uconst: %lu",
-                 read_leb128 (data, &bytes_read, 0));
+         printf ("DW_OP_plus_uconst: %s",
+                 dwarf_vmatoa ("u", read_uleb128 (data, &bytes_read, end)));
          data += bytes_read;
          break;
        case DW_OP_shl:
@@ -847,8 +996,8 @@ decode_location_expression (unsigned char * data,
          printf ("DW_OP_xor");
          break;
        case DW_OP_bra:
-         printf ("DW_OP_bra: %ld", (long) byte_get_signed (data, 2));
-         data += 2;
+         SAFE_SIGNED_BYTE_GET_AND_INC (svalue, data, 2, end);
+         printf ("DW_OP_bra: %ld", (long) svalue);
          break;
        case DW_OP_eq:
          printf ("DW_OP_eq");
@@ -869,8 +1018,8 @@ decode_location_expression (unsigned char * data,
          printf ("DW_OP_ne");
          break;
        case DW_OP_skip:
-         printf ("DW_OP_skip: %ld", (long) byte_get_signed (data, 2));
-         data += 2;
+         SAFE_SIGNED_BYTE_GET_AND_INC (svalue, data, 2, end);
+         printf ("DW_OP_skip: %ld", (long) svalue);
          break;
 
        case DW_OP_lit0:
@@ -976,38 +1125,45 @@ decode_location_expression (unsigned char * data,
        case DW_OP_breg29:
        case DW_OP_breg30:
        case DW_OP_breg31:
-         printf ("DW_OP_breg%d (%s): %ld", op - DW_OP_breg0,
+         printf ("DW_OP_breg%d (%s): %s",
+                 op - DW_OP_breg0,
                  regname (op - DW_OP_breg0, 1),
-                 read_leb128 (data, &bytes_read, 1));
+                 dwarf_vmatoa ("d", read_sleb128 (data, &bytes_read, end)));
          data += bytes_read;
          break;
 
        case DW_OP_regx:
-         uvalue = read_leb128 (data, &bytes_read, 0);
+         uvalue = read_uleb128 (data, &bytes_read, end);
          data += bytes_read;
-         printf ("DW_OP_regx: %lu (%s)", uvalue, regname (uvalue, 1));
+         printf ("DW_OP_regx: %s (%s)",
+                 dwarf_vmatoa ("u", uvalue), regname (uvalue, 1));
          break;
        case DW_OP_fbreg:
          need_frame_base = 1;
-         printf ("DW_OP_fbreg: %ld", read_leb128 (data, &bytes_read, 1));
+         printf ("DW_OP_fbreg: %s",
+                 dwarf_vmatoa ("d", read_sleb128 (data, &bytes_read, end)));
          data += bytes_read;
          break;
        case DW_OP_bregx:
-         uvalue = read_leb128 (data, &bytes_read, 0);
+         uvalue = read_uleb128 (data, &bytes_read, end);
          data += bytes_read;
-         printf ("DW_OP_bregx: %lu (%s) %ld", uvalue, regname (uvalue, 1),
-                 read_leb128 (data, &bytes_read, 1));
+         printf ("DW_OP_bregx: %s (%s) %s",
+                 dwarf_vmatoa ("u", uvalue), regname (uvalue, 1),
+                 dwarf_vmatoa ("d", read_sleb128 (data, &bytes_read, end)));
          data += bytes_read;
          break;
        case DW_OP_piece:
-         printf ("DW_OP_piece: %lu", read_leb128 (data, &bytes_read, 0));
+         printf ("DW_OP_piece: %s",
+                 dwarf_vmatoa ("u", read_uleb128 (data, &bytes_read, end)));
          data += bytes_read;
          break;
        case DW_OP_deref_size:
-         printf ("DW_OP_deref_size: %ld", (long) byte_get (data++, 1));
+         SAFE_BYTE_GET_AND_INC (uvalue, data, 1, end);
+         printf ("DW_OP_deref_size: %ld", (long) uvalue);
          break;
        case DW_OP_xderef_size:
-         printf ("DW_OP_xderef_size: %ld", (long) byte_get (data++, 1));
+         SAFE_BYTE_GET_AND_INC (uvalue, data, 1, end);
+         printf ("DW_OP_xderef_size: %ld", (long) uvalue);
          break;
        case DW_OP_nop:
          printf ("DW_OP_nop");
@@ -1020,14 +1176,16 @@ decode_location_expression (unsigned char * data,
        case DW_OP_call2:
          /* XXX: Strictly speaking for 64-bit DWARF3 files
             this ought to be an 8-byte wide computation.  */
-         printf ("DW_OP_call2: <0x%lx>", (long) byte_get (data, 2) + cu_offset);
-         data += 2;
+         SAFE_SIGNED_BYTE_GET_AND_INC (svalue, data, 2, end);
+         printf ("DW_OP_call2: <0x%s>",
+                 dwarf_vmatoa ("x", svalue + cu_offset));
          break;
        case DW_OP_call4:
          /* XXX: Strictly speaking for 64-bit DWARF3 files
             this ought to be an 8-byte wide computation.  */
-         printf ("DW_OP_call4: <0x%lx>", (long) byte_get (data, 4) + cu_offset);
-         data += 4;
+         SAFE_SIGNED_BYTE_GET_AND_INC (svalue, data, 4, end);
+         printf ("DW_OP_call4: <0x%s>",
+                 dwarf_vmatoa ("x", svalue + cu_offset));
          break;
        case DW_OP_call_ref:
          /* XXX: Strictly speaking for 64-bit DWARF3 files
@@ -1040,16 +1198,13 @@ decode_location_expression (unsigned char * data,
            }
          if (dwarf_version == 2)
            {
-             printf ("DW_OP_call_ref: <0x%lx>",
-                     (long) byte_get (data, pointer_size));
-             data += pointer_size;
+             SAFE_BYTE_GET_AND_INC (uvalue, data, pointer_size, end);
            }
          else
            {
-             printf ("DW_OP_call_ref: <0x%lx>",
-                     (long) byte_get (data, offset_size));
-             data += offset_size;
+             SAFE_BYTE_GET_AND_INC (uvalue, data, offset_size, end);
            }
+         printf ("DW_OP_call_ref: <0x%s>", dwarf_vmatoa ("x", uvalue));
          break;
        case DW_OP_form_tls_address:
          printf ("DW_OP_form_tls_address");
@@ -1059,9 +1214,11 @@ decode_location_expression (unsigned char * data,
          break;
        case DW_OP_bit_piece:
          printf ("DW_OP_bit_piece: ");
-         printf ("size: %lu ", read_leb128 (data, &bytes_read, 0));
+         printf (_("size: %s "),
+                 dwarf_vmatoa ("u", read_uleb128 (data, &bytes_read, end)));
          data += bytes_read;
-         printf ("offset: %lu ", read_leb128 (data, &bytes_read, 0));
+         printf (_("offset: %s "),
+                 dwarf_vmatoa ("u", read_uleb128 (data, &bytes_read, end)));
          data += bytes_read;
          break;
 
@@ -1072,15 +1229,15 @@ decode_location_expression (unsigned char * data,
 
        case DW_OP_implicit_value:
          printf ("DW_OP_implicit_value");
-         uvalue = read_leb128 (data, &bytes_read, 0);
+         uvalue = read_uleb128 (data, &bytes_read, end);
          data += bytes_read;
-         display_block (data, uvalue);
+         display_block (data, uvalue, end);
          data += uvalue;
          break;
 
          /* GNU extensions.  */
        case DW_OP_GNU_push_tls_address:
-         printf ("DW_OP_GNU_push_tls_address or DW_OP_HP_unknown");
+         printf (_("DW_OP_GNU_push_tls_address or DW_OP_HP_unknown"));
          break;
        case DW_OP_GNU_uninit:
          printf ("DW_OP_GNU_uninit");
@@ -1090,12 +1247,9 @@ decode_location_expression (unsigned char * data,
          {
            int encoding;
            dwarf_vma addr;
-       
+
            encoding = *data++;
-           addr = get_encoded_value (data, encoding);
-           if ((encoding & 0x70) == DW_EH_PE_pcrel)
-             addr += section->address + (data - section->start);
-           data += size_of_encoded_value (encoding);
+           addr = get_encoded_value (&data, encoding, section, end);
 
            printf ("DW_OP_GNU_encoded_addr: fmt:%02x addr:", encoding);
            print_dwarf_vma (addr, pointer_size);
@@ -1112,19 +1266,81 @@ decode_location_expression (unsigned char * data,
            }
          if (dwarf_version == 2)
            {
-             printf ("DW_OP_GNU_implicit_pointer: <0x%lx> %ld",
-                     (long) byte_get (data, pointer_size),
-                     read_leb128 (data + pointer_size, &bytes_read, 1));
-             data += pointer_size + bytes_read;
+             SAFE_BYTE_GET_AND_INC (uvalue, data, pointer_size, end);
            }
          else
            {
-             printf ("DW_OP_GNU_implicit_pointer: <0x%lx> %ld",
-                     (long) byte_get (data, offset_size),
-                     read_leb128 (data + offset_size, &bytes_read, 1));
-             data += offset_size;
+             SAFE_BYTE_GET_AND_INC (uvalue, data, offset_size, end);
            }
+         printf ("DW_OP_GNU_implicit_pointer: <0x%s> %s",
+                 dwarf_vmatoa ("x", uvalue),
+                 dwarf_vmatoa ("d", read_sleb128 (data,
+                                                  &bytes_read, end)));
+         data += bytes_read;
+         break;
+       case DW_OP_GNU_entry_value:
+         uvalue = read_uleb128 (data, &bytes_read, end);
+         data += bytes_read;
+         printf ("DW_OP_GNU_entry_value: (");
+         if (decode_location_expression (data, pointer_size, offset_size,
+                                         dwarf_version, uvalue,
+                                         cu_offset, section))
+           need_frame_base = 1;
+         putchar (')');
+         data += uvalue;
+         break;
+       case DW_OP_GNU_const_type:
+         uvalue = read_uleb128 (data, &bytes_read, end);
+         data += bytes_read;
+         printf ("DW_OP_GNU_const_type: <0x%s> ",
+                 dwarf_vmatoa ("x", cu_offset + uvalue));
+         SAFE_BYTE_GET_AND_INC (uvalue, data, 1, end);
+         display_block (data, uvalue, end);
+         data += uvalue;
+         break;
+       case DW_OP_GNU_regval_type:
+         uvalue = read_uleb128 (data, &bytes_read, end);
+         data += bytes_read;
+         printf ("DW_OP_GNU_regval_type: %s (%s)",
+                 dwarf_vmatoa ("u", uvalue), regname (uvalue, 1));
+         uvalue = read_uleb128 (data, &bytes_read, end);
+         data += bytes_read;
+         printf (" <0x%s>", dwarf_vmatoa ("x", cu_offset + uvalue));
+         break;
+       case DW_OP_GNU_deref_type:
+         SAFE_BYTE_GET_AND_INC (uvalue, data, 1, end);
+         printf ("DW_OP_GNU_deref_type: %ld", (long) uvalue);
+         uvalue = read_uleb128 (data, &bytes_read, end);
+         data += bytes_read;
+         printf (" <0x%s>", dwarf_vmatoa ("x", cu_offset + uvalue));
+         break;
+       case DW_OP_GNU_convert:
+         uvalue = read_uleb128 (data, &bytes_read, end);
+         data += bytes_read;
+         printf ("DW_OP_GNU_convert <0x%s>",
+                 dwarf_vmatoa ("x", uvalue ? cu_offset + uvalue : 0));
+         break;
+       case DW_OP_GNU_reinterpret:
+         uvalue = read_uleb128 (data, &bytes_read, end);
+         data += bytes_read;
+         printf ("DW_OP_GNU_reinterpret <0x%s>",
+                 dwarf_vmatoa ("x", uvalue ? cu_offset + uvalue : 0));
+         break;
+       case DW_OP_GNU_parameter_ref:
+         SAFE_BYTE_GET_AND_INC (uvalue, data, 4, end);
+         printf ("DW_OP_GNU_parameter_ref: <0x%s>",
+                 dwarf_vmatoa ("x", cu_offset + uvalue));
          break;
+        case DW_OP_GNU_addr_index:
+          uvalue = read_uleb128 (data, &bytes_read, end);
+          data += bytes_read;
+          printf ("DW_OP_GNU_addr_index <0x%s>", dwarf_vmatoa ("x", uvalue));
+          break;
+        case DW_OP_GNU_const_index:
+          uvalue = read_uleb128 (data, &bytes_read, end);
+          data += bytes_read;
+          printf ("DW_OP_GNU_const_index <0x%s>", dwarf_vmatoa ("x", uvalue));
+          break;
 
          /* HP extensions.  */
        case DW_OP_HP_is_value:
@@ -1179,23 +1395,91 @@ decode_location_expression (unsigned char * data,
   return need_frame_base;
 }
 
+/* Find the CU or TU set corresponding to the given CU_OFFSET.
+   This is used for DWARF package files.  */
+
+static struct cu_tu_set *
+find_cu_tu_set_v2 (dwarf_vma cu_offset, int do_types)
+{
+  struct cu_tu_set *p;
+  unsigned int nsets;
+  unsigned int dw_sect;
+
+  if (do_types)
+    {
+      p = tu_sets;
+      nsets = tu_count;
+      dw_sect = DW_SECT_TYPES;
+    }
+  else
+    {
+      p = cu_sets;
+      nsets = cu_count;
+      dw_sect = DW_SECT_INFO;
+    }
+  while (nsets > 0)
+    {
+      if (p->section_offsets [dw_sect] == cu_offset)
+       return p;
+      p++;
+      nsets--;
+    }
+  return NULL;
+}
+
+/* Add INC to HIGH_BITS:LOW_BITS.  */
+static void
+add64 (dwarf_vma * high_bits, dwarf_vma * low_bits, dwarf_vma inc)
+{
+  dwarf_vma tmp = * low_bits;
+
+  tmp += inc;
+
+  /* FIXME: There is probably a better way of handling this:
+
+     We need to cope with dwarf_vma being a 32-bit or 64-bit
+     type.  Plus regardless of its size LOW_BITS is meant to
+     only hold 32-bits, so if there is overflow or wrap around
+     we must propagate into HIGH_BITS.  */
+  if (tmp < * low_bits)
+    {
+      ++ * high_bits;
+    }
+  else if (sizeof (tmp) > 8
+          && (tmp >> 31) > 1)
+    {
+      ++ * high_bits;
+      tmp &= 0xFFFFFFFF;
+    }
+
+  * low_bits = tmp;
+}
+
 static unsigned char *
 read_and_display_attr_value (unsigned long attribute,
                             unsigned long form,
                             unsigned char * data,
-                            unsigned long cu_offset,
-                            unsigned long pointer_size,
-                            unsigned long offset_size,
+                            unsigned char * end,
+                            dwarf_vma cu_offset,
+                            dwarf_vma pointer_size,
+                            dwarf_vma offset_size,
                             int dwarf_version,
                             debug_info * debug_info_p,
                             int do_loc,
-                            struct dwarf_section * section)
+                            struct dwarf_section * section,
+                            struct cu_tu_set * this_set)
 {
-  unsigned long uvalue = 0;
+  dwarf_vma uvalue = 0;
   unsigned char *block_start = NULL;
   unsigned char * orig_data = data;
   unsigned int bytes_read;
 
+  if (data > end || (data == end && form != DW_FORM_flag_present))
+    {
+      warn (_("Corrupt attribute\n"));
+      return data;
+    }
+
   switch (form)
     {
     default:
@@ -1203,30 +1487,23 @@ read_and_display_attr_value (unsigned long attribute,
 
     case DW_FORM_ref_addr:
       if (dwarf_version == 2)
-       {
-         uvalue = byte_get (data, pointer_size);
-         data += pointer_size;
-       }
+       SAFE_BYTE_GET_AND_INC (uvalue, data, pointer_size, end);
       else if (dwarf_version == 3 || dwarf_version == 4)
-       {
-         uvalue = byte_get (data, offset_size);
-         data += offset_size;
-       }
+       SAFE_BYTE_GET_AND_INC (uvalue, data, offset_size, end);
       else
-       {
-         error (_("Internal error: DWARF version is not 2, 3 or 4.\n"));
-       }
+       error (_("Internal error: DWARF version is not 2, 3 or 4.\n"));
+
       break;
 
     case DW_FORM_addr:
-      uvalue = byte_get (data, pointer_size);
-      data += pointer_size;
+      SAFE_BYTE_GET_AND_INC (uvalue, data, pointer_size, end);
       break;
 
     case DW_FORM_strp:
     case DW_FORM_sec_offset:
-      uvalue = byte_get (data, offset_size);
-      data += offset_size;
+    case DW_FORM_GNU_ref_alt:
+    case DW_FORM_GNU_strp_alt:
+      SAFE_BYTE_GET_AND_INC (uvalue, data, offset_size, end);
       break;
 
     case DW_FORM_flag_present:
@@ -1236,49 +1513,61 @@ read_and_display_attr_value (unsigned long attribute,
     case DW_FORM_ref1:
     case DW_FORM_flag:
     case DW_FORM_data1:
-      uvalue = byte_get (data++, 1);
+      SAFE_BYTE_GET_AND_INC (uvalue, data, 1, end);
       break;
 
     case DW_FORM_ref2:
     case DW_FORM_data2:
-      uvalue = byte_get (data, 2);
-      data += 2;
+      SAFE_BYTE_GET_AND_INC (uvalue, data, 2, end);
       break;
 
     case DW_FORM_ref4:
     case DW_FORM_data4:
-      uvalue = byte_get (data, 4);
-      data += 4;
+      SAFE_BYTE_GET_AND_INC (uvalue, data, 4, end);
       break;
 
     case DW_FORM_sdata:
-      uvalue = read_leb128 (data, & bytes_read, 1);
+      uvalue = read_sleb128 (data, & bytes_read, end);
+      data += bytes_read;
+      break;
+
+    case DW_FORM_GNU_str_index:
+      uvalue = read_uleb128 (data, & bytes_read, end);
       data += bytes_read;
       break;
 
     case DW_FORM_ref_udata:
     case DW_FORM_udata:
-      uvalue = read_leb128 (data, & bytes_read, 0);
+      uvalue = read_uleb128 (data, & bytes_read, end);
       data += bytes_read;
       break;
 
     case DW_FORM_indirect:
-      form = read_leb128 (data, & bytes_read, 0);
+      form = read_uleb128 (data, & bytes_read, end);
       data += bytes_read;
       if (!do_loc)
        printf (" %s", get_FORM_name (form));
-      return read_and_display_attr_value (attribute, form, data,
+      return read_and_display_attr_value (attribute, form, data, end,
                                          cu_offset, pointer_size,
                                          offset_size, dwarf_version,
                                          debug_info_p, do_loc,
-                                         section);
+                                         section, this_set);
+    case DW_FORM_GNU_addr_index:
+      uvalue = read_uleb128 (data, & bytes_read, end);
+      data += bytes_read;
+      break;
     }
 
   switch (form)
     {
     case DW_FORM_ref_addr:
       if (!do_loc)
-       printf (" <0x%lx>", uvalue);
+       printf (" <0x%s>", dwarf_vmatoa ("x",uvalue));
+      break;
+
+    case DW_FORM_GNU_ref_alt:
+      if (!do_loc)
+       printf (" <alt 0x%s>", dwarf_vmatoa ("x",uvalue));
       break;
 
     case DW_FORM_ref1:
@@ -1286,14 +1575,14 @@ read_and_display_attr_value (unsigned long attribute,
     case DW_FORM_ref4:
     case DW_FORM_ref_udata:
       if (!do_loc)
-       printf (" <0x%lx>", uvalue + cu_offset);
+       printf (" <0x%s>", dwarf_vmatoa ("x", uvalue + cu_offset));
       break;
 
     case DW_FORM_data4:
     case DW_FORM_addr:
     case DW_FORM_sec_offset:
       if (!do_loc)
-       printf (" 0x%lx", uvalue);
+       printf (" 0x%s", dwarf_vmatoa ("x", uvalue));
       break;
 
     case DW_FORM_flag_present:
@@ -1303,75 +1592,124 @@ read_and_display_attr_value (unsigned long attribute,
     case DW_FORM_sdata:
     case DW_FORM_udata:
       if (!do_loc)
-       printf (" %ld", uvalue);
+       printf (" %s", dwarf_vmatoa ("d", uvalue));
       break;
 
     case DW_FORM_ref8:
     case DW_FORM_data8:
       if (!do_loc)
        {
-         uvalue = byte_get (data, 4);
-         printf (" 0x%lx", uvalue);
-         printf (" 0x%lx", (unsigned long) byte_get (data + 4, 4));
+         dwarf_vma high_bits;
+         dwarf_vma utmp;
+         char buf[64];
+
+         SAFE_BYTE_GET64 (data, &high_bits, &uvalue, end);
+         utmp = uvalue;
+         if (form == DW_FORM_ref8)
+           add64 (& high_bits, & utmp, cu_offset);
+         printf (" 0x%s",
+                 dwarf_vmatoa64 (high_bits, utmp, buf, sizeof (buf)));
        }
+
       if ((do_loc || do_debug_loc || do_debug_ranges)
          && num_debug_info_entries == 0)
        {
          if (sizeof (uvalue) == 8)
-           uvalue = byte_get (data, 8);
+           SAFE_BYTE_GET (uvalue, data, 8, end);
          else
-           error (_("DW_FORM_data8 is unsupported when sizeof (unsigned long) != 8\n"));
+           error (_("DW_FORM_data8 is unsupported when sizeof (dwarf_vma) != 8\n"));
        }
+
       data += 8;
       break;
 
     case DW_FORM_string:
       if (!do_loc)
-       printf (" %s", data);
-      data += strlen ((char *) data) + 1;
+       printf (" %.*s", (int) (end - data), data);
+      data += strnlen ((char *) data, end - data) + 1;
       break;
 
     case DW_FORM_block:
     case DW_FORM_exprloc:
-      uvalue = read_leb128 (data, & bytes_read, 0);
+      uvalue = read_uleb128 (data, & bytes_read, end);
       block_start = data + bytes_read;
+      /* PR 17512: file: 008-103549-0.001:0.1.  */
+      if (block_start + uvalue > end)
+       {
+         warn (_("Corrupt attribute block length: %lx\n"), (long) uvalue);
+         uvalue = end - block_start;
+       }
       if (do_loc)
        data = block_start + uvalue;
       else
-       data = display_block (block_start, uvalue);
+       data = display_block (block_start, uvalue, end);
       break;
 
     case DW_FORM_block1:
-      uvalue = byte_get (data, 1);
+      SAFE_BYTE_GET (uvalue, data, 1, end);
       block_start = data + 1;
+      if (block_start + uvalue > end)
+       {
+         warn (_("Corrupt attribute block length: %lx\n"), (long) uvalue);
+         uvalue = end - block_start;
+       }
       if (do_loc)
        data = block_start + uvalue;
       else
-       data = display_block (block_start, uvalue);
+       data = display_block (block_start, uvalue, end);
       break;
 
     case DW_FORM_block2:
-      uvalue = byte_get (data, 2);
+      SAFE_BYTE_GET (uvalue, data, 2, end);
       block_start = data + 2;
+      if (block_start + uvalue > end)
+       {
+         warn (_("Corrupt attribute block length: %lx\n"), (long) uvalue);
+         uvalue = end - block_start;
+       }
       if (do_loc)
        data = block_start + uvalue;
       else
-       data = display_block (block_start, uvalue);
+       data = display_block (block_start, uvalue, end);
       break;
 
     case DW_FORM_block4:
-      uvalue = byte_get (data, 4);
+      SAFE_BYTE_GET (uvalue, data, 4, end);
       block_start = data + 4;
+      if (block_start + uvalue > end)
+       {
+         warn (_("Corrupt attribute block length: %lx\n"), (long) uvalue);
+         uvalue = end - block_start;
+       }
       if (do_loc)
        data = block_start + uvalue;
       else
-       data = display_block (block_start, uvalue);
+       data = display_block (block_start, uvalue, end);
       break;
 
     case DW_FORM_strp:
       if (!do_loc)
-       printf (_(" (indirect string, offset: 0x%lx): %s"),
-               uvalue, fetch_indirect_string (uvalue));
+       printf (_(" (indirect string, offset: 0x%s): %s"),
+               dwarf_vmatoa ("x", uvalue),
+               fetch_indirect_string (uvalue));
+      break;
+
+    case DW_FORM_GNU_str_index:
+      if (!do_loc)
+        {
+          const char *suffix = strrchr (section->name, '.');
+          int dwo = (suffix && strcmp (suffix, ".dwo") == 0) ? 1 : 0;
+
+          printf (_(" (indexed string: 0x%s): %s"),
+                  dwarf_vmatoa ("x", uvalue),
+                  fetch_indexed_string (uvalue, this_set, offset_size, dwo));
+        }
+      break;
+
+    case DW_FORM_GNU_strp_alt:
+      if (!do_loc)
+       printf (_(" (alt indirect string, offset: 0x%s)"),
+               dwarf_vmatoa ("x", uvalue));
       break;
 
     case DW_FORM_indirect:
@@ -1381,16 +1719,21 @@ read_and_display_attr_value (unsigned long attribute,
     case DW_FORM_ref_sig8:
       if (!do_loc)
        {
-         int i;
-         printf (" signature: ");
-         for (i = 0; i < 8; i++)
-           {
-             printf ("%02x", (unsigned) byte_get (data, 1));
-             data += 1;
-           }
+         dwarf_vma high_bits;
+         char buf[64];
+
+         SAFE_BYTE_GET64 (data, &high_bits, &uvalue, end);
+         printf (" signature: 0x%s",
+                 dwarf_vmatoa64 (high_bits, uvalue, buf, sizeof (buf)));
        }
-      else
-        data += 8;
+      data += 8;
+      break;
+
+    case DW_FORM_GNU_addr_index:
+      if (!do_loc)
+        printf (_(" (addr_index: 0x%s): %s"),
+                dwarf_vmatoa ("x", uvalue),
+                fetch_indexed_value (uvalue * pointer_size, pointer_size));
       break;
 
     default:
@@ -1399,7 +1742,8 @@ read_and_display_attr_value (unsigned long attribute,
     }
 
   if ((do_loc || do_debug_loc || do_debug_ranges)
-      && num_debug_info_entries == 0)
+      && num_debug_info_entries == 0
+      && debug_info_p != NULL)
     {
       switch (attribute)
        {
@@ -1413,8 +1757,12 @@ read_and_display_attr_value (unsigned long attribute,
        case DW_AT_segment:
        case DW_AT_static_link:
        case DW_AT_use_location:
-         if (form == DW_FORM_data4
-             || form == DW_FORM_data8
+       case DW_AT_GNU_call_site_value:
+       case DW_AT_GNU_call_site_data_value:
+       case DW_AT_GNU_call_site_target:
+       case DW_AT_GNU_call_site_target_clobbered:
+         if ((dwarf_version < 4
+              && (form == DW_FORM_data4 || form == DW_FORM_data8))
              || form == DW_FORM_sec_offset)
            {
              /* Process location list.  */
@@ -1424,7 +1772,7 @@ read_and_display_attr_value (unsigned long attribute,
              if (lmax == 0 || num >= lmax)
                {
                  lmax += 1024;
-                 debug_info_p->loc_offsets = (long unsigned int *)
+                 debug_info_p->loc_offsets = (dwarf_vma *)
                       xcrealloc (debug_info_p->loc_offsets,
                                 lmax, sizeof (*debug_info_p->loc_offsets));
                  debug_info_p->have_frame_base = (int *)
@@ -1432,6 +1780,8 @@ read_and_display_attr_value (unsigned long attribute,
                                 lmax, sizeof (*debug_info_p->have_frame_base));
                  debug_info_p->max_loc_offsets = lmax;
                }
+             if (this_set != NULL)
+               uvalue += this_set->section_offsets [DW_SECT_LOC];
              debug_info_p->loc_offsets [num] = uvalue;
              debug_info_p->have_frame_base [num] = have_frame_base;
              debug_info_p->num_loc_offsets++;
@@ -1443,9 +1793,17 @@ read_and_display_attr_value (unsigned long attribute,
            debug_info_p->base_address = uvalue;
          break;
 
+       case DW_AT_GNU_addr_base:
+          debug_info_p->addr_base = uvalue;
+         break;
+
+       case DW_AT_GNU_ranges_base:
+          debug_info_p->ranges_base = uvalue;
+         break;
+
        case DW_AT_ranges:
-         if (form == DW_FORM_data4
-             || form == DW_FORM_data8
+         if ((dwarf_version < 4
+              && (form == DW_FORM_data4 || form == DW_FORM_data8))
              || form == DW_FORM_sec_offset)
            {
              /* Process range list.  */
@@ -1455,7 +1813,7 @@ read_and_display_attr_value (unsigned long attribute,
              if (lmax == 0 || num >= lmax)
                {
                  lmax += 1024;
-                 debug_info_p->range_lists = (long unsigned int *)
+                 debug_info_p->range_lists = (dwarf_vma *)
                       xcrealloc (debug_info_p->range_lists,
                                 lmax, sizeof (*debug_info_p->range_lists));
                  debug_info_p->max_range_lists = lmax;
@@ -1470,15 +1828,14 @@ read_and_display_attr_value (unsigned long attribute,
        }
     }
 
-  if (do_loc)
+  if (do_loc || attribute == 0)
     return data;
 
   /* For some attributes we can display further information.  */
-  printf ("\t");
-
   switch (attribute)
     {
     case DW_AT_inline:
+      printf ("\t");
       switch (uvalue)
        {
        case DW_INL_not_inlined:
@@ -1494,12 +1851,14 @@ read_and_display_attr_value (unsigned long attribute,
          printf (_("(declared as inline and inlined)"));
          break;
        default:
-         printf (_("  (Unknown inline attribute value: %lx)"), uvalue);
+         printf (_("  (Unknown inline attribute value: %s)"),
+                 dwarf_vmatoa ("x", uvalue));
          break;
        }
       break;
 
     case DW_AT_language:
+      printf ("\t");
       switch (uvalue)
        {
          /* Ordered by the numeric value of these constants.  */
@@ -1526,20 +1885,24 @@ read_and_display_attr_value (unsigned long attribute,
        case DW_LANG_D:                 printf ("(D)"); break;
          /* DWARF 4 values.  */
        case DW_LANG_Python:            printf ("(Python)"); break;
+         /* DWARF 5 values.  */
+       case DW_LANG_Go:                printf ("(Go)"); break;
          /* MIPS extension.  */
        case DW_LANG_Mips_Assembler:    printf ("(MIPS assembler)"); break;
          /* UPC extension.  */
        case DW_LANG_Upc:               printf ("(Unified Parallel C)"); break;
        default:
          if (uvalue >= DW_LANG_lo_user && uvalue <= DW_LANG_hi_user)
-           printf ("(implementation defined: %lx)", uvalue);
+           printf (_("(implementation defined: %s)"),
+                   dwarf_vmatoa ("x", uvalue));
          else
-           printf ("(Unknown: %lx)", uvalue);
+           printf (_("(Unknown: %s)"), dwarf_vmatoa ("x", uvalue));
          break;
        }
       break;
 
     case DW_AT_encoding:
+      printf ("\t");
       switch (uvalue)
        {
        case DW_ATE_void:               printf ("(void)"); break;
@@ -1572,57 +1935,62 @@ read_and_display_attr_value (unsigned long attribute,
        default:
          if (uvalue >= DW_ATE_lo_user
              && uvalue <= DW_ATE_hi_user)
-           printf ("(user defined type)");
+           printf (_("(user defined type)"));
          else
-           printf ("(unknown type)");
+           printf (_("(unknown type)"));
          break;
        }
       break;
 
     case DW_AT_accessibility:
+      printf ("\t");
       switch (uvalue)
        {
        case DW_ACCESS_public:          printf ("(public)"); break;
        case DW_ACCESS_protected:       printf ("(protected)"); break;
        case DW_ACCESS_private:         printf ("(private)"); break;
        default:
-         printf ("(unknown accessibility)");
+         printf (_("(unknown accessibility)"));
          break;
        }
       break;
 
     case DW_AT_visibility:
+      printf ("\t");
       switch (uvalue)
        {
        case DW_VIS_local:              printf ("(local)"); break;
        case DW_VIS_exported:           printf ("(exported)"); break;
        case DW_VIS_qualified:          printf ("(qualified)"); break;
-       default:                        printf ("(unknown visibility)"); break;
+       default:                        printf (_("(unknown visibility)")); break;
        }
       break;
 
     case DW_AT_virtuality:
+      printf ("\t");
       switch (uvalue)
        {
        case DW_VIRTUALITY_none:        printf ("(none)"); break;
        case DW_VIRTUALITY_virtual:     printf ("(virtual)"); break;
        case DW_VIRTUALITY_pure_virtual:printf ("(pure_virtual)"); break;
-       default:                        printf ("(unknown virtuality)"); break;
+       default:                        printf (_("(unknown virtuality)")); break;
        }
       break;
 
     case DW_AT_identifier_case:
+      printf ("\t");
       switch (uvalue)
        {
        case DW_ID_case_sensitive:      printf ("(case_sensitive)"); break;
        case DW_ID_up_case:             printf ("(up_case)"); break;
        case DW_ID_down_case:           printf ("(down_case)"); break;
        case DW_ID_case_insensitive:    printf ("(case_insensitive)"); break;
-       default:                        printf ("(unknown case)"); break;
+       default:                        printf (_("(unknown case)")); break;
        }
       break;
 
     case DW_AT_calling_convention:
+      printf ("\t");
       switch (uvalue)
        {
        case DW_CC_normal:      printf ("(normal)"); break;
@@ -1631,16 +1999,17 @@ read_and_display_attr_value (unsigned long attribute,
        default:
          if (uvalue >= DW_CC_lo_user
              && uvalue <= DW_CC_hi_user)
-           printf ("(user defined)");
+           printf (_("(user defined)"));
          else
-           printf ("(unknown convention)");
+           printf (_("(unknown convention)"));
        }
       break;
 
     case DW_AT_ordering:
+      printf ("\t");
       switch (uvalue)
        {
-       case -1: printf ("(undefined)"); break;
+       case -1: printf (_("(undefined)")); break;
        case 0:  printf ("(row major)"); break;
        case 1:  printf ("(column major)"); break;
        }
@@ -1656,10 +2025,14 @@ read_and_display_attr_value (unsigned long attribute,
     case DW_AT_segment:
     case DW_AT_static_link:
     case DW_AT_use_location:
-      if (form == DW_FORM_data4
-         || form == DW_FORM_data8
+    case DW_AT_GNU_call_site_value:
+    case DW_AT_GNU_call_site_data_value:
+    case DW_AT_GNU_call_site_target:
+    case DW_AT_GNU_call_site_target_clobbered:
+      if ((dwarf_version < 4
+           && (form == DW_FORM_data4 || form == DW_FORM_data8))
          || form == DW_FORM_sec_offset)
-       printf (_("(location list)"));
+       printf (_(" (location list)"));
       /* Fall through.  */
     case DW_AT_allocated:
     case DW_AT_associated:
@@ -1671,7 +2044,7 @@ read_and_display_attr_value (unsigned long attribute,
        {
          int need_frame_base;
 
-         printf ("(");
+         printf ("\t(");
          need_frame_base = decode_location_expression (block_start,
                                                        pointer_size,
                                                        offset_size,
@@ -1686,30 +2059,39 @@ read_and_display_attr_value (unsigned long attribute,
 
     case DW_AT_import:
       {
-        if (form == DW_FORM_ref_sig8)
+       if (form == DW_FORM_ref_sig8
+           || form == DW_FORM_GNU_ref_alt)
           break;
 
        if (form == DW_FORM_ref1
            || form == DW_FORM_ref2
-           || form == DW_FORM_ref4)
+           || form == DW_FORM_ref4
+           || form == DW_FORM_ref_udata)
          uvalue += cu_offset;
 
        if (uvalue >= section->size)
-         warn (_("Offset %lx used as value for DW_AT_import attribute of DIE at offset %lx is too big.\n"),
-               uvalue, (unsigned long) (orig_data - section->start));
+         warn (_("Offset %s used as value for DW_AT_import attribute of DIE at offset %lx is too big.\n"),
+               dwarf_vmatoa ("x", uvalue),
+               (unsigned long) (orig_data - section->start));
        else
          {
            unsigned long abbrev_number;
            abbrev_entry * entry;
 
-           abbrev_number = read_leb128 (section->start + uvalue, NULL, 0);
+           abbrev_number = read_uleb128 (section->start + uvalue, NULL, end);
 
-           printf ("[Abbrev Number: %ld", abbrev_number);
-           for (entry = first_abbrev; entry != NULL; entry = entry->next)
-             if (entry->entry == abbrev_number)
-               break;
-           if (entry != NULL)
-             printf (" (%s)", get_TAG_name (entry->tag));
+           printf (_("\t[Abbrev Number: %ld"), abbrev_number);
+           /* Don't look up abbrev for DW_FORM_ref_addr, as it very often will
+              use different abbrev table, and we don't track .debug_info chunks
+              yet.  */
+           if (form != DW_FORM_ref_addr)
+             {
+               for (entry = first_abbrev; entry != NULL; entry = entry->next)
+                 if (entry->entry == abbrev_number)
+                   break;
+               if (entry != NULL)
+                 printf (" (%s)", get_TAG_name (entry->tag));
+             }
            printf ("]");
          }
       }
@@ -1722,201 +2104,57 @@ read_and_display_attr_value (unsigned long attribute,
   return data;
 }
 
-static char *
+static const char *
 get_AT_name (unsigned long attribute)
 {
-  switch (attribute)
-    {
-    case DW_AT_sibling:                        return "DW_AT_sibling";
-    case DW_AT_location:               return "DW_AT_location";
-    case DW_AT_name:                   return "DW_AT_name";
-    case DW_AT_ordering:               return "DW_AT_ordering";
-    case DW_AT_subscr_data:            return "DW_AT_subscr_data";
-    case DW_AT_byte_size:              return "DW_AT_byte_size";
-    case DW_AT_bit_offset:             return "DW_AT_bit_offset";
-    case DW_AT_bit_size:               return "DW_AT_bit_size";
-    case DW_AT_element_list:           return "DW_AT_element_list";
-    case DW_AT_stmt_list:              return "DW_AT_stmt_list";
-    case DW_AT_low_pc:                 return "DW_AT_low_pc";
-    case DW_AT_high_pc:                        return "DW_AT_high_pc";
-    case DW_AT_language:               return "DW_AT_language";
-    case DW_AT_member:                 return "DW_AT_member";
-    case DW_AT_discr:                  return "DW_AT_discr";
-    case DW_AT_discr_value:            return "DW_AT_discr_value";
-    case DW_AT_visibility:             return "DW_AT_visibility";
-    case DW_AT_import:                 return "DW_AT_import";
-    case DW_AT_string_length:          return "DW_AT_string_length";
-    case DW_AT_common_reference:       return "DW_AT_common_reference";
-    case DW_AT_comp_dir:               return "DW_AT_comp_dir";
-    case DW_AT_const_value:            return "DW_AT_const_value";
-    case DW_AT_containing_type:                return "DW_AT_containing_type";
-    case DW_AT_default_value:          return "DW_AT_default_value";
-    case DW_AT_inline:                 return "DW_AT_inline";
-    case DW_AT_is_optional:            return "DW_AT_is_optional";
-    case DW_AT_lower_bound:            return "DW_AT_lower_bound";
-    case DW_AT_producer:               return "DW_AT_producer";
-    case DW_AT_prototyped:             return "DW_AT_prototyped";
-    case DW_AT_return_addr:            return "DW_AT_return_addr";
-    case DW_AT_start_scope:            return "DW_AT_start_scope";
-    case DW_AT_stride_size:            return "DW_AT_stride_size";
-    case DW_AT_upper_bound:            return "DW_AT_upper_bound";
-    case DW_AT_abstract_origin:                return "DW_AT_abstract_origin";
-    case DW_AT_accessibility:          return "DW_AT_accessibility";
-    case DW_AT_address_class:          return "DW_AT_address_class";
-    case DW_AT_artificial:             return "DW_AT_artificial";
-    case DW_AT_base_types:             return "DW_AT_base_types";
-    case DW_AT_calling_convention:     return "DW_AT_calling_convention";
-    case DW_AT_count:                  return "DW_AT_count";
-    case DW_AT_data_member_location:   return "DW_AT_data_member_location";
-    case DW_AT_decl_column:            return "DW_AT_decl_column";
-    case DW_AT_decl_file:              return "DW_AT_decl_file";
-    case DW_AT_decl_line:              return "DW_AT_decl_line";
-    case DW_AT_declaration:            return "DW_AT_declaration";
-    case DW_AT_discr_list:             return "DW_AT_discr_list";
-    case DW_AT_encoding:               return "DW_AT_encoding";
-    case DW_AT_external:               return "DW_AT_external";
-    case DW_AT_frame_base:             return "DW_AT_frame_base";
-    case DW_AT_friend:                 return "DW_AT_friend";
-    case DW_AT_identifier_case:                return "DW_AT_identifier_case";
-    case DW_AT_macro_info:             return "DW_AT_macro_info";
-    case DW_AT_namelist_items:         return "DW_AT_namelist_items";
-    case DW_AT_priority:               return "DW_AT_priority";
-    case DW_AT_segment:                        return "DW_AT_segment";
-    case DW_AT_specification:          return "DW_AT_specification";
-    case DW_AT_static_link:            return "DW_AT_static_link";
-    case DW_AT_type:                   return "DW_AT_type";
-    case DW_AT_use_location:           return "DW_AT_use_location";
-    case DW_AT_variable_parameter:     return "DW_AT_variable_parameter";
-    case DW_AT_virtuality:             return "DW_AT_virtuality";
-    case DW_AT_vtable_elem_location:   return "DW_AT_vtable_elem_location";
-      /* DWARF 2.1 values.  */
-    case DW_AT_allocated:              return "DW_AT_allocated";
-    case DW_AT_associated:             return "DW_AT_associated";
-    case DW_AT_data_location:          return "DW_AT_data_location";
-    case DW_AT_stride:                 return "DW_AT_stride";
-    case DW_AT_entry_pc:               return "DW_AT_entry_pc";
-    case DW_AT_use_UTF8:               return "DW_AT_use_UTF8";
-    case DW_AT_extension:              return "DW_AT_extension";
-    case DW_AT_ranges:                 return "DW_AT_ranges";
-    case DW_AT_trampoline:             return "DW_AT_trampoline";
-    case DW_AT_call_column:            return "DW_AT_call_column";
-    case DW_AT_call_file:              return "DW_AT_call_file";
-    case DW_AT_call_line:              return "DW_AT_call_line";
-    case DW_AT_description:            return "DW_AT_description";
-    case DW_AT_binary_scale:           return "DW_AT_binary_scale";
-    case DW_AT_decimal_scale:          return "DW_AT_decimal_scale";
-    case DW_AT_small:                  return "DW_AT_small";
-    case DW_AT_decimal_sign:           return "DW_AT_decimal_sign";
-    case DW_AT_digit_count:            return "DW_AT_digit_count";
-    case DW_AT_picture_string:         return "DW_AT_picture_string";
-    case DW_AT_mutable:                        return "DW_AT_mutable";
-    case DW_AT_threads_scaled:         return "DW_AT_threads_scaled";
-    case DW_AT_explicit:               return "DW_AT_explicit";
-    case DW_AT_object_pointer:         return "DW_AT_object_pointer";
-    case DW_AT_endianity:              return "DW_AT_endianity";
-    case DW_AT_elemental:              return "DW_AT_elemental";
-    case DW_AT_pure:                   return "DW_AT_pure";
-    case DW_AT_recursive:              return "DW_AT_recursive";
-      /* DWARF 4 values.  */
-    case DW_AT_signature:              return "DW_AT_signature";
-    case DW_AT_main_subprogram:                return "DW_AT_main_subprogram";
-    case DW_AT_data_bit_offset:                return "DW_AT_data_bit_offset";
-    case DW_AT_const_expr:             return "DW_AT_const_expr";
-    case DW_AT_enum_class:             return "DW_AT_enum_class";
-    case DW_AT_linkage_name:           return "DW_AT_linkage_name";
-
-      /* HP and SGI/MIPS extensions.  */
-    case DW_AT_MIPS_loop_begin:                        return "DW_AT_MIPS_loop_begin";
-    case DW_AT_MIPS_tail_loop_begin:           return "DW_AT_MIPS_tail_loop_begin";
-    case DW_AT_MIPS_epilog_begin:              return "DW_AT_MIPS_epilog_begin";
-    case DW_AT_MIPS_loop_unroll_factor:        return "DW_AT_MIPS_loop_unroll_factor";
-    case DW_AT_MIPS_software_pipeline_depth:   return "DW_AT_MIPS_software_pipeline_depth";
-    case DW_AT_MIPS_linkage_name:              return "DW_AT_MIPS_linkage_name";
-    case DW_AT_MIPS_stride:                    return "DW_AT_MIPS_stride";
-    case DW_AT_MIPS_abstract_name:             return "DW_AT_MIPS_abstract_name";
-    case DW_AT_MIPS_clone_origin:              return "DW_AT_MIPS_clone_origin";
-    case DW_AT_MIPS_has_inlines:               return "DW_AT_MIPS_has_inlines";
-
-      /* HP Extensions.  */
-    case DW_AT_HP_block_index:                 return "DW_AT_HP_block_index";
-    case DW_AT_HP_actuals_stmt_list:           return "DW_AT_HP_actuals_stmt_list";
-    case DW_AT_HP_proc_per_section:            return "DW_AT_HP_proc_per_section";
-    case DW_AT_HP_raw_data_ptr:                        return "DW_AT_HP_raw_data_ptr";
-    case DW_AT_HP_pass_by_reference:           return "DW_AT_HP_pass_by_reference";
-    case DW_AT_HP_opt_level:                   return "DW_AT_HP_opt_level";
-    case DW_AT_HP_prof_version_id:             return "DW_AT_HP_prof_version_id";
-    case DW_AT_HP_opt_flags:                   return "DW_AT_HP_opt_flags";
-    case DW_AT_HP_cold_region_low_pc:          return "DW_AT_HP_cold_region_low_pc";
-    case DW_AT_HP_cold_region_high_pc:         return "DW_AT_HP_cold_region_high_pc";
-    case DW_AT_HP_all_variables_modifiable:    return "DW_AT_HP_all_variables_modifiable";
-    case DW_AT_HP_linkage_name:                        return "DW_AT_HP_linkage_name";
-    case DW_AT_HP_prof_flags:                  return "DW_AT_HP_prof_flags";
-
-      /* One value is shared by the MIPS and HP extensions:  */
-    case DW_AT_MIPS_fde:                       return "DW_AT_MIPS_fde or DW_AT_HP_unmodifiable";
-
-      /* GNU extensions.  */
-    case DW_AT_sf_names:                       return "DW_AT_sf_names";
-    case DW_AT_src_info:                       return "DW_AT_src_info";
-    case DW_AT_mac_info:                       return "DW_AT_mac_info";
-    case DW_AT_src_coords:                     return "DW_AT_src_coords";
-    case DW_AT_body_begin:                     return "DW_AT_body_begin";
-    case DW_AT_body_end:                       return "DW_AT_body_end";
-    case DW_AT_GNU_vector:                     return "DW_AT_GNU_vector";
-    case DW_AT_GNU_guarded_by:                 return "DW_AT_GNU_guarded_by";
-    case DW_AT_GNU_pt_guarded_by:              return "DW_AT_GNU_pt_guarded_by";
-    case DW_AT_GNU_guarded:                    return "DW_AT_GNU_guarded";
-    case DW_AT_GNU_pt_guarded:                 return "DW_AT_GNU_pt_guarded";
-    case DW_AT_GNU_locks_excluded:             return "DW_AT_GNU_locks_excluded";
-    case DW_AT_GNU_exclusive_locks_required:   return "DW_AT_GNU_exclusive_locks_required";
-    case DW_AT_GNU_shared_locks_required:      return "DW_AT_GNU_shared_locks_required";
-    case DW_AT_GNU_odr_signature:              return "DW_AT_GNU_odr_signature";
-    case DW_AT_use_GNAT_descriptive_type:      return "DW_AT_use_GNAT_descriptive_type";
-    case DW_AT_GNAT_descriptive_type:          return "DW_AT_GNAT_descriptive_type";
-
-      /* UPC extension.  */
-    case DW_AT_upc_threads_scaled:     return "DW_AT_upc_threads_scaled";
-
-    /* PGI (STMicroelectronics) extensions.  */
-    case DW_AT_PGI_lbase:              return "DW_AT_PGI_lbase";
-    case DW_AT_PGI_soffset:            return "DW_AT_PGI_soffset";
-    case DW_AT_PGI_lstride:            return "DW_AT_PGI_lstride";
+  const char *name;
 
-    default:
-      {
-       static char buffer[100];
+  if (attribute == 0)
+    return "DW_AT value: 0";
 
-       snprintf (buffer, sizeof (buffer), _("Unknown AT value: %lx"),
-                 attribute);
-       return buffer;
-      }
+  /* One value is shared by the MIPS and HP extensions:  */
+  if (attribute == DW_AT_MIPS_fde)
+    return "DW_AT_MIPS_fde or DW_AT_HP_unmodifiable";
+
+  name = get_DW_AT_name (attribute);
+
+  if (name == NULL)
+    {
+      static char buffer[100];
+
+      snprintf (buffer, sizeof (buffer), _("Unknown AT value: %lx"),
+               attribute);
+      return buffer;
     }
+
+  return name;
 }
 
 static unsigned char *
 read_and_display_attr (unsigned long attribute,
                       unsigned long form,
                       unsigned char * data,
-                      unsigned long cu_offset,
-                      unsigned long pointer_size,
-                      unsigned long offset_size,
+                      unsigned char * end,
+                      dwarf_vma cu_offset,
+                      dwarf_vma pointer_size,
+                      dwarf_vma offset_size,
                       int dwarf_version,
                       debug_info * debug_info_p,
                       int do_loc,
-                      struct dwarf_section * section)
+                      struct dwarf_section * section,
+                      struct cu_tu_set * this_set)
 {
   if (!do_loc)
     printf ("   %-18s:", get_AT_name (attribute));
-  data = read_and_display_attr_value (attribute, form, data, cu_offset,
-                                     pointer_size, offset_size,
+  data = read_and_display_attr_value (attribute, form, data, end,
+                                     cu_offset, pointer_size, offset_size,
                                      dwarf_version, debug_info_p,
-                                     do_loc, section);
+                                     do_loc, section, this_set);
   if (!do_loc)
     printf ("\n");
   return data;
 }
 
-
 /* Process the contents of a .debug_info section.  If do_loc is non-zero
    then we are scanning for location lists and we do not want to display
    anything to the user.  If do_types is non-zero, we are processing
@@ -1939,7 +2177,7 @@ process_debug_info (struct dwarf_section *section,
       && num_debug_info_entries == 0
       && ! do_types)
     {
-      unsigned long length;
+      dwarf_vma length;
 
       /* First scan the section to get the number of comp units.  */
       for (section_begin = start, num_units = 0; section_begin < end;
@@ -1948,16 +2186,17 @@ process_debug_info (struct dwarf_section *section,
          /* Read the first 4 bytes.  For a 32-bit DWARF section, this
             will be the length.  For a 64-bit DWARF section, it'll be
             the escape code 0xffffffff followed by an 8 byte length.  */
-         length = byte_get (section_begin, 4);
+         SAFE_BYTE_GET (length, section_begin, 4, end);
 
          if (length == 0xffffffff)
            {
-             length = byte_get (section_begin + 4, 8);
+             SAFE_BYTE_GET (length, section_begin + 4, 8, end);
              section_begin += length + 12;
            }
          else if (length >= 0xfffffff0 && length < 0xffffffff)
            {
-             warn (_("Reserved length value (%lx) found in section %s\n"), length, section->name);
+             warn (_("Reserved length value (0x%s) found in section %s\n"),
+                   dwarf_vmatoa ("x", length), section->name);
              return 0;
            }
          else
@@ -1968,14 +2207,15 @@ process_debug_info (struct dwarf_section *section,
             relocations to an object file.  */
          if ((signed long) length <= 0)
            {
-             warn (_("Corrupt unit length (%lx) found in section %s\n"), length, section->name);
+             warn (_("Corrupt unit length (0x%s) found in section %s\n"),
+                   dwarf_vmatoa ("x", length), section->name);
              return 0;
            }
        }
 
       if (num_units == 0)
        {
-         error (_("No comp units in %s section ?"), section->name);
+         error (_("No comp units in %s section ?\n"), section->name);
          return 0;
        }
 
@@ -1984,7 +2224,7 @@ process_debug_info (struct dwarf_section *section,
                                                   sizeof (* debug_information));
       if (debug_information == NULL)
        {
-         error (_("Not enough memory for a debug info array of %u entries"),
+         error (_("Not enough memory for a debug info array of %u entries\n"),
                 num_units);
          return 0;
        }
@@ -1992,9 +2232,14 @@ process_debug_info (struct dwarf_section *section,
 
   if (!do_loc)
     {
-      printf (_("Contents of the %s section:\n\n"), section->name);
+      if (dwarf_start_die == 0)
+       printf (_("Contents of the %s section:\n\n"), section->name);
 
       load_debug_section (str, file);
+      load_debug_section (str_dwo, file);
+      load_debug_section (str_index, file);
+      load_debug_section (str_index_dwo, file);
+      load_debug_section (debug_addr, file);
     }
 
   load_debug_section (abbrev_sec, file);
@@ -2010,22 +2255,24 @@ process_debug_info (struct dwarf_section *section,
       DWARF2_Internal_CompUnit compunit;
       unsigned char *hdrptr;
       unsigned char *tags;
-      int level;
-      unsigned long cu_offset;
-      int offset_size;
+      int level, last_level, saved_level;
+      dwarf_vma cu_offset;
+      unsigned int offset_size;
       int initial_length_size;
-      unsigned char signature[8] = { 0 };
-      unsigned long type_offset = 0;
+      dwarf_vma signature_high = 0;
+      dwarf_vma signature_low = 0;
+      dwarf_vma type_offset = 0;
+      struct cu_tu_set *this_set;
+      dwarf_vma abbrev_base;
+      size_t abbrev_size;
 
       hdrptr = start;
 
-      compunit.cu_length = byte_get (hdrptr, 4);
-      hdrptr += 4;
+      SAFE_BYTE_GET_AND_INC (compunit.cu_length, hdrptr, 4, end);
 
       if (compunit.cu_length == 0xffffffff)
        {
-         compunit.cu_length = byte_get (hdrptr, 8);
-         hdrptr += 8;
+         SAFE_BYTE_GET_AND_INC (compunit.cu_length, hdrptr, 8, end);
          offset_size = 8;
          initial_length_size = 12;
        }
@@ -2035,29 +2282,39 @@ process_debug_info (struct dwarf_section *section,
          initial_length_size = 4;
        }
 
-      compunit.cu_version = byte_get (hdrptr, 2);
-      hdrptr += 2;
+      SAFE_BYTE_GET_AND_INC (compunit.cu_version, hdrptr, 2, end);
 
       cu_offset = start - section_begin;
 
-      compunit.cu_abbrev_offset = byte_get (hdrptr, offset_size);
-      hdrptr += offset_size;
+      this_set = find_cu_tu_set_v2 (cu_offset, do_types);
 
-      compunit.cu_pointer_size = byte_get (hdrptr, 1);
-      hdrptr += 1;
+      SAFE_BYTE_GET_AND_INC (compunit.cu_abbrev_offset, hdrptr, offset_size, end);
 
-      if (do_types)
-        {
-          int i;
+      if (this_set == NULL)
+       {
+         abbrev_base = 0;
+         abbrev_size = debug_displays [abbrev_sec].section.size;
+       }
+      else
+       {
+         abbrev_base = this_set->section_offsets [DW_SECT_ABBREV];
+         abbrev_size = this_set->section_sizes [DW_SECT_ABBREV];
+       }
 
-          for (i = 0; i < 8; i++)
-            {
-              signature[i] = byte_get (hdrptr, 1);
-              hdrptr += 1;
-            }
+      SAFE_BYTE_GET_AND_INC (compunit.cu_pointer_size, hdrptr, 1, end);
+      /* PR 17512: file: 001-108546-0.001:0.1.  */
+      if (compunit.cu_pointer_size < 2 || compunit.cu_pointer_size > 8)
+       {
+         warn (_("Invalid pointer size (%d) in compunit header, using %d instead\n"),
+               compunit.cu_pointer_size, offset_size);
+         compunit.cu_pointer_size = offset_size;
+       }
 
-          type_offset = byte_get (hdrptr, offset_size);
-          hdrptr += offset_size;
+      if (do_types)
+        {
+         SAFE_BYTE_GET64 (hdrptr, &signature_high, &signature_low, end);
+         hdrptr += 8;
+         SAFE_BYTE_GET_AND_INC (type_offset, hdrptr, offset_size, end);
         }
 
       if ((do_loc || do_debug_loc || do_debug_ranges)
@@ -2070,6 +2327,8 @@ process_debug_info (struct dwarf_section *section,
          debug_information [unit].offset_size = offset_size;
          debug_information [unit].dwarf_version = compunit.cu_version;
          debug_information [unit].base_address = 0;
+         debug_information [unit].addr_base = DEBUG_INFO_UNAVAILABLE;
+         debug_information [unit].ranges_base = DEBUG_INFO_UNAVAILABLE;
          debug_information [unit].loc_offsets = NULL;
          debug_information [unit].have_frame_base = NULL;
          debug_information [unit].max_loc_offsets = 0;
@@ -2079,30 +2338,55 @@ process_debug_info (struct dwarf_section *section,
          debug_information [unit].num_range_lists = 0;
        }
 
-      if (!do_loc)
+      if (!do_loc && dwarf_start_die == 0)
        {
-         printf (_("  Compilation Unit @ offset 0x%lx:\n"), cu_offset);
-         printf (_("   Length:        0x%lx (%s)\n"), compunit.cu_length,
-                 initial_length_size == 8 ? "64-bit" : "32-bit");
+         printf (_("  Compilation Unit @ offset 0x%s:\n"),
+                 dwarf_vmatoa ("x", cu_offset));
+         printf (_("   Length:        0x%s (%s)\n"),
+                 dwarf_vmatoa ("x", compunit.cu_length),
+                 offset_size == 8 ? "64-bit" : "32-bit");
          printf (_("   Version:       %d\n"), compunit.cu_version);
-         printf (_("   Abbrev Offset: %ld\n"), compunit.cu_abbrev_offset);
+         printf (_("   Abbrev Offset: 0x%s\n"),
+                 dwarf_vmatoa ("x", compunit.cu_abbrev_offset));
          printf (_("   Pointer Size:  %d\n"), compunit.cu_pointer_size);
          if (do_types)
            {
-             int i;
-             printf (_("   Signature:     "));
-             for (i = 0; i < 8; i++)
-               printf ("%02x", signature[i]);
-             printf ("\n");
-             printf (_("   Type Offset:   0x%lx\n"), type_offset);
+             char buf[64];
+
+             printf (_("   Signature:     0x%s\n"),
+                     dwarf_vmatoa64 (signature_high, signature_low,
+                                     buf, sizeof (buf)));
+             printf (_("   Type Offset:   0x%s\n"),
+                     dwarf_vmatoa ("x", type_offset));
+           }
+         if (this_set != NULL)
+           {
+             dwarf_vma *offsets = this_set->section_offsets;
+             size_t *sizes = this_set->section_sizes;
+
+             printf (_("   Section contributions:\n"));
+             printf (_("    .debug_abbrev.dwo:       0x%s  0x%s\n"),
+                     dwarf_vmatoa ("x", offsets [DW_SECT_ABBREV]),
+                     dwarf_vmatoa ("x", sizes [DW_SECT_ABBREV]));
+             printf (_("    .debug_line.dwo:         0x%s  0x%s\n"),
+                     dwarf_vmatoa ("x", offsets [DW_SECT_LINE]),
+                     dwarf_vmatoa ("x", sizes [DW_SECT_LINE]));
+             printf (_("    .debug_loc.dwo:          0x%s  0x%s\n"),
+                     dwarf_vmatoa ("x", offsets [DW_SECT_LOC]),
+                     dwarf_vmatoa ("x", sizes [DW_SECT_LOC]));
+             printf (_("    .debug_str_offsets.dwo:  0x%s  0x%s\n"),
+                     dwarf_vmatoa ("x", offsets [DW_SECT_STR_OFFSETS]),
+                     dwarf_vmatoa ("x", sizes [DW_SECT_STR_OFFSETS]));
            }
        }
 
       if (cu_offset + compunit.cu_length + initial_length_size
          > section->size)
        {
-         warn (_("Debug info is corrupted, length of CU at %lx extends beyond end of section (length = %lx)\n"),
-               cu_offset, compunit.cu_length);
+         warn (_("Debug info is corrupted, length of CU at %s"
+                 " extends beyond end of section (length = %s)\n"),
+               dwarf_vmatoa ("x", cu_offset),
+               dwarf_vmatoa ("x", compunit.cu_length));
          break;
        }
       tags = hdrptr;
@@ -2112,27 +2396,29 @@ process_debug_info (struct dwarf_section *section,
          && compunit.cu_version != 3
          && compunit.cu_version != 4)
        {
-         warn (_("CU at offset %lx contains corrupt or unsupported version number: %d.\n"),
-               cu_offset, compunit.cu_version);
+         warn (_("CU at offset %s contains corrupt or "
+                 "unsupported version number: %d.\n"),
+               dwarf_vmatoa ("x", cu_offset), compunit.cu_version);
          continue;
        }
 
       free_abbrevs ();
 
-      /* Process the abbrevs used by this compilation unit. DWARF
-        sections under Mach-O have non-zero addresses.  */
-      if (compunit.cu_abbrev_offset >= debug_displays [abbrev_sec].section.size)
+      /* Process the abbrevs used by this compilation unit.  */
+      if (compunit.cu_abbrev_offset >= abbrev_size)
        warn (_("Debug info is corrupted, abbrev offset (%lx) is larger than abbrev section size (%lx)\n"),
              (unsigned long) compunit.cu_abbrev_offset,
-             (unsigned long) debug_displays [abbrev_sec].section.size);
+             (unsigned long) abbrev_size);
       else
        process_abbrev_section
-         ((unsigned char *) debug_displays [abbrev_sec].section.start
-          + compunit.cu_abbrev_offset,
-          (unsigned char *) debug_displays [abbrev_sec].section.start
-          + debug_displays [abbrev_sec].section.size);
+         (((unsigned char *) debug_displays [abbrev_sec].section.start
+           + abbrev_base + compunit.cu_abbrev_offset),
+          ((unsigned char *) debug_displays [abbrev_sec].section.start
+           + abbrev_base + abbrev_size));
 
       level = 0;
+      last_level = level;
+      saved_level = -1;
       while (tags < start)
        {
          unsigned int bytes_read;
@@ -2140,10 +2426,11 @@ process_debug_info (struct dwarf_section *section,
          unsigned long die_offset;
          abbrev_entry *entry;
          abbrev_attr *attr;
+         int do_printing = 1;
 
          die_offset = tags - section_begin;
 
-         abbrev_number = read_leb128 (tags, & bytes_read, 0);
+         abbrev_number = read_uleb128 (tags, & bytes_read, start);
          tags += bytes_read;
 
          /* A null DIE marks the end of a list of siblings or it may also be
@@ -2162,6 +2449,12 @@ process_debug_info (struct dwarf_section *section,
                    break;
                }
 
+             if (!do_loc && die_offset >= dwarf_start_die
+                 && (dwarf_cutoff_level == -1
+                     || level < dwarf_cutoff_level))
+               printf (_(" <%d><%lx>: Abbrev Number: 0\n"),
+                       level, die_offset);
+
              --level;
              if (level < 0)
                {
@@ -2169,19 +2462,37 @@ process_debug_info (struct dwarf_section *section,
 
                  if (num_bogus_warns < 3)
                    {
-                     warn (_("Bogus end-of-siblings marker detected at offset %lx in .debug_info section\n"),
-                           die_offset);
+                     warn (_("Bogus end-of-siblings marker detected at offset %lx in %s section\n"),
+                           die_offset, section->name);
                      num_bogus_warns ++;
                      if (num_bogus_warns == 3)
                        warn (_("Further warnings about bogus end-of-sibling markers suppressed\n"));
                    }
                }
+             if (dwarf_start_die != 0 && level < saved_level)
+               return 1;
              continue;
            }
 
          if (!do_loc)
-           printf (_(" <%d><%lx>: Abbrev Number: %lu"),
-                   level, die_offset, abbrev_number);
+           {
+             if (dwarf_start_die != 0 && die_offset < dwarf_start_die)
+               do_printing = 0;
+             else
+               {
+                 if (dwarf_start_die != 0 && die_offset == dwarf_start_die)
+                   saved_level = level;
+                 do_printing = (dwarf_cutoff_level == -1
+                                || level < dwarf_cutoff_level);
+                 if (do_printing)
+                   printf (_(" <%d><%lx>: Abbrev Number: %lu"),
+                           level, die_offset, abbrev_number);
+                 else if (dwarf_cutoff_level == -1
+                          || last_level < dwarf_cutoff_level)
+                   printf (_(" <%d><%lx>: ...\n"), level, die_offset);
+                 last_level = level;
+               }
+           }
 
          /* Scan through the abbreviation list until we reach the
             correct entry.  */
@@ -2192,7 +2503,7 @@ process_debug_info (struct dwarf_section *section,
 
          if (entry == NULL)
            {
-             if (!do_loc)
+             if (!do_loc && do_printing)
                {
                  printf ("\n");
                  fflush (stdout);
@@ -2202,8 +2513,8 @@ process_debug_info (struct dwarf_section *section,
              return 0;
            }
 
-         if (!do_loc)
-           printf (_(" (%s)\n"), get_TAG_name (entry->tag));
+         if (!do_loc && do_printing)
+           printf (" (%s)\n", get_TAG_name (entry->tag));
 
          switch (entry->tag)
            {
@@ -2221,20 +2532,32 @@ process_debug_info (struct dwarf_section *section,
              break;
            }
 
-         for (attr = entry->first_attr; attr; attr = attr->next)
+         for (attr = entry->first_attr;
+              attr && attr->attribute;
+              attr = attr->next)
            {
-             if (! do_loc)
+             debug_info *arg;
+
+             if (! do_loc && do_printing)
                /* Show the offset from where the tag was extracted.  */
-               printf ("    <%2lx>", (unsigned long)(tags - section_begin));
+               printf ("    <%lx>", (unsigned long)(tags - section_begin));
+
+             arg = debug_information;
+             if (debug_information)
+               arg += unit;
 
              tags = read_and_display_attr (attr->attribute,
                                            attr->form,
-                                           tags, cu_offset,
+                                           tags,
+                                           end,
+                                           cu_offset,
                                            compunit.cu_pointer_size,
                                            offset_size,
                                            compunit.cu_version,
-                                           debug_information + unit,
-                                           do_loc, section);
+                                           arg,
+                                           do_loc || ! do_printing,
+                                           section,
+                                           this_set);
            }
 
          if (entry->children)
@@ -2250,9 +2573,7 @@ process_debug_info (struct dwarf_section *section,
     num_debug_info_entries = num_units;
 
   if (!do_loc)
-    {
-      printf ("\n");
-    }
+    printf ("\n");
 
   return 1;
 }
@@ -2272,7 +2593,7 @@ load_debug_info (void * file)
   warned_about_missing_comp_units = FALSE;
 
   /* If we have already tried and failed to load the .debug_info
-     section then do not bother to repear the task.  */
+     section then do not bother to repeat the task.  */
   if (num_debug_info_entries == DEBUG_INFO_UNAVAILABLE)
     return 0;
 
@@ -2280,14 +2601,111 @@ load_debug_info (void * file)
   if (num_debug_info_entries > 0)
     return num_debug_info_entries;
 
+  /* If this is a DWARF package file, load the CU and TU indexes.  */
+  load_cu_tu_indexes (file);
+
   if (load_debug_section (info, file)
       && process_debug_info (&debug_displays [info].section, file, abbrev, 1, 0))
     return num_debug_info_entries;
+  else if (load_debug_section (info_dwo, file)
+           && process_debug_info (&debug_displays [info_dwo].section, file,
+                                  abbrev_dwo, 1, 0))
+    return num_debug_info_entries;
 
   num_debug_info_entries = DEBUG_INFO_UNAVAILABLE;
   return 0;
 }
 
+/* Read a DWARF .debug_line section header starting at DATA.
+   Upon success returns an updated DATA pointer and the LINFO
+   structure and the END_OF_SEQUENCE pointer will be filled in.
+   Otherwise returns NULL.  */
+
+static unsigned char *
+read_debug_line_header (struct dwarf_section * section,
+                       unsigned char * data,
+                       unsigned char * end,
+                       DWARF2_Internal_LineInfo * linfo,
+                       unsigned char ** end_of_sequence)
+{
+  unsigned char *hdrptr;
+  unsigned int offset_size;
+  unsigned int initial_length_size;
+
+  /* Extract information from the Line Number Program Header.
+     (section 6.2.4 in the Dwarf3 doc).  */
+      hdrptr = data;
+
+  /* Get and check the length of the block.  */
+  SAFE_BYTE_GET_AND_INC (linfo->li_length, hdrptr, 4, end);
+
+  if (linfo->li_length == 0xffffffff)
+    {
+      /* This section is 64-bit DWARF 3.  */
+      SAFE_BYTE_GET_AND_INC (linfo->li_length, hdrptr, 8, end);
+      offset_size = 8;
+      initial_length_size = 12;
+    }
+  else
+    {
+      offset_size = 4;
+      initial_length_size = 4;
+    }
+
+  if (linfo->li_length + initial_length_size > section->size)
+    {
+      /* If the length is just a bias against the initial_length_size then
+        this means that the field has a relocation against it which has not
+        been applied.  (Ie we are dealing with an object file, not a linked
+        binary).  Do not complain but instead assume that the rest of the
+        section applies to this particular header.  */
+      if (linfo->li_length == - initial_length_size)
+       {
+         linfo->li_length = section->size - initial_length_size;
+       }
+      else
+       {
+         warn (_("The line info appears to be corrupt - the section is too small\n"));
+         return NULL;
+       }
+    }
+
+  /* Get and check the version number.  */
+  SAFE_BYTE_GET_AND_INC (linfo->li_version, hdrptr, 2, end);
+
+  if (linfo->li_version != 2
+      && linfo->li_version != 3
+      && linfo->li_version != 4)
+    {
+      warn (_("Only DWARF version 2, 3 and 4 line info is currently supported.\n"));
+      return NULL;
+    }
+
+  SAFE_BYTE_GET_AND_INC (linfo->li_prologue_length, hdrptr, offset_size, end);
+  SAFE_BYTE_GET_AND_INC (linfo->li_min_insn_length, hdrptr, 1, end);
+
+  if (linfo->li_version >= 4)
+    {
+      SAFE_BYTE_GET_AND_INC (linfo->li_max_ops_per_insn, hdrptr, 1, end);
+
+      if (linfo->li_max_ops_per_insn == 0)
+       {
+         warn (_("Invalid maximum operations per insn.\n"));
+         return NULL;
+       }
+    }
+  else
+    linfo->li_max_ops_per_insn = 1;
+
+  SAFE_BYTE_GET_AND_INC (linfo->li_default_is_stmt, hdrptr, 1, end);
+  SAFE_SIGNED_BYTE_GET_AND_INC (linfo->li_line_base, hdrptr, 1, end);
+  SAFE_BYTE_GET_AND_INC (linfo->li_line_range, hdrptr, 1, end);
+  SAFE_BYTE_GET_AND_INC (linfo->li_opcode_base, hdrptr, 1, end);
+
+  * end_of_sequence = data + linfo->li_length + initial_length_size;
+  return hdrptr;
+}
+
 static int
 display_debug_lines_raw (struct dwarf_section *section,
                         unsigned char *data,
@@ -2300,331 +2718,318 @@ display_debug_lines_raw (struct dwarf_section *section,
 
   while (data < end)
     {
+      static DWARF2_Internal_LineInfo saved_linfo;
       DWARF2_Internal_LineInfo linfo;
       unsigned char *standard_opcodes;
       unsigned char *end_of_sequence;
-      unsigned char *hdrptr;
-      unsigned long hdroff;
-      int initial_length_size;
-      int offset_size;
+      unsigned int last_dir_entry = 0;
       int i;
 
-      hdrptr = data;
-      hdroff = hdrptr - start;
-
-      /* Check the length of the block.  */
-      linfo.li_length = byte_get (hdrptr, 4);
-      hdrptr += 4;
-
-      if (linfo.li_length == 0xffffffff)
+      if (const_strneq (section->name, ".debug_line.")
+         /* Note: the following does not apply to .debug_line.dwo sections.
+            These are full debug_line sections.  */
+         && strcmp (section->name, ".debug_line.dwo") != 0)
        {
-         /* This section is 64-bit DWARF 3.  */
-         linfo.li_length = byte_get (hdrptr, 8);
-         hdrptr += 8;
-         offset_size = 8;
-         initial_length_size = 12;
+         /* Sections named .debug_line.<foo> are fragments of a .debug_line
+            section containing just the Line Number Statements.  They are
+            created by the assembler and intended to be used alongside gcc's
+            -ffunction-sections command line option.  When the linker's
+            garbage collection decides to discard a .text.<foo> section it
+            can then also discard the line number information in .debug_line.<foo>.
+
+            Since the section is a fragment it does not have the details
+            needed to fill out a LineInfo structure, so instead we use the
+            details from the last full debug_line section that we processed.  */
+         end_of_sequence = end;
+         standard_opcodes = NULL;
+         linfo = saved_linfo;
+         reset_state_machine (linfo.li_default_is_stmt);
        }
       else
        {
-         offset_size = 4;
-         initial_length_size = 4;
-       }
+         unsigned char * hdrptr;
 
-      if (linfo.li_length + initial_length_size > section->size)
-       {
-         warn
-           (_("The information in section %s appears to be corrupt - the section is too small\n"),
-            section->name);
-         return 0;
-       }
+         if ((hdrptr = read_debug_line_header (section, data, end, & linfo,
+                                               & end_of_sequence)) == NULL)
+           return 0;
 
-      /* Check its version number.  */
-      linfo.li_version = byte_get (hdrptr, 2);
-      hdrptr += 2;
-      if (linfo.li_version != 2
-         && linfo.li_version != 3
-         && linfo.li_version != 4)
-       {
-         warn (_("Only DWARF version 2, 3 and 4 line info is currently supported.\n"));
-         return 0;
-       }
+         printf (_("  Offset:                      0x%lx\n"), (long)(data - start));
+         printf (_("  Length:                      %ld\n"), (long) linfo.li_length);
+         printf (_("  DWARF Version:               %d\n"), linfo.li_version);
+         printf (_("  Prologue Length:             %d\n"), linfo.li_prologue_length);
+         printf (_("  Minimum Instruction Length:  %d\n"), linfo.li_min_insn_length);
+         if (linfo.li_version >= 4)
+           printf (_("  Maximum Ops per Instruction: %d\n"), linfo.li_max_ops_per_insn);
+         printf (_("  Initial value of 'is_stmt':  %d\n"), linfo.li_default_is_stmt);
+         printf (_("  Line Base:                   %d\n"), linfo.li_line_base);
+         printf (_("  Line Range:                  %d\n"), linfo.li_line_range);
+         printf (_("  Opcode Base:                 %d\n"), linfo.li_opcode_base);
 
-      linfo.li_prologue_length = byte_get (hdrptr, offset_size);
-      hdrptr += offset_size;
-      linfo.li_min_insn_length = byte_get (hdrptr, 1);
-      hdrptr++;
-      if (linfo.li_version >= 4)
-       {
-         linfo.li_max_ops_per_insn = byte_get (hdrptr, 1);
-         hdrptr++;
-         if (linfo.li_max_ops_per_insn == 0)
-           {
-             warn (_("Invalid maximum operations per insn.\n"));
-             return 0;
-           }
-       }
-      else
-       linfo.li_max_ops_per_insn = 1;
-      linfo.li_default_is_stmt = byte_get (hdrptr, 1);
-      hdrptr++;
-      linfo.li_line_base = byte_get (hdrptr, 1);
-      hdrptr++;
-      linfo.li_line_range = byte_get (hdrptr, 1);
-      hdrptr++;
-      linfo.li_opcode_base = byte_get (hdrptr, 1);
-      hdrptr++;
-
-      /* Sign extend the line base field.  */
-      linfo.li_line_base <<= 24;
-      linfo.li_line_base >>= 24;
-
-      printf (_("  Offset:                      0x%lx\n"), hdroff);
-      printf (_("  Length:                      %ld\n"), linfo.li_length);
-      printf (_("  DWARF Version:               %d\n"), linfo.li_version);
-      printf (_("  Prologue Length:             %d\n"), linfo.li_prologue_length);
-      printf (_("  Minimum Instruction Length:  %d\n"), linfo.li_min_insn_length);
-      if (linfo.li_version >= 4)
-       printf (_("  Maximum Ops per Instruction: %d\n"), linfo.li_max_ops_per_insn);
-      printf (_("  Initial value of 'is_stmt':  %d\n"), linfo.li_default_is_stmt);
-      printf (_("  Line Base:                   %d\n"), linfo.li_line_base);
-      printf (_("  Line Range:                  %d\n"), linfo.li_line_range);
-      printf (_("  Opcode Base:                 %d\n"), linfo.li_opcode_base);
-
-      end_of_sequence = data + linfo.li_length + initial_length_size;
-
-      reset_state_machine (linfo.li_default_is_stmt);
-
-      /* Display the contents of the Opcodes table.  */
-      standard_opcodes = hdrptr;
-
-      printf (_("\n Opcodes:\n"));
-
-      for (i = 1; i < linfo.li_opcode_base; i++)
-       printf (_("  Opcode %d has %d args\n"), i, standard_opcodes[i - 1]);
-
-      /* Display the contents of the Directory table.  */
-      data = standard_opcodes + linfo.li_opcode_base - 1;
-
-      if (*data == 0)
-       printf (_("\n The Directory Table is empty.\n"));
-      else
-       {
-         printf (_("\n The Directory Table:\n"));
+         reset_state_machine (linfo.li_default_is_stmt);
 
-         while (*data != 0)
-           {
-             printf (_("  %s\n"), data);
+         /* Display the contents of the Opcodes table.  */
+         standard_opcodes = hdrptr;
 
-             data += strlen ((char *) data) + 1;
-           }
-       }
+         printf (_("\n Opcodes:\n"));
 
-      /* Skip the NUL at the end of the table.  */
-      data++;
+         for (i = 1; i < linfo.li_opcode_base; i++)
+           printf (_("  Opcode %d has %d args\n"), i, standard_opcodes[i - 1]);
 
-      /* Display the contents of the File Name table.  */
-      if (*data == 0)
-       printf (_("\n The File Name Table is empty.\n"));
-      else
-       {
-         printf (_("\n The File Name Table:\n"));
-         printf (_("  Entry\tDir\tTime\tSize\tName\n"));
+         /* Display the contents of the Directory table.  */
+         data = standard_opcodes + linfo.li_opcode_base - 1;
 
-         while (*data != 0)
+         if (*data == 0)
+           printf (_("\n The Directory Table is empty.\n"));
+         else
            {
-             unsigned char *name;
-             unsigned int bytes_read;
+             printf (_("\n The Directory Table (offset 0x%lx):\n"),
+                     (long)(data - start));
 
-             printf (_("  %d\t"), ++state_machine_regs.last_file_entry);
-             name = data;
-
-             data += strlen ((char *) data) + 1;
+             while (*data != 0)
+               {
+                 printf ("  %d\t%s\n", ++last_dir_entry, data);
 
-             printf (_("%lu\t"), read_leb128 (data, & bytes_read, 0));
-             data += bytes_read;
-             printf (_("%lu\t"), read_leb128 (data, & bytes_read, 0));
-             data += bytes_read;
-             printf (_("%lu\t"), read_leb128 (data, & bytes_read, 0));
-             data += bytes_read;
-             printf (_("%s\n"), name);
+                 data += strnlen ((char *) data, end - data) + 1;
+               }
            }
-       }
-
-      /* Skip the NUL at the end of the table.  */
-      data++;
-
-      /* Now display the statements.  */
-      printf (_("\n Line Number Statements:\n"));
-
-      while (data < end_of_sequence)
-       {
-         unsigned char op_code;
-         int adv;
-         unsigned long int uladv;
-         unsigned int bytes_read;
 
-         op_code = *data++;
+         /* Skip the NUL at the end of the table.  */
+         data++;
 
-         if (op_code >= linfo.li_opcode_base)
-           {
-             op_code -= linfo.li_opcode_base;
-             uladv = (op_code / linfo.li_line_range);
-             if (linfo.li_max_ops_per_insn == 1)
-               {
-                 uladv *= linfo.li_min_insn_length;
-                 state_machine_regs.address += uladv;
-                 printf (_("  Special opcode %d: advance Address by %lu to 0x%lx"),
-                         op_code, uladv, state_machine_regs.address);
-               }
-             else
-               {
-                 state_machine_regs.address
-                   += ((state_machine_regs.op_index + uladv)
-                       / linfo.li_max_ops_per_insn)
-                      * linfo.li_min_insn_length;
-                 state_machine_regs.op_index
-                   = (state_machine_regs.op_index + uladv)
-                     % linfo.li_max_ops_per_insn;
-                 printf (_("  Special opcode %d: advance Address by %lu to 0x%lx[%d]"),
-                         op_code, uladv, state_machine_regs.address,
-                         state_machine_regs.op_index);
-               }
-             adv = (op_code % linfo.li_line_range) + linfo.li_line_base;
-             state_machine_regs.line += adv;
-             printf (_(" and Line by %d to %d\n"),
-                     adv, state_machine_regs.line);
-           }
-         else switch (op_code)
+         /* Display the contents of the File Name table.  */
+         if (*data == 0)
+           printf (_("\n The File Name Table is empty.\n"));
+         else
            {
-           case DW_LNS_extended_op:
-             data += process_extended_line_op (data, linfo.li_default_is_stmt);
-             break;
-
-           case DW_LNS_copy:
-             printf (_("  Copy\n"));
-             break;
+             printf (_("\n The File Name Table (offset 0x%lx):\n"),
+                     (long)(data - start));
+             printf (_("  Entry\tDir\tTime\tSize\tName\n"));
 
-           case DW_LNS_advance_pc:
-             uladv = read_leb128 (data, & bytes_read, 0);
-             data += bytes_read;
-             if (linfo.li_max_ops_per_insn == 1)
-               {
-                 uladv *= linfo.li_min_insn_length;
-                 state_machine_regs.address += uladv;
-                 printf (_("  Advance PC by %lu to 0x%lx\n"), uladv,
-                         state_machine_regs.address);
-               }
-             else
+             while (*data != 0)
                {
-                 state_machine_regs.address
-                   += ((state_machine_regs.op_index + uladv)
-                       / linfo.li_max_ops_per_insn)
-                      * linfo.li_min_insn_length;
-                 state_machine_regs.op_index
-                   = (state_machine_regs.op_index + uladv)
-                     % linfo.li_max_ops_per_insn;
-                 printf (_("  Advance PC by %lu to 0x%lx[%d]\n"), uladv,
-                         state_machine_regs.address,
-                         state_machine_regs.op_index);
-               }
-             break;
-
-           case DW_LNS_advance_line:
-             adv = read_leb128 (data, & bytes_read, 1);
-             data += bytes_read;
-             state_machine_regs.line += adv;
-             printf (_("  Advance Line by %d to %d\n"), adv,
-                     state_machine_regs.line);
-             break;
+                 unsigned char *name;
+                 unsigned int bytes_read;
 
-           case DW_LNS_set_file:
-             adv = read_leb128 (data, & bytes_read, 0);
-             data += bytes_read;
-             printf (_("  Set File Name to entry %d in the File Name Table\n"),
-                     adv);
-             state_machine_regs.file = adv;
-             break;
-
-           case DW_LNS_set_column:
-             uladv = read_leb128 (data, & bytes_read, 0);
-             data += bytes_read;
-             printf (_("  Set column to %lu\n"), uladv);
-             state_machine_regs.column = uladv;
-             break;
-
-           case DW_LNS_negate_stmt:
-             adv = state_machine_regs.is_stmt;
-             adv = ! adv;
-             printf (_("  Set is_stmt to %d\n"), adv);
-             state_machine_regs.is_stmt = adv;
-             break;
+                 printf ("  %d\t", ++state_machine_regs.last_file_entry);
+                 name = data;
+                 data += strnlen ((char *) data, end - data) + 1;
 
-           case DW_LNS_set_basic_block:
-             printf (_("  Set basic block\n"));
-             state_machine_regs.basic_block = 1;
-             break;
+                 printf ("%s\t",
+                         dwarf_vmatoa ("u", read_uleb128 (data, & bytes_read, end)));
+                 data += bytes_read;
+                 printf ("%s\t",
+                         dwarf_vmatoa ("u", read_uleb128 (data, & bytes_read, end)));
+                 data += bytes_read;
+                 printf ("%s\t",
+                         dwarf_vmatoa ("u", read_uleb128 (data, & bytes_read, end)));
+                 data += bytes_read;
+                 printf ("%s\n", name);
 
-           case DW_LNS_const_add_pc:
-             uladv = ((255 - linfo.li_opcode_base) / linfo.li_line_range);
-             if (linfo.li_max_ops_per_insn)
-               {
-                 uladv *= linfo.li_min_insn_length;
-                 state_machine_regs.address += uladv;
-                 printf (_("  Advance PC by constant %lu to 0x%lx\n"), uladv,
-                         state_machine_regs.address);
-               }
-             else
-               {
-                 state_machine_regs.address
-                   += ((state_machine_regs.op_index + uladv)
-                       / linfo.li_max_ops_per_insn)
-                      * linfo.li_min_insn_length;
-                 state_machine_regs.op_index
-                   = (state_machine_regs.op_index + uladv)
-                     % linfo.li_max_ops_per_insn;
-                 printf (_("  Advance PC by constant %lu to 0x%lx[%d]\n"),
-                         uladv, state_machine_regs.address,
-                         state_machine_regs.op_index);
+                 if (data == end)
+                   {
+                     warn (_("Corrupt file name table entry\n"));
+                     break;
+                   }
                }
-             break;
+           }
 
-           case DW_LNS_fixed_advance_pc:
-             uladv = byte_get (data, 2);
-             data += 2;
-             state_machine_regs.address += uladv;
-             state_machine_regs.op_index = 0;
-             printf (_("  Advance PC by fixed size amount %lu to 0x%lx\n"),
-                     uladv, state_machine_regs.address);
-             break;
+         /* Skip the NUL at the end of the table.  */
+         data++;
+         putchar ('\n');
+         saved_linfo = linfo;
+       }
 
-           case DW_LNS_set_prologue_end:
-             printf (_("  Set prologue_end to true\n"));
-             break;
+      /* Now display the statements.  */
+      if (data >= end_of_sequence)
+       printf (_(" No Line Number Statements.\n"));
+      else
+       {
+         printf (_(" Line Number Statements:\n"));
 
-           case DW_LNS_set_epilogue_begin:
-             printf (_("  Set epilogue_begin to true\n"));
-             break;
+         while (data < end_of_sequence)
+           {
+             unsigned char op_code;
+             dwarf_signed_vma adv;
+             dwarf_vma uladv;
+             unsigned int bytes_read;
 
-           case DW_LNS_set_isa:
-             uladv = read_leb128 (data, & bytes_read, 0);
-             data += bytes_read;
-             printf (_("  Set ISA to %lu\n"), uladv);
-             break;
+             printf ("  [0x%08lx]", (long)(data - start));
 
-           default:
-             printf (_("  Unknown opcode %d with operands: "), op_code);
+             op_code = *data++;
 
-             for (i = standard_opcodes[op_code - 1]; i > 0 ; --i)
+             if (op_code >= linfo.li_opcode_base)
                {
-                 printf ("0x%lx%s", read_leb128 (data, &bytes_read, 0),
-                         i == 1 ? "" : ", ");
-                 data += bytes_read;
+                 op_code -= linfo.li_opcode_base;
+                 uladv = (op_code / linfo.li_line_range);
+                 if (linfo.li_max_ops_per_insn == 1)
+                   {
+                     uladv *= linfo.li_min_insn_length;
+                     state_machine_regs.address += uladv;
+                     printf (_("  Special opcode %d: "
+                               "advance Address by %s to 0x%s"),
+                             op_code, dwarf_vmatoa ("u", uladv),
+                             dwarf_vmatoa ("x", state_machine_regs.address));
+                   }
+                 else
+                   {
+                     state_machine_regs.address
+                       += ((state_machine_regs.op_index + uladv)
+                           / linfo.li_max_ops_per_insn)
+                       * linfo.li_min_insn_length;
+                     state_machine_regs.op_index
+                       = (state_machine_regs.op_index + uladv)
+                       % linfo.li_max_ops_per_insn;
+                     printf (_("  Special opcode %d: "
+                               "advance Address by %s to 0x%s[%d]"),
+                             op_code, dwarf_vmatoa ("u", uladv),
+                             dwarf_vmatoa ("x", state_machine_regs.address),
+                             state_machine_regs.op_index);
+                   }
+                 adv = (op_code % linfo.li_line_range) + linfo.li_line_base;
+                 state_machine_regs.line += adv;
+                 printf (_(" and Line by %s to %d\n"),
+                         dwarf_vmatoa ("d", adv), state_machine_regs.line);
                }
-             putchar ('\n');
-             break;
+             else switch (op_code)
+                    {
+                    case DW_LNS_extended_op:
+                      data += process_extended_line_op (data, linfo.li_default_is_stmt, end);
+                      break;
+
+                    case DW_LNS_copy:
+                      printf (_("  Copy\n"));
+                      break;
+
+                    case DW_LNS_advance_pc:
+                      uladv = read_uleb128 (data, & bytes_read, end);
+                      data += bytes_read;
+                      if (linfo.li_max_ops_per_insn == 1)
+                        {
+                          uladv *= linfo.li_min_insn_length;
+                          state_machine_regs.address += uladv;
+                          printf (_("  Advance PC by %s to 0x%s\n"),
+                                  dwarf_vmatoa ("u", uladv),
+                                  dwarf_vmatoa ("x", state_machine_regs.address));
+                        }
+                      else
+                        {
+                          state_machine_regs.address
+                            += ((state_machine_regs.op_index + uladv)
+                                / linfo.li_max_ops_per_insn)
+                            * linfo.li_min_insn_length;
+                          state_machine_regs.op_index
+                            = (state_machine_regs.op_index + uladv)
+                            % linfo.li_max_ops_per_insn;
+                          printf (_("  Advance PC by %s to 0x%s[%d]\n"),
+                                  dwarf_vmatoa ("u", uladv),
+                                  dwarf_vmatoa ("x", state_machine_regs.address),
+                                  state_machine_regs.op_index);
+                        }
+                      break;
+
+                    case DW_LNS_advance_line:
+                      adv = read_sleb128 (data, & bytes_read, end);
+                      data += bytes_read;
+                      state_machine_regs.line += adv;
+                      printf (_("  Advance Line by %s to %d\n"),
+                              dwarf_vmatoa ("d", adv),
+                              state_machine_regs.line);
+                      break;
+
+                    case DW_LNS_set_file:
+                      adv = read_uleb128 (data, & bytes_read, end);
+                      data += bytes_read;
+                      printf (_("  Set File Name to entry %s in the File Name Table\n"),
+                              dwarf_vmatoa ("d", adv));
+                      state_machine_regs.file = adv;
+                      break;
+
+                    case DW_LNS_set_column:
+                      uladv = read_uleb128 (data, & bytes_read, end);
+                      data += bytes_read;
+                      printf (_("  Set column to %s\n"),
+                              dwarf_vmatoa ("u", uladv));
+                      state_machine_regs.column = uladv;
+                      break;
+
+                    case DW_LNS_negate_stmt:
+                      adv = state_machine_regs.is_stmt;
+                      adv = ! adv;
+                      printf (_("  Set is_stmt to %s\n"), dwarf_vmatoa ("d", adv));
+                      state_machine_regs.is_stmt = adv;
+                      break;
+
+                    case DW_LNS_set_basic_block:
+                      printf (_("  Set basic block\n"));
+                      state_machine_regs.basic_block = 1;
+                      break;
+
+                    case DW_LNS_const_add_pc:
+                      uladv = ((255 - linfo.li_opcode_base) / linfo.li_line_range);
+                      if (linfo.li_max_ops_per_insn)
+                        {
+                          uladv *= linfo.li_min_insn_length;
+                          state_machine_regs.address += uladv;
+                          printf (_("  Advance PC by constant %s to 0x%s\n"),
+                                  dwarf_vmatoa ("u", uladv),
+                                  dwarf_vmatoa ("x", state_machine_regs.address));
+                        }
+                      else
+                        {
+                          state_machine_regs.address
+                            += ((state_machine_regs.op_index + uladv)
+                                / linfo.li_max_ops_per_insn)
+                            * linfo.li_min_insn_length;
+                          state_machine_regs.op_index
+                            = (state_machine_regs.op_index + uladv)
+                            % linfo.li_max_ops_per_insn;
+                          printf (_("  Advance PC by constant %s to 0x%s[%d]\n"),
+                                  dwarf_vmatoa ("u", uladv),
+                                  dwarf_vmatoa ("x", state_machine_regs.address),
+                                  state_machine_regs.op_index);
+                        }
+                      break;
+
+                    case DW_LNS_fixed_advance_pc:
+                      SAFE_BYTE_GET_AND_INC (uladv, data, 2, end);
+                      state_machine_regs.address += uladv;
+                      state_machine_regs.op_index = 0;
+                      printf (_("  Advance PC by fixed size amount %s to 0x%s\n"),
+                              dwarf_vmatoa ("u", uladv),
+                              dwarf_vmatoa ("x", state_machine_regs.address));
+                      break;
+
+                    case DW_LNS_set_prologue_end:
+                      printf (_("  Set prologue_end to true\n"));
+                      break;
+
+                    case DW_LNS_set_epilogue_begin:
+                      printf (_("  Set epilogue_begin to true\n"));
+                      break;
+
+                    case DW_LNS_set_isa:
+                      uladv = read_uleb128 (data, & bytes_read, end);
+                      data += bytes_read;
+                      printf (_("  Set ISA to %s\n"), dwarf_vmatoa ("u", uladv));
+                      break;
+
+                    default:
+                      printf (_("  Unknown opcode %d with operands: "), op_code);
+
+                      if (standard_opcodes != NULL)
+                        for (i = standard_opcodes[op_code - 1]; i > 0 ; --i)
+                          {
+                            printf ("0x%s%s", dwarf_vmatoa ("x", read_uleb128 (data,
+                                                                               &bytes_read, end)),
+                                    i == 1 ? "" : ", ");
+                            data += bytes_read;
+                          }
+                      putchar ('\n');
+                      break;
+                    }
            }
+         putchar ('\n');
        }
-      putchar ('\n');
     }
 
   return 1;
@@ -2632,10 +3037,10 @@ display_debug_lines_raw (struct dwarf_section *section,
 
 typedef struct
 {
-    unsigned char *name;
-    unsigned int directory_index;
-    unsigned int modification_date;
-    unsigned int length;
+  unsigned char *name;
+  unsigned int directory_index;
+  unsigned int modification_date;
+  unsigned int length;
 } File_Entry;
 
 /* Output a decoded representation of the .debug_line section.  */
@@ -2645,6 +3050,8 @@ display_debug_lines_decoded (struct dwarf_section *section,
                             unsigned char *data,
                             unsigned char *end)
 {
+  static DWARF2_Internal_LineInfo saved_linfo;
+
   printf (_("Decoded dump of debug contents of section %s:\n\n"),
           section->name);
 
@@ -2654,192 +3061,138 @@ display_debug_lines_decoded (struct dwarf_section *section,
       DWARF2_Internal_LineInfo linfo;
       unsigned char *standard_opcodes;
       unsigned char *end_of_sequence;
-      unsigned char *hdrptr;
-      int initial_length_size;
-      int offset_size;
       int i;
       File_Entry *file_table = NULL;
+      unsigned int n_files = 0;
       unsigned char **directory_table = NULL;
+      unsigned int n_directories = 0;
 
-      hdrptr = data;
-
-      /* Extract information from the Line Number Program Header.
-        (section 6.2.4 in the Dwarf3 doc).  */
-
-      /* Get the length of this CU's line number information block.  */
-      linfo.li_length = byte_get (hdrptr, 4);
-      hdrptr += 4;
-
-      if (linfo.li_length == 0xffffffff)
+      if (const_strneq (section->name, ".debug_line.")
+         /* Note: the following does not apply to .debug_line.dwo sections.
+            These are full debug_line sections.  */
+         && strcmp (section->name, ".debug_line.dwo") != 0)
         {
-          /* This section is 64-bit DWARF 3.  */
-          linfo.li_length = byte_get (hdrptr, 8);
-          hdrptr += 8;
-          offset_size = 8;
-          initial_length_size = 12;
+         /* See comment in display_debug_lines_raw().  */
+         end_of_sequence = end;
+         standard_opcodes = NULL;
+         linfo = saved_linfo;
+         reset_state_machine (linfo.li_default_is_stmt);
         }
       else
         {
-          offset_size = 4;
-          initial_length_size = 4;
-        }
+         unsigned char *hdrptr;
 
-      if (linfo.li_length + initial_length_size > section->size)
-        {
-          warn (_("The line info appears to be corrupt - "
-                  "the section is too small\n"));
-          return 0;
-        }
+         if ((hdrptr = read_debug_line_header (section, data, end, & linfo,
+                                               & end_of_sequence)) == NULL)
+             return 0;
 
-      /* Get this CU's Line Number Block version number.  */
-      linfo.li_version = byte_get (hdrptr, 2);
-      hdrptr += 2;
-      if (linfo.li_version != 2
-         && linfo.li_version != 3
-         && linfo.li_version != 4)
-        {
-          warn (_("Only DWARF version 2, 3 and 4 line info is currently "
-                "supported.\n"));
-          return 0;
-        }
+         reset_state_machine (linfo.li_default_is_stmt);
 
-      linfo.li_prologue_length = byte_get (hdrptr, offset_size);
-      hdrptr += offset_size;
-      linfo.li_min_insn_length = byte_get (hdrptr, 1);
-      hdrptr++;
-      if (linfo.li_version >= 4)
-       {
-         linfo.li_max_ops_per_insn = byte_get (hdrptr, 1);
-         hdrptr++;
-         if (linfo.li_max_ops_per_insn == 0)
-           {
-             warn (_("Invalid maximum operations per insn.\n"));
-             return 0;
-           }
-       }
-      else
-       linfo.li_max_ops_per_insn = 1;
-      linfo.li_default_is_stmt = byte_get (hdrptr, 1);
-      hdrptr++;
-      linfo.li_line_base = byte_get (hdrptr, 1);
-      hdrptr++;
-      linfo.li_line_range = byte_get (hdrptr, 1);
-      hdrptr++;
-      linfo.li_opcode_base = byte_get (hdrptr, 1);
-      hdrptr++;
-
-      /* Sign extend the line base field.  */
-      linfo.li_line_base <<= 24;
-      linfo.li_line_base >>= 24;
-
-      /* Find the end of this CU's Line Number Information Block.  */
-      end_of_sequence = data + linfo.li_length + initial_length_size;
-
-      reset_state_machine (linfo.li_default_is_stmt);
-
-      /* Save a pointer to the contents of the Opcodes table.  */
-      standard_opcodes = hdrptr;
-
-      /* Traverse the Directory table just to count entries.  */
-      data = standard_opcodes + linfo.li_opcode_base - 1;
-      if (*data != 0)
-        {
-          unsigned int n_directories = 0;
-          unsigned char *ptr_directory_table = data;
+         /* Save a pointer to the contents of the Opcodes table.  */
+         standard_opcodes = hdrptr;
 
-         while (*data != 0)
+         /* Traverse the Directory table just to count entries.  */
+         data = standard_opcodes + linfo.li_opcode_base - 1;
+         if (*data != 0)
            {
-             data += strlen ((char *) data) + 1;
-             n_directories++;
-           }
+             unsigned char *ptr_directory_table = data;
 
-          /* Go through the directory table again to save the directories.  */
-          directory_table = (unsigned char **)
-              xmalloc (n_directories * sizeof (unsigned char *));
+             while (*data != 0)
+               {
+                 data += strnlen ((char *) data, end - data) + 1;
+                 n_directories++;
+               }
 
-          i = 0;
-          while (*ptr_directory_table != 0)
-            {
-              directory_table[i] = ptr_directory_table;
-              ptr_directory_table += strlen ((char *) ptr_directory_table) + 1;
-              i++;
-            }
-        }
-      /* Skip the NUL at the end of the table.  */
-      data++;
+             /* Go through the directory table again to save the directories.  */
+             directory_table = (unsigned char **)
+               xmalloc (n_directories * sizeof (unsigned char *));
 
-      /* Traverse the File Name table just to count the entries.  */
-      if (*data != 0)
-        {
-          unsigned int n_files = 0;
-          unsigned char *ptr_file_name_table = data;
+             i = 0;
+             while (*ptr_directory_table != 0)
+               {
+                 directory_table[i] = ptr_directory_table;
+                 ptr_directory_table += strnlen ((char *) ptr_directory_table,
+                                                 ptr_directory_table - end) + 1;
+                 i++;
+               }
+           }
+         /* Skip the NUL at the end of the table.  */
+         data++;
 
-          while (*data != 0)
-            {
-             unsigned int bytes_read;
+         /* Traverse the File Name table just to count the entries.  */
+         if (*data != 0)
+           {
+             unsigned char *ptr_file_name_table = data;
 
-              /* Skip Name, directory index, last modification time and length
-                 of file.  */
-              data += strlen ((char *) data) + 1;
-              read_leb128 (data, & bytes_read, 0);
-              data += bytes_read;
-              read_leb128 (data, & bytes_read, 0);
-              data += bytes_read;
-              read_leb128 (data, & bytes_read, 0);
-              data += bytes_read;
-
-              n_files++;
-            }
+             while (*data != 0)
+               {
+                 unsigned int bytes_read;
 
-          /* Go through the file table again to save the strings.  */
-          file_table = (File_Entry *) xmalloc (n_files * sizeof (File_Entry));
+                 /* Skip Name, directory index, last modification time and length
+                    of file.  */
+                 data += strnlen ((char *) data, end - data) + 1;
+                 read_uleb128 (data, & bytes_read, end);
+                 data += bytes_read;
+                 read_uleb128 (data, & bytes_read, end);
+                 data += bytes_read;
+                 read_uleb128 (data, & bytes_read, end);
+                 data += bytes_read;
 
-          i = 0;
-          while (*ptr_file_name_table != 0)
-            {
-              unsigned int bytes_read;
-
-              file_table[i].name = ptr_file_name_table;
-              ptr_file_name_table += strlen ((char *) ptr_file_name_table) + 1;
-
-              /* We are not interested in directory, time or size.  */
-              file_table[i].directory_index = read_leb128 (ptr_file_name_table,
-                                                           & bytes_read, 0);
-              ptr_file_name_table += bytes_read;
-              file_table[i].modification_date = read_leb128 (ptr_file_name_table,
-                                                            & bytes_read, 0);
-              ptr_file_name_table += bytes_read;
-              file_table[i].length = read_leb128 (ptr_file_name_table, & bytes_read, 0);
-              ptr_file_name_table += bytes_read;
-              i++;
-            }
-          i = 0;
+                 n_files++;
+               }
 
-          /* Print the Compilation Unit's name and a header.  */
-          if (directory_table == NULL)
-            {
-              printf (_("CU: %s:\n"), file_table[0].name);
-              printf (_("File name                            Line number    Starting address\n"));
-            }
-          else
-            {
-              if (do_wide || strlen ((char *) directory_table[0]) < 76)
-                {
-                  printf (_("CU: %s/%s:\n"), directory_table[0],
-                          file_table[0].name);
-                }
-              else
-                {
-                  printf (_("%s:\n"), file_table[0].name);
-                }
-              printf (_("File name                            Line number    Starting address\n"));
-            }
-        }
+             /* Go through the file table again to save the strings.  */
+             file_table = (File_Entry *) xmalloc (n_files * sizeof (File_Entry));
 
-      /* Skip the NUL at the end of the table.  */
-      data++;
+             i = 0;
+             while (*ptr_file_name_table != 0)
+               {
+                 unsigned int bytes_read;
+
+                 file_table[i].name = ptr_file_name_table;
+                 ptr_file_name_table += strnlen ((char *) ptr_file_name_table,
+                                                 end - ptr_file_name_table) + 1;
+
+                 /* We are not interested in directory, time or size.  */
+                 file_table[i].directory_index = read_uleb128 (ptr_file_name_table,
+                                                               & bytes_read, end);
+                 ptr_file_name_table += bytes_read;
+                 file_table[i].modification_date = read_uleb128 (ptr_file_name_table,
+                                                                 & bytes_read, end);
+                 ptr_file_name_table += bytes_read;
+                 file_table[i].length = read_uleb128 (ptr_file_name_table, & bytes_read, end);
+                 ptr_file_name_table += bytes_read;
+                 i++;
+               }
+             i = 0;
 
-      /* This loop iterates through the Dwarf Line Number Program.  */
+             /* Print the Compilation Unit's name and a header.  */
+             if (directory_table == NULL)
+               {
+                 printf (_("CU: %s:\n"), file_table[0].name);
+                 printf (_("File name                            Line number    Starting address\n"));
+               }
+             else
+               {
+                 unsigned int ix = file_table[0].directory_index;
+                 const char *directory = ix ? (char *)directory_table[ix - 1] : ".";
+
+                 if (do_wide || strlen (directory) < 76)
+                   printf (_("CU: %s/%s:\n"), directory, file_table[0].name);
+                 else
+                   printf ("%s:\n", file_table[0].name);
+
+                 printf (_("File name                            Line number    Starting address\n"));
+               }
+           }
+
+         /* Skip the NUL at the end of the table.  */
+         data++;
+
+         saved_linfo = linfo;
+       }
+
+      /* This loop iterates through the Dwarf Line Number Program.  */
       while (data < end_of_sequence)
         {
          unsigned char op_code;
@@ -2864,10 +3217,10 @@ display_debug_lines_decoded (struct dwarf_section *section,
                  state_machine_regs.address
                    += ((state_machine_regs.op_index + uladv)
                        / linfo.li_max_ops_per_insn)
-                      * linfo.li_min_insn_length;
+                   * linfo.li_min_insn_length;
                  state_machine_regs.op_index
                    = (state_machine_regs.op_index + uladv)
-                     % linfo.li_max_ops_per_insn;
+                   % linfo.li_max_ops_per_insn;
                }
 
               adv = (op_code % linfo.li_line_range) + linfo.li_line_base;
@@ -2875,170 +3228,194 @@ display_debug_lines_decoded (struct dwarf_section *section,
               is_special_opcode = 1;
             }
           else switch (op_code)
-            {
-            case DW_LNS_extended_op:
-              {
-                unsigned int ext_op_code_len;
-                unsigned char ext_op_code;
-                unsigned char *op_code_data = data;
-
-                ext_op_code_len = read_leb128 (op_code_data, &bytes_read, 0);
-                op_code_data += bytes_read;
-
-                if (ext_op_code_len == 0)
-                  {
-                    warn (_("badly formed extended line op encountered!\n"));
-                    break;
-                  }
-                ext_op_code_len += bytes_read;
-                ext_op_code = *op_code_data++;
-
-                switch (ext_op_code)
-                  {
-                  case DW_LNE_end_sequence:
-                    reset_state_machine (linfo.li_default_is_stmt);
-                    break;
-                  case DW_LNE_set_address:
-                    state_machine_regs.address =
-                    byte_get (op_code_data, ext_op_code_len - bytes_read - 1);
-                   state_machine_regs.op_index = 0;
-                    break;
-                  case DW_LNE_define_file:
-                    {
-                      unsigned int dir_index = 0;
-
-                      ++state_machine_regs.last_file_entry;
-                      op_code_data += strlen ((char *) op_code_data) + 1;
-                      dir_index = read_leb128 (op_code_data, & bytes_read, 0);
-                      op_code_data += bytes_read;
-                      read_leb128 (op_code_data, & bytes_read, 0);
-                      op_code_data += bytes_read;
-                      read_leb128 (op_code_data, & bytes_read, 0);
-
-                      printf (_("%s:\n"), directory_table[dir_index]);
-                      break;
-                    }
-                  default:
-                    printf (_("UNKNOWN: length %d\n"), ext_op_code_len - bytes_read);
-                    break;
-                  }
-                data += ext_op_code_len;
-                break;
-              }
-            case DW_LNS_copy:
-              break;
-
-            case DW_LNS_advance_pc:
-              uladv = read_leb128 (data, & bytes_read, 0);
-              data += bytes_read;
-             if (linfo.li_max_ops_per_insn == 1)
-               {
-                 uladv *= linfo.li_min_insn_length;
-                 state_machine_regs.address += uladv;
-               }
-             else
-               {
-                 state_machine_regs.address
-                   += ((state_machine_regs.op_index + uladv)
-                       / linfo.li_max_ops_per_insn)
-                      * linfo.li_min_insn_length;
-                 state_machine_regs.op_index
-                   = (state_machine_regs.op_index + uladv)
-                     % linfo.li_max_ops_per_insn;
-               }
-              break;
-
-            case DW_LNS_advance_line:
-              adv = read_leb128 (data, & bytes_read, 1);
-              data += bytes_read;
-              state_machine_regs.line += adv;
-              break;
-
-            case DW_LNS_set_file:
-              adv = read_leb128 (data, & bytes_read, 0);
-              data += bytes_read;
-              state_machine_regs.file = adv;
-              if (file_table[state_machine_regs.file - 1].directory_index == 0)
-                {
-                  /* If directory index is 0, that means current directory.  */
-                  printf (_("\n./%s:[++]\n"),
-                          file_table[state_machine_regs.file - 1].name);
-                }
-              else
-                {
-                  /* The directory index starts counting at 1.  */
-                  printf (_("\n%s/%s:\n"),
-                          directory_table[file_table[state_machine_regs.file - 1].directory_index - 1],
-                          file_table[state_machine_regs.file - 1].name);
-                }
-              break;
-
-            case DW_LNS_set_column:
-              uladv = read_leb128 (data, & bytes_read, 0);
-              data += bytes_read;
-              state_machine_regs.column = uladv;
-              break;
-
-            case DW_LNS_negate_stmt:
-              adv = state_machine_regs.is_stmt;
-              adv = ! adv;
-              state_machine_regs.is_stmt = adv;
-              break;
-
-            case DW_LNS_set_basic_block:
-              state_machine_regs.basic_block = 1;
-              break;
-
-            case DW_LNS_const_add_pc:
-             uladv = ((255 - linfo.li_opcode_base) / linfo.li_line_range);
-             if (linfo.li_max_ops_per_insn == 1)
-               {
-                 uladv *= linfo.li_min_insn_length;
-                 state_machine_regs.address += uladv;
-               }
-             else
-               {
-                 state_machine_regs.address
-                   += ((state_machine_regs.op_index + uladv)
-                       / linfo.li_max_ops_per_insn)
-                      * linfo.li_min_insn_length;
-                 state_machine_regs.op_index
-                   = (state_machine_regs.op_index + uladv)
-                     % linfo.li_max_ops_per_insn;
-               }
-              break;
-
-            case DW_LNS_fixed_advance_pc:
-              uladv = byte_get (data, 2);
-              data += 2;
-              state_machine_regs.address += uladv;
-             state_machine_regs.op_index = 0;
-              break;
-
-            case DW_LNS_set_prologue_end:
-              break;
-
-            case DW_LNS_set_epilogue_begin:
-              break;
-
-            case DW_LNS_set_isa:
-              uladv = read_leb128 (data, & bytes_read, 0);
-              data += bytes_read;
-              printf (_("  Set ISA to %lu\n"), uladv);
-              break;
-
-            default:
-              printf (_("  Unknown opcode %d with operands: "), op_code);
-
-              for (i = standard_opcodes[op_code - 1]; i > 0 ; --i)
-                {
-                  printf ("0x%lx%s", read_leb128 (data, &bytes_read, 0),
-                          i == 1 ? "" : ", ");
-                  data += bytes_read;
-                }
-              putchar ('\n');
-              break;
-            }
+                {
+                case DW_LNS_extended_op:
+                  {
+                    unsigned int ext_op_code_len;
+                    unsigned char ext_op_code;
+                    unsigned char *op_code_data = data;
+
+                    ext_op_code_len = read_uleb128 (op_code_data, &bytes_read,
+                                                    end_of_sequence);
+                    op_code_data += bytes_read;
+
+                    if (ext_op_code_len == 0)
+                      {
+                        warn (_("Badly formed extended line op encountered!\n"));
+                        break;
+                      }
+                    ext_op_code_len += bytes_read;
+                    ext_op_code = *op_code_data++;
+
+                    switch (ext_op_code)
+                      {
+                      case DW_LNE_end_sequence:
+                        reset_state_machine (linfo.li_default_is_stmt);
+                        break;
+                      case DW_LNE_set_address:
+                        SAFE_BYTE_GET_AND_INC (state_machine_regs.address,
+                                               op_code_data,
+                                               ext_op_code_len - bytes_read - 1,
+                                               end);
+                        state_machine_regs.op_index = 0;
+                        break;
+                      case DW_LNE_define_file:
+                        {
+                          file_table = (File_Entry *) xrealloc
+                            (file_table, (n_files + 1) * sizeof (File_Entry));
+
+                          ++state_machine_regs.last_file_entry;
+                          /* Source file name.  */
+                          file_table[n_files].name = op_code_data;
+                          op_code_data += strlen ((char *) op_code_data) + 1;
+                          /* Directory index.  */
+                          file_table[n_files].directory_index =
+                            read_uleb128 (op_code_data, & bytes_read,
+                                          end_of_sequence);
+                          op_code_data += bytes_read;
+                          /* Last modification time.  */
+                          file_table[n_files].modification_date =
+                            read_uleb128 (op_code_data, & bytes_read,
+                                          end_of_sequence);
+                          op_code_data += bytes_read;
+                          /* File length.  */
+                          file_table[n_files].length =
+                            read_uleb128 (op_code_data, & bytes_read,
+                                          end_of_sequence);
+
+                          n_files++;
+                          break;
+                        }
+                      case DW_LNE_set_discriminator:
+                      case DW_LNE_HP_set_sequence:
+                        /* Simply ignored.  */
+                        break;
+
+                      default:
+                        printf (_("UNKNOWN (%u): length %d\n"),
+                                ext_op_code, ext_op_code_len - bytes_read);
+                        break;
+                      }
+                    data += ext_op_code_len;
+                    break;
+                  }
+                case DW_LNS_copy:
+                  break;
+
+                case DW_LNS_advance_pc:
+                  uladv = read_uleb128 (data, & bytes_read, end);
+                  data += bytes_read;
+                  if (linfo.li_max_ops_per_insn == 1)
+                    {
+                      uladv *= linfo.li_min_insn_length;
+                      state_machine_regs.address += uladv;
+                    }
+                  else
+                    {
+                      state_machine_regs.address
+                        += ((state_machine_regs.op_index + uladv)
+                            / linfo.li_max_ops_per_insn)
+                        * linfo.li_min_insn_length;
+                      state_machine_regs.op_index
+                        = (state_machine_regs.op_index + uladv)
+                        % linfo.li_max_ops_per_insn;
+                    }
+                  break;
+
+                case DW_LNS_advance_line:
+                  adv = read_sleb128 (data, & bytes_read, end);
+                  data += bytes_read;
+                  state_machine_regs.line += adv;
+                  break;
+
+                case DW_LNS_set_file:
+                  adv = read_uleb128 (data, & bytes_read, end);
+                  data += bytes_read;
+                  state_machine_regs.file = adv;
+
+                  if (file_table == NULL)
+                    printf (_("\n [Use file table entry %d]\n"), state_machine_regs.file - 1);
+                  else if (file_table[state_machine_regs.file - 1].directory_index == 0)
+                    /* If directory index is 0, that means current directory.  */
+                    printf ("\n./%s:[++]\n",
+                            file_table[state_machine_regs.file - 1].name);
+                  else if (directory_table == NULL)
+                    printf (_("\n [Use directory table entry %d]\n"),
+                            file_table[state_machine_regs.file - 1].directory_index - 1);
+                  else
+                    /* The directory index starts counting at 1.  */
+                    printf ("\n%s/%s:\n",
+                            directory_table[file_table[state_machine_regs.file - 1].directory_index - 1],
+                            file_table[state_machine_regs.file - 1].name);
+                  break;
+
+                case DW_LNS_set_column:
+                  uladv = read_uleb128 (data, & bytes_read, end);
+                  data += bytes_read;
+                  state_machine_regs.column = uladv;
+                  break;
+
+                case DW_LNS_negate_stmt:
+                  adv = state_machine_regs.is_stmt;
+                  adv = ! adv;
+                  state_machine_regs.is_stmt = adv;
+                  break;
+
+                case DW_LNS_set_basic_block:
+                  state_machine_regs.basic_block = 1;
+                  break;
+
+                case DW_LNS_const_add_pc:
+                  uladv = ((255 - linfo.li_opcode_base) / linfo.li_line_range);
+                  if (linfo.li_max_ops_per_insn == 1)
+                    {
+                      uladv *= linfo.li_min_insn_length;
+                      state_machine_regs.address += uladv;
+                    }
+                  else
+                    {
+                      state_machine_regs.address
+                        += ((state_machine_regs.op_index + uladv)
+                            / linfo.li_max_ops_per_insn)
+                        * linfo.li_min_insn_length;
+                      state_machine_regs.op_index
+                        = (state_machine_regs.op_index + uladv)
+                        % linfo.li_max_ops_per_insn;
+                    }
+                  break;
+
+                case DW_LNS_fixed_advance_pc:
+                  SAFE_BYTE_GET_AND_INC (uladv, data, 2, end);
+                  state_machine_regs.address += uladv;
+                  state_machine_regs.op_index = 0;
+                  break;
+
+                case DW_LNS_set_prologue_end:
+                  break;
+
+                case DW_LNS_set_epilogue_begin:
+                  break;
+
+                case DW_LNS_set_isa:
+                  uladv = read_uleb128 (data, & bytes_read, end);
+                  data += bytes_read;
+                  printf (_("  Set ISA to %lu\n"), uladv);
+                  break;
+
+                default:
+                  printf (_("  Unknown opcode %d with operands: "), op_code);
+
+                  if (standard_opcodes != NULL)
+                    for (i = standard_opcodes[op_code - 1]; i > 0 ; --i)
+                      {
+                        printf ("0x%s%s", dwarf_vmatoa ("x", read_uleb128 (data,
+                                                                           &bytes_read, end)),
+                                i == 1 ? "" : ", ");
+                        data += bytes_read;
+                      }
+                  putchar ('\n');
+                  break;
+                }
 
           /* Only Special opcodes, DW_LNS_copy and DW_LNE_end_sequence adds a row
              to the DWARF address/line matrix.  */
@@ -3046,9 +3423,16 @@ display_debug_lines_decoded (struct dwarf_section *section,
              || (op_code == DW_LNS_copy))
             {
               const unsigned int MAX_FILENAME_LENGTH = 35;
-              char *fileName = (char *)file_table[state_machine_regs.file - 1].name;
+              char *fileName;
               char *newFileName = NULL;
-              size_t fileNameLength = strlen (fileName);
+              size_t fileNameLength;
+
+             if (file_table)
+               fileName = (char *) file_table[state_machine_regs.file - 1].name;
+             else
+               fileName = "<unknown>";
+
+             fileNameLength = strlen (fileName);
 
               if ((fileNameLength > MAX_FILENAME_LENGTH) && (!do_wide))
                 {
@@ -3067,24 +3451,24 @@ display_debug_lines_decoded (struct dwarf_section *section,
               if (!do_wide || (fileNameLength <= MAX_FILENAME_LENGTH))
                 {
                  if (linfo.li_max_ops_per_insn == 1)
-                   printf (_("%-35s  %11d  %#18lx\n"), newFileName,
-                           state_machine_regs.line,
+                   printf ("%-35s  %11d  %#18" DWARF_VMA_FMT "x\n",
+                           newFileName, state_machine_regs.line,
                            state_machine_regs.address);
                  else
-                   printf (_("%-35s  %11d  %#18lx[%d]\n"), newFileName,
-                           state_machine_regs.line,
+                   printf ("%-35s  %11d  %#18" DWARF_VMA_FMT "x[%d]\n",
+                           newFileName, state_machine_regs.line,
                            state_machine_regs.address,
                            state_machine_regs.op_index);
                 }
               else
                 {
                  if (linfo.li_max_ops_per_insn == 1)
-                   printf (_("%s  %11d  %#18lx\n"), newFileName,
-                           state_machine_regs.line,
+                   printf ("%s  %11d  %#18" DWARF_VMA_FMT "x\n",
+                           newFileName, state_machine_regs.line,
                            state_machine_regs.address);
                  else
-                   printf (_("%s  %11d  %#18lx[%d]\n"), newFileName,
-                           state_machine_regs.line,
+                   printf ("%s  %11d  %#18" DWARF_VMA_FMT "x[%d]\n",
+                           newFileName, state_machine_regs.line,
                            state_machine_regs.address,
                            state_machine_regs.op_index);
                 }
@@ -3095,10 +3479,21 @@ display_debug_lines_decoded (struct dwarf_section *section,
               free (newFileName);
             }
         }
-      free (file_table);
-      file_table = NULL;
-      free (directory_table);
-      directory_table = NULL;
+
+      if (file_table)
+       {
+         free (file_table);
+         file_table = NULL;
+         n_files = 0;
+       }
+
+      if (directory_table)
+       {
+         free (directory_table);
+         directory_table = NULL;
+         n_directories = 0;
+       }
+
       putchar ('\n');
     }
 
@@ -3143,9 +3538,29 @@ find_debug_info_for_offset (unsigned long offset)
   return NULL;
 }
 
+static const char *
+get_gdb_index_symbol_kind_name (gdb_index_symbol_kind kind)
+{
+  /* See gdb/gdb-index.h.  */
+  static const char * const kinds[] =
+  {
+    N_ ("no info"),
+    N_ ("type"),
+    N_ ("variable"),
+    N_ ("function"),
+    N_ ("other"),
+    N_ ("unused5"),
+    N_ ("unused6"),
+    N_ ("unused7")
+  };
+
+  return _ (kinds[kind]);
+}
+
 static int
-display_debug_pubnames (struct dwarf_section *section,
-                       void *file ATTRIBUTE_UNUSED)
+display_debug_pubnames_worker (struct dwarf_section *section,
+                              void *file ATTRIBUTE_UNUSED,
+                              int is_gnu)
 {
   DWARF2_Internal_PubNames names;
   unsigned char *start = section->start;
@@ -3161,16 +3576,14 @@ display_debug_pubnames (struct dwarf_section *section,
     {
       unsigned char *data;
       unsigned long offset;
-      int offset_size, initial_length_size;
+      unsigned int offset_size, initial_length_size;
 
       data = start;
 
-      names.pn_length = byte_get (data, 4);
-      data += 4;
+      SAFE_BYTE_GET_AND_INC (names.pn_length, data, 4, end);
       if (names.pn_length == 0xffffffff)
        {
-         names.pn_length = byte_get (data, 8);
-         data += 8;
+         SAFE_BYTE_GET_AND_INC (names.pn_length, data, 8, end);
          offset_size = 8;
          initial_length_size = 12;
        }
@@ -3180,20 +3593,16 @@ display_debug_pubnames (struct dwarf_section *section,
          initial_length_size = 4;
        }
 
-      names.pn_version = byte_get (data, 2);
-      data += 2;
-
-      names.pn_offset = byte_get (data, offset_size);
-      data += offset_size;
+      SAFE_BYTE_GET_AND_INC (names.pn_version, data, 2, end);
+      SAFE_BYTE_GET_AND_INC (names.pn_offset, data, offset_size, end);
 
       if (num_debug_info_entries != DEBUG_INFO_UNAVAILABLE
          && num_debug_info_entries > 0
          && find_debug_info_for_offset (names.pn_offset) == NULL)
        warn (_(".debug_info offset of 0x%lx in %s section does not point to a CU header.\n"),
-             names.pn_offset, section->name);
+             (unsigned long) names.pn_offset, section->name);
 
-      names.pn_size = byte_get (data, offset_size);
-      data += offset_size;
+      SAFE_BYTE_GET_AND_INC (names.pn_size, data, offset_size, end);
 
       start += names.pn_length + initial_length_size;
 
@@ -3211,25 +3620,60 @@ display_debug_pubnames (struct dwarf_section *section,
        }
 
       printf (_("  Length:                              %ld\n"),
-             names.pn_length);
+             (long) names.pn_length);
       printf (_("  Version:                             %d\n"),
              names.pn_version);
       printf (_("  Offset into .debug_info section:     0x%lx\n"),
-             names.pn_offset);
+             (unsigned long) names.pn_offset);
       printf (_("  Size of area in .debug_info section: %ld\n"),
-             names.pn_size);
+             (long) names.pn_size);
 
-      printf (_("\n    Offset\tName\n"));
+      if (is_gnu)
+       printf (_("\n    Offset  Kind          Name\n"));
+      else
+       printf (_("\n    Offset\tName\n"));
 
       do
        {
-         offset = byte_get (data, offset_size);
+         bfd_size_type maxprint;
+
+         SAFE_BYTE_GET (offset, data, offset_size, end);
 
          if (offset != 0)
            {
              data += offset_size;
-             printf ("    %-6lx\t%s\n", offset, data);
-             data += strlen ((char *) data) + 1;
+             if (data >= end)
+               break;
+             maxprint = (end - data) - 1;
+             
+             if (is_gnu)
+               {
+                 unsigned int kind_data;
+                 gdb_index_symbol_kind kind;
+                 const char *kind_name;
+                 int is_static;
+
+                 SAFE_BYTE_GET (kind_data, data, 1, end);
+                 data++;
+                 maxprint --;
+                 /* GCC computes the kind as the upper byte in the CU index
+                    word, and then right shifts it by the CU index size.
+                    Left shift KIND to where the gdb-index.h accessor macros
+                    can use it.  */
+                 kind_data <<= GDB_INDEX_CU_BITSIZE;
+                 kind = GDB_INDEX_SYMBOL_KIND_VALUE (kind_data);
+                 kind_name = get_gdb_index_symbol_kind_name (kind);
+                 is_static = GDB_INDEX_SYMBOL_STATIC_VALUE (kind_data);
+                 printf ("    %-6lx  %s,%-10s  %.*s\n",
+                         offset, is_static ? _("s") : _("g"),
+                         kind_name, (int) maxprint, data);
+               }
+             else
+               printf ("    %-6lx\t%.*s\n", offset, (int) maxprint, data);
+
+             data += strnlen ((char *) data, maxprint) + 1;
+             if (data >= end)
+               break;
            }
        }
       while (offset != 0);
@@ -3240,6 +3684,18 @@ display_debug_pubnames (struct dwarf_section *section,
 }
 
 static int
+display_debug_pubnames (struct dwarf_section *section, void *file)
+{
+  return display_debug_pubnames_worker (section, file, 0);
+}
+
+static int
+display_debug_gnu_pubnames (struct dwarf_section *section, void *file)
+{
+  return display_debug_pubnames_worker (section, file, 1);
+}
+
+static int
 display_debug_macinfo (struct dwarf_section *section,
                       void *file ATTRIBUTE_UNUSED)
 {
@@ -3254,7 +3710,7 @@ display_debug_macinfo (struct dwarf_section *section,
   while (curr < end)
     {
       unsigned int lineno;
-      const char *string;
+      const unsigned char *string;
 
       op = (enum dwarf_macinfo_record_type) *curr;
       curr++;
@@ -3265,9 +3721,9 @@ display_debug_macinfo (struct dwarf_section *section,
          {
            unsigned int filenum;
 
-           lineno = read_leb128 (curr, & bytes_read, 0);
+           lineno = read_uleb128 (curr, & bytes_read, end);
            curr += bytes_read;
-           filenum = read_leb128 (curr, & bytes_read, 0);
+           filenum = read_uleb128 (curr, & bytes_read, end);
            curr += bytes_read;
 
            printf (_(" DW_MACINFO_start_file - lineno: %d filenum: %d\n"),
@@ -3280,19 +3736,19 @@ display_debug_macinfo (struct dwarf_section *section,
          break;
 
        case DW_MACINFO_define:
-         lineno = read_leb128 (curr, & bytes_read, 0);
+         lineno = read_uleb128 (curr, & bytes_read, end);
          curr += bytes_read;
-         string = (char *) curr;
-         curr += strlen (string) + 1;
+         string = curr;
+         curr += strnlen ((char *) string, end - string) + 1;
          printf (_(" DW_MACINFO_define - lineno : %d macro : %s\n"),
                  lineno, string);
          break;
 
        case DW_MACINFO_undef:
-         lineno = read_leb128 (curr, & bytes_read, 0);
+         lineno = read_uleb128 (curr, & bytes_read, end);
          curr += bytes_read;
-         string = (char *) curr;
-         curr += strlen (string) + 1;
+         string = curr;
+         curr += strnlen ((char *) string, end - string) + 1;
          printf (_(" DW_MACINFO_undef - lineno : %d macro : %s\n"),
                  lineno, string);
          break;
@@ -3301,10 +3757,10 @@ display_debug_macinfo (struct dwarf_section *section,
          {
            unsigned int constant;
 
-           constant = read_leb128 (curr, & bytes_read, 0);
+           constant = read_uleb128 (curr, & bytes_read, end);
            curr += bytes_read;
-           string = (char *) curr;
-           curr += strlen (string) + 1;
+           string = curr;
+           curr += strnlen ((char *) string, end - string) + 1;
            printf (_(" DW_MACINFO_vendor_ext - constant : %d string : %s\n"),
                    constant, string);
          }
@@ -3315,6 +3771,349 @@ display_debug_macinfo (struct dwarf_section *section,
   return 1;
 }
 
+/* Given LINE_OFFSET into the .debug_line section, attempt to return
+   filename and dirname corresponding to file name table entry with index
+   FILEIDX.  Return NULL on failure.  */
+
+static unsigned char *
+get_line_filename_and_dirname (dwarf_vma line_offset,
+                              dwarf_vma fileidx,
+                              unsigned char **dir_name)
+{
+  struct dwarf_section *section = &debug_displays [line].section;
+  unsigned char *hdrptr, *dirtable, *file_name;
+  unsigned int offset_size, initial_length_size;
+  unsigned int version, opcode_base, bytes_read;
+  dwarf_vma length, diridx;
+  const unsigned char * end;
+
+  *dir_name = NULL;
+  if (section->start == NULL
+      || line_offset >= section->size
+      || fileidx == 0)
+    return NULL;
+
+  hdrptr = section->start + line_offset;
+  end = section->start + section->size;
+
+  SAFE_BYTE_GET_AND_INC (length, hdrptr, 4, end);
+  if (length == 0xffffffff)
+    {
+      /* This section is 64-bit DWARF 3.  */
+      SAFE_BYTE_GET_AND_INC (length, hdrptr, 8, end);
+      offset_size = 8;
+      initial_length_size = 12;
+    }
+  else
+    {
+      offset_size = 4;
+      initial_length_size = 4;
+    }
+  if (length + initial_length_size > section->size)
+    return NULL;
+
+  SAFE_BYTE_GET_AND_INC (version, hdrptr, 2, end);
+  if (version != 2 && version != 3 && version != 4)
+    return NULL;
+  hdrptr += offset_size + 1;/* Skip prologue_length and min_insn_length.  */
+  if (version >= 4)
+    hdrptr++;              /* Skip max_ops_per_insn.  */
+  hdrptr += 3;             /* Skip default_is_stmt, line_base, line_range.  */
+
+  SAFE_BYTE_GET_AND_INC (opcode_base, hdrptr, 1, end);
+  if (opcode_base == 0)
+    return NULL;
+
+  hdrptr += opcode_base - 1;
+  dirtable = hdrptr;
+  /* Skip over dirname table.  */
+  while (*hdrptr != '\0')
+    hdrptr += strnlen ((char *) hdrptr, end - hdrptr) + 1;
+  hdrptr++;                /* Skip the NUL at the end of the table.  */
+  /* Now skip over preceding filename table entries.  */
+  for (; *hdrptr != '\0' && fileidx > 1; fileidx--)
+    {
+      hdrptr += strnlen ((char *) hdrptr, end - hdrptr) + 1;
+      read_uleb128 (hdrptr, &bytes_read, end);
+      hdrptr += bytes_read;
+      read_uleb128 (hdrptr, &bytes_read, end);
+      hdrptr += bytes_read;
+      read_uleb128 (hdrptr, &bytes_read, end);
+      hdrptr += bytes_read;
+    }
+  if (hdrptr == end || *hdrptr == '\0')
+    return NULL;
+  file_name = hdrptr;
+  hdrptr += strnlen ((char *) hdrptr, end - hdrptr) + 1;
+  diridx = read_uleb128 (hdrptr, &bytes_read, end);
+  if (diridx == 0)
+    return file_name;
+  for (; *dirtable != '\0' && diridx > 1; diridx--)
+    dirtable += strnlen ((char *) dirtable, end - dirtable) + 1;
+  if (*dirtable == '\0')
+    return NULL;
+  *dir_name = dirtable;
+  return file_name;
+}
+
+static int
+display_debug_macro (struct dwarf_section *section,
+                    void *file)
+{
+  unsigned char *start = section->start;
+  unsigned char *end = start + section->size;
+  unsigned char *curr = start;
+  unsigned char *extended_op_buf[256];
+  unsigned int bytes_read;
+
+  load_debug_section (str, file);
+  load_debug_section (line, file);
+
+  printf (_("Contents of the %s section:\n\n"), section->name);
+
+  while (curr < end)
+    {
+      unsigned int lineno, version, flags;
+      unsigned int offset_size = 4;
+      const unsigned char *string;
+      dwarf_vma line_offset = 0, sec_offset = curr - start, offset;
+      unsigned char **extended_ops = NULL;
+
+      SAFE_BYTE_GET_AND_INC (version, curr, 2, end);
+      if (version != 4)
+       {
+         error (_("Only GNU extension to DWARF 4 of %s is currently supported.\n"),
+                section->name);
+         return 0;
+       }
+
+      SAFE_BYTE_GET_AND_INC (flags, curr, 1, end);
+      if (flags & 1)
+       offset_size = 8;
+      printf (_("  Offset:                      0x%lx\n"),
+             (unsigned long) sec_offset);
+      printf (_("  Version:                     %d\n"), version);
+      printf (_("  Offset size:                 %d\n"), offset_size);
+      if (flags & 2)
+       {
+         SAFE_BYTE_GET_AND_INC (line_offset, curr, offset_size, end);
+         printf (_("  Offset into .debug_line:     0x%lx\n"),
+                 (unsigned long) line_offset);
+       }
+      if (flags & 4)
+       {
+         unsigned int i, count, op;
+         dwarf_vma nargs, n;
+
+         SAFE_BYTE_GET_AND_INC (count, curr, 1, end);
+
+         memset (extended_op_buf, 0, sizeof (extended_op_buf));
+         extended_ops = extended_op_buf;
+         if (count)
+           {
+             printf (_("  Extension opcode arguments:\n"));
+             for (i = 0; i < count; i++)
+               {
+                 SAFE_BYTE_GET_AND_INC (op, curr, 1, end);
+                 extended_ops[op] = curr;
+                 nargs = read_uleb128 (curr, &bytes_read, end);
+                 curr += bytes_read;
+                 if (nargs == 0)
+                   printf (_("    DW_MACRO_GNU_%02x has no arguments\n"), op);
+                 else
+                   {
+                     printf (_("    DW_MACRO_GNU_%02x arguments: "), op);
+                     for (n = 0; n < nargs; n++)
+                       {
+                         unsigned int form;
+
+                         SAFE_BYTE_GET_AND_INC (form, curr, 1, end);
+                         printf ("%s%s", get_FORM_name (form),
+                                 n == nargs - 1 ? "\n" : ", ");
+                         switch (form)
+                           {
+                           case DW_FORM_data1:
+                           case DW_FORM_data2:
+                           case DW_FORM_data4:
+                           case DW_FORM_data8:
+                           case DW_FORM_sdata:
+                           case DW_FORM_udata:
+                           case DW_FORM_block:
+                           case DW_FORM_block1:
+                           case DW_FORM_block2:
+                           case DW_FORM_block4:
+                           case DW_FORM_flag:
+                           case DW_FORM_string:
+                           case DW_FORM_strp:
+                           case DW_FORM_sec_offset:
+                             break;
+                           default:
+                             error (_("Invalid extension opcode form %s\n"),
+                                    get_FORM_name (form));
+                             return 0;
+                           }
+                       }
+                   }
+               }
+           }
+       }
+      printf ("\n");
+
+      while (1)
+       {
+         unsigned int op;
+
+         if (curr >= end)
+           {
+             error (_(".debug_macro section not zero terminated\n"));
+             return 0;
+           }
+
+         SAFE_BYTE_GET_AND_INC (op, curr, 1, end);
+         if (op == 0)
+           break;
+
+         switch (op)
+           {
+           case DW_MACRO_GNU_start_file:
+             {
+               unsigned int filenum;
+               unsigned char *file_name = NULL, *dir_name = NULL;
+
+               lineno = read_uleb128 (curr, &bytes_read, end);
+               curr += bytes_read;
+               filenum = read_uleb128 (curr, &bytes_read, end);
+               curr += bytes_read;
+
+               if ((flags & 2) == 0)
+                 error (_("DW_MACRO_GNU_start_file used, but no .debug_line offset provided.\n"));
+               else
+                 file_name
+                   = get_line_filename_and_dirname (line_offset, filenum,
+                                                    &dir_name);
+               if (file_name == NULL)
+                 printf (_(" DW_MACRO_GNU_start_file - lineno: %d filenum: %d\n"),
+                         lineno, filenum);
+               else
+                 printf (_(" DW_MACRO_GNU_start_file - lineno: %d filenum: %d filename: %s%s%s\n"),
+                         lineno, filenum,
+                         dir_name != NULL ? (const char *) dir_name : "",
+                         dir_name != NULL ? "/" : "", file_name);
+             }
+             break;
+
+           case DW_MACRO_GNU_end_file:
+             printf (_(" DW_MACRO_GNU_end_file\n"));
+             break;
+
+           case DW_MACRO_GNU_define:
+             lineno = read_uleb128 (curr, &bytes_read, end);
+             curr += bytes_read;
+             string = curr;
+             curr += strnlen ((char *) string, end - string) + 1;
+             printf (_(" DW_MACRO_GNU_define - lineno : %d macro : %s\n"),
+                     lineno, string);
+             break;
+
+           case DW_MACRO_GNU_undef:
+             lineno = read_uleb128 (curr, &bytes_read, end);
+             curr += bytes_read;
+             string = curr;
+             curr += strnlen ((char *) string, end - string) + 1;
+             printf (_(" DW_MACRO_GNU_undef - lineno : %d macro : %s\n"),
+                     lineno, string);
+             break;
+
+           case DW_MACRO_GNU_define_indirect:
+             lineno = read_uleb128 (curr, &bytes_read, end);
+             curr += bytes_read;
+             SAFE_BYTE_GET_AND_INC (offset, curr, offset_size, end);
+             string = fetch_indirect_string (offset);
+             printf (_(" DW_MACRO_GNU_define_indirect - lineno : %d macro : %s\n"),
+                     lineno, string);
+             break;
+
+           case DW_MACRO_GNU_undef_indirect:
+             lineno = read_uleb128 (curr, &bytes_read, end);
+             curr += bytes_read;
+             SAFE_BYTE_GET_AND_INC (offset, curr, offset_size, end);
+             string = fetch_indirect_string (offset);
+             printf (_(" DW_MACRO_GNU_undef_indirect - lineno : %d macro : %s\n"),
+                     lineno, string);
+             break;
+
+           case DW_MACRO_GNU_transparent_include:
+             SAFE_BYTE_GET_AND_INC (offset, curr, offset_size, end);
+             printf (_(" DW_MACRO_GNU_transparent_include - offset : 0x%lx\n"),
+                     (unsigned long) offset);
+             break;
+
+           case DW_MACRO_GNU_define_indirect_alt:
+             lineno = read_uleb128 (curr, &bytes_read, end);
+             curr += bytes_read;
+             SAFE_BYTE_GET_AND_INC (offset, curr, offset_size, end);
+             printf (_(" DW_MACRO_GNU_define_indirect_alt - lineno : %d macro offset : 0x%lx\n"),
+                     lineno, (unsigned long) offset);
+             break;
+
+           case DW_MACRO_GNU_undef_indirect_alt:
+             lineno = read_uleb128 (curr, &bytes_read, end);
+             curr += bytes_read;
+             SAFE_BYTE_GET_AND_INC (offset, curr, offset_size, end);
+             printf (_(" DW_MACRO_GNU_undef_indirect_alt - lineno : %d macro offset : 0x%lx\n"),
+                     lineno, (unsigned long) offset);
+             break;
+
+           case DW_MACRO_GNU_transparent_include_alt:
+             SAFE_BYTE_GET_AND_INC (offset, curr, offset_size, end);
+             printf (_(" DW_MACRO_GNU_transparent_include_alt - offset : 0x%lx\n"),
+                     (unsigned long) offset);
+             break;
+
+           default:
+             if (extended_ops == NULL || extended_ops[op] == NULL)
+               {
+                 error (_(" Unknown macro opcode %02x seen\n"), op);
+                 return 0;
+               }
+             else
+               {
+                 /* Skip over unhandled opcodes.  */
+                 dwarf_vma nargs, n;
+                 unsigned char *desc = extended_ops[op];
+                 nargs = read_uleb128 (desc, &bytes_read, end);
+                 desc += bytes_read;
+                 if (nargs == 0)
+                   {
+                     printf (_(" DW_MACRO_GNU_%02x\n"), op);
+                     break;
+                   }
+                 printf (_(" DW_MACRO_GNU_%02x -"), op);
+                 for (n = 0; n < nargs; n++)
+                   {
+                     int val;
+
+                     SAFE_BYTE_GET_AND_INC (val, desc, 1, end);
+                     curr
+                       = read_and_display_attr_value (0, val,
+                                                      curr, end, 0, 0, offset_size,
+                                                      version, NULL, 0, NULL,
+                                                      NULL);
+                     if (n != nargs - 1)
+                       printf (",");
+                   }
+                 printf ("\n");
+               }
+             break;
+           }
+       }
+
+      printf ("\n");
+    }  
+
+  return 1;
+}
+
 static int
 display_debug_abbrev (struct dwarf_section *section,
                      void *file ATTRIBUTE_UNUSED)
@@ -3325,44 +4124,294 @@ display_debug_abbrev (struct dwarf_section *section,
 
   printf (_("Contents of the %s section:\n\n"), section->name);
 
-  do
-    {
-      free_abbrevs ();
+  do
+    {
+      unsigned char *last;
+
+      free_abbrevs ();
+
+      last = start;
+      start = process_abbrev_section (start, end);
+
+      if (first_abbrev == NULL)
+       continue;
+
+      printf (_("  Number TAG (0x%lx)\n"), (long) (last - section->start));
+
+      for (entry = first_abbrev; entry; entry = entry->next)
+       {
+         abbrev_attr *attr;
+
+         printf ("   %ld      %s    [%s]\n",
+                 entry->entry,
+                 get_TAG_name (entry->tag),
+                 entry->children ? _("has children") : _("no children"));
+
+         for (attr = entry->first_attr; attr; attr = attr->next)
+           printf ("    %-18s %s\n",
+                   get_AT_name (attr->attribute),
+                   get_FORM_name (attr->form));
+       }
+    }
+  while (start);
+
+  printf ("\n");
+
+  return 1;
+}
+
+/* Display a location list from a normal (ie, non-dwo) .debug_loc section.  */
+
+static void
+display_loc_list (struct dwarf_section *section,
+                  unsigned char **start_ptr,
+                  int debug_info_entry,
+                  unsigned long offset,
+                  unsigned long base_address,
+                  int has_frame_base)
+{
+  unsigned char *start = *start_ptr;
+  unsigned char *section_end = section->start + section->size;
+  unsigned long cu_offset = debug_information [debug_info_entry].cu_offset;
+  unsigned int pointer_size = debug_information [debug_info_entry].pointer_size;
+  unsigned int offset_size = debug_information [debug_info_entry].offset_size;
+  int dwarf_version = debug_information [debug_info_entry].dwarf_version;
+
+  dwarf_vma begin;
+  dwarf_vma end;
+  unsigned short length;
+  int need_frame_base;
+
+  if (pointer_size < 2 || pointer_size > 8)
+    {
+      warn (_("Invalid pointer size (%d) in debug info for entry %d\n"),
+           pointer_size, debug_info_entry);
+      return;
+    }
+
+  while (1)
+    {
+      if (start + 2 * pointer_size > section_end)
+        {
+          warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
+                offset);
+          break;
+        }
+
+      printf ("    %8.8lx ", offset + (start - *start_ptr));
+
+      /* Note: we use sign extension here in order to be sure that we can detect
+         the -1 escape value.  Sign extension into the top 32 bits of a 32-bit
+         address will not affect the values that we display since we always show
+         hex values, and always the bottom 32-bits.  */
+      SAFE_BYTE_GET_AND_INC (begin, start, pointer_size, section_end);
+      SAFE_BYTE_GET_AND_INC (end, start, pointer_size, section_end);
+
+      if (begin == 0 && end == 0)
+        {
+          printf (_("<End of list>\n"));
+          break;
+        }
+
+      /* Check base address specifiers.  */
+      if (begin == (dwarf_vma) -1 && end != (dwarf_vma) -1)
+        {
+          base_address = end;
+          print_dwarf_vma (begin, pointer_size);
+          print_dwarf_vma (end, pointer_size);
+          printf (_("(base address)\n"));
+          continue;
+        }
+
+      if (start + 2 > section_end)
+        {
+          warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
+                offset);
+          break;
+        }
+
+      SAFE_BYTE_GET_AND_INC (length, start, 2, section_end);
+
+      if (start + length > section_end)
+        {
+          warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
+                offset);
+          break;
+        }
+
+      print_dwarf_vma (begin + base_address, pointer_size);
+      print_dwarf_vma (end + base_address, pointer_size);
+
+      putchar ('(');
+      need_frame_base = decode_location_expression (start,
+                                                    pointer_size,
+                                                    offset_size,
+                                                    dwarf_version,
+                                                    length,
+                                                    cu_offset, section);
+      putchar (')');
+
+      if (need_frame_base && !has_frame_base)
+        printf (_(" [without DW_AT_frame_base]"));
+
+      if (begin == end)
+        fputs (_(" (start == end)"), stdout);
+      else if (begin > end)
+        fputs (_(" (start > end)"), stdout);
+
+      putchar ('\n');
+
+      start += length;
+    }
+
+  *start_ptr = start;
+}
+
+/* Print a .debug_addr table index in decimal, surrounded by square brackets,
+   right-adjusted in a field of length LEN, and followed by a space.  */
+
+static void
+print_addr_index (unsigned int idx, unsigned int len)
+{
+  static char buf[15];
+  snprintf (buf, sizeof (buf), "[%d]", idx);
+  printf ("%*s ", len, buf);
+}
+
+/* Display a location list from a .dwo section. It uses address indexes rather
+   than embedded addresses.  This code closely follows display_loc_list, but the
+   two are sufficiently different that combining things is very ugly.  */
+
+static void
+display_loc_list_dwo (struct dwarf_section *section,
+                      unsigned char **start_ptr,
+                      int debug_info_entry,
+                      unsigned long offset,
+                      int has_frame_base)
+{
+  unsigned char *start = *start_ptr;
+  unsigned char *section_end = section->start + section->size;
+  unsigned long cu_offset = debug_information [debug_info_entry].cu_offset;
+  unsigned int pointer_size = debug_information [debug_info_entry].pointer_size;
+  unsigned int offset_size = debug_information [debug_info_entry].offset_size;
+  int dwarf_version = debug_information [debug_info_entry].dwarf_version;
+  int entry_type;
+  unsigned short length;
+  int need_frame_base;
+  unsigned int idx;
+  unsigned int bytes_read;
+
+  if (pointer_size < 2 || pointer_size > 8)
+    {
+      warn (_("Invalid pointer size (%d) in debug info for entry %d\n"),
+           pointer_size, debug_info_entry);
+      return;
+    }
+
+  while (1)
+    {
+      printf ("    %8.8lx ", offset + (start - *start_ptr));
+
+      if (start >= section_end)
+        {
+          warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
+                offset);
+          break;
+        }
+
+      SAFE_BYTE_GET_AND_INC (entry_type, start, 1, section_end);
+      switch (entry_type)
+        {
+          case 0: /* A terminating entry.  */
+            *start_ptr = start;
+           printf (_("<End of list>\n"));
+            return;
+          case 1: /* A base-address entry.  */
+            idx = read_uleb128 (start, &bytes_read, section_end);
+            start += bytes_read;
+            print_addr_index (idx, 8);
+            printf ("         ");
+            printf (_("(base address selection entry)\n"));
+            continue;
+          case 2: /* A start/end entry.  */
+            idx = read_uleb128 (start, &bytes_read, section_end);
+            start += bytes_read;
+            print_addr_index (idx, 8);
+            idx = read_uleb128 (start, &bytes_read, section_end);
+            start += bytes_read;
+            print_addr_index (idx, 8);
+            break;
+          case 3: /* A start/length entry.  */
+            idx = read_uleb128 (start, &bytes_read, section_end);
+            start += bytes_read;
+            print_addr_index (idx, 8);
+           SAFE_BYTE_GET_AND_INC (idx, start, 4, section_end);
+            printf ("%08x ", idx);
+            break;
+          case 4: /* An offset pair entry.  */
+           SAFE_BYTE_GET_AND_INC (idx, start, 4, section_end);
+            printf ("%08x ", idx);
+           SAFE_BYTE_GET_AND_INC (idx, start, 4, section_end);
+            printf ("%08x ", idx);
+            break;
+          default:
+            warn (_("Unknown location list entry type 0x%x.\n"), entry_type);
+            *start_ptr = start;
+            return;
+        }
 
-      start = process_abbrev_section (start, end);
+      if (start + 2 > section_end)
+        {
+          warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
+                offset);
+          break;
+        }
 
-      if (first_abbrev == NULL)
-       continue;
+      SAFE_BYTE_GET_AND_INC (length, start, 2, section_end);
+      if (start + length > section_end)
+        {
+          warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
+                offset);
+          break;
+        }
 
-      printf (_("  Number TAG\n"));
+      putchar ('(');
+      need_frame_base = decode_location_expression (start,
+                                                    pointer_size,
+                                                    offset_size,
+                                                    dwarf_version,
+                                                    length,
+                                                    cu_offset, section);
+      putchar (')');
 
-      for (entry = first_abbrev; entry; entry = entry->next)
-       {
-         abbrev_attr *attr;
+      if (need_frame_base && !has_frame_base)
+        printf (_(" [without DW_AT_frame_base]"));
 
-         printf (_("   %ld      %s    [%s]\n"),
-                 entry->entry,
-                 get_TAG_name (entry->tag),
-                 entry->children ? _("has children") : _("no children"));
+      putchar ('\n');
 
-         for (attr = entry->first_attr; attr; attr = attr->next)
-           printf (_("    %-18s %s\n"),
-                   get_AT_name (attr->attribute),
-                   get_FORM_name (attr->form));
-       }
+      start += length;
     }
-  while (start);
 
-  printf ("\n");
+  *start_ptr = start;
+}
 
-  return 1;
+/* Sort array of indexes in ascending order of loc_offsets[idx].  */
+
+static dwarf_vma *loc_offsets;
+
+static int
+loc_offsets_compar (const void *ap, const void *bp)
+{
+  dwarf_vma a = loc_offsets[*(const unsigned int *) ap];
+  dwarf_vma b = loc_offsets[*(const unsigned int *) bp];
+
+  return (a > b) - (b > a);
 }
 
 static int
 display_debug_loc (struct dwarf_section *section, void *file)
 {
   unsigned char *start = section->start;
-  unsigned char *section_end;
   unsigned long bytes;
   unsigned char *section_begin = start;
   unsigned int num_loc_list = 0;
@@ -3370,12 +4419,18 @@ display_debug_loc (struct dwarf_section *section, void *file)
   unsigned int first = 0;
   unsigned int i;
   unsigned int j;
+  unsigned int k;
   int seen_first_offset = 0;
-  int use_debug_info = 1;
+  int locs_sorted = 1;
   unsigned char *next;
+  unsigned int *array = NULL;
+  const char *suffix = strrchr (section->name, '.');
+  int is_dwo = 0;
+
+  if (suffix && strcmp (suffix, ".dwo") == 0)
+    is_dwo = 1;
 
   bytes = section->size;
-  section_end = start + bytes;
 
   if (bytes == 0)
     {
@@ -3398,10 +4453,11 @@ display_debug_loc (struct dwarf_section *section, void *file)
       unsigned int num;
 
       num = debug_information [i].num_loc_offsets;
-      num_loc_list += num;
+      if (num > num_loc_list)
+       num_loc_list = num;
 
       /* Check if we can use `debug_information' directly.  */
-      if (use_debug_info && num != 0)
+      if (locs_sorted && num != 0)
        {
          if (!seen_first_offset)
            {
@@ -3419,7 +4475,7 @@ display_debug_loc (struct dwarf_section *section, void *file)
              if (last_offset >
                  debug_information [i].loc_offsets [j])
                {
-                 use_debug_info = 0;
+                 locs_sorted = 0;
                  break;
                }
              last_offset = debug_information [i].loc_offsets [j];
@@ -3427,47 +4483,46 @@ display_debug_loc (struct dwarf_section *section, void *file)
        }
     }
 
-  if (!use_debug_info)
-    /* FIXME: Should we handle this case?  */
-    error (_("Location lists in .debug_info section aren't in ascending order!\n"));
-
   if (!seen_first_offset)
     error (_("No location lists in .debug_info section!\n"));
 
-  /* DWARF sections under Mach-O have non-zero addresses.  */
   if (debug_information [first].num_loc_offsets > 0
-      && debug_information [first].loc_offsets [0] != section->address)
-    warn (_("Location lists in %s section start at 0x%lx\n"),
-         section->name, debug_information [first].loc_offsets [0]);
+      && debug_information [first].loc_offsets [0] != 0)
+    warn (_("Location lists in %s section start at 0x%s\n"),
+         section->name,
+         dwarf_vmatoa ("x", debug_information [first].loc_offsets [0]));
 
+  if (!locs_sorted)
+    array = (unsigned int *) xcmalloc (num_loc_list, sizeof (unsigned int));
   printf (_("Contents of the %s section:\n\n"), section->name);
   printf (_("    Offset   Begin    End      Expression\n"));
 
   seen_first_offset = 0;
   for (i = first; i < num_debug_info_entries; i++)
     {
-      dwarf_vma begin;
-      dwarf_vma end;
-      unsigned short length;
       unsigned long offset;
-      unsigned int pointer_size;
-      unsigned int offset_size;
-      int dwarf_version;
-      unsigned long cu_offset;
       unsigned long base_address;
-      int need_frame_base;
       int has_frame_base;
 
-      pointer_size = debug_information [i].pointer_size;
-      cu_offset = debug_information [i].cu_offset;
-      offset_size = debug_information [i].offset_size;
-      dwarf_version = debug_information [i].dwarf_version;
+      if (!locs_sorted)
+       {
+         for (k = 0; k < debug_information [i].num_loc_offsets; k++)
+           array[k] = k;
+         loc_offsets = debug_information [i].loc_offsets;
+         qsort (array, debug_information [i].num_loc_offsets,
+                sizeof (*array), loc_offsets_compar);
+       }
 
-      for (j = 0; j < debug_information [i].num_loc_offsets; j++)
+      for (k = 0; k < debug_information [i].num_loc_offsets; k++)
        {
+         j = locs_sorted ? k : array[k];
+         if (k
+             && debug_information [i].loc_offsets [locs_sorted
+                                                   ? k - 1 : array [k - 1]]
+                == debug_information [i].loc_offsets [j])
+           continue;
          has_frame_base = debug_information [i].have_frame_base [j];
-         /* DWARF sections under Mach-O have non-zero addresses.  */
-         offset = debug_information [i].loc_offsets [j] - section->address;
+         offset = debug_information [i].loc_offsets [j];
          next = section_begin + offset;
          base_address = debug_information [i].base_address;
 
@@ -3493,91 +4548,19 @@ display_debug_loc (struct dwarf_section *section, void *file)
              continue;
            }
 
-         while (1)
-           {
-             if (start + 2 * pointer_size > section_end)
-               {
-                 warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
-                       offset);
-                 break;
-               }
-
-             /* Note: we use sign extension here in order to be sure that
-                we can detect the -1 escape value.  Sign extension into the
-                top 32 bits of a 32-bit address will not affect the values
-                that we display since we always show hex values, and always
-                the bottom 32-bits.  */
-             begin = byte_get_signed (start, pointer_size);
-             start += pointer_size;
-             end = byte_get_signed (start, pointer_size);
-             start += pointer_size;
-
-             printf ("    %8.8lx ", offset);
-
-             if (begin == 0 && end == 0)
-               {
-                 printf (_("<End of list>\n"));
-                 break;
-               }
-
-             /* Check base address specifiers.  */
-             if (begin == (dwarf_vma) -1 && end != (dwarf_vma) -1)
-               {
-                 base_address = end;
-                 print_dwarf_vma (begin, pointer_size);
-                 print_dwarf_vma (end, pointer_size);
-                 printf (_("(base address)\n"));
-                 continue;
-               }
-
-             if (start + 2 > section_end)
-               {
-                 warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
-                       offset);
-                 break;
-               }
-
-             length = byte_get (start, 2);
-             start += 2;
-
-             if (start + length > section_end)
-               {
-                 warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
-                       offset);
-                 break;
-               }
-
-             print_dwarf_vma (begin + base_address, pointer_size);
-             print_dwarf_vma (end + base_address, pointer_size);
-
-             putchar ('(');
-             need_frame_base = decode_location_expression (start,
-                                                           pointer_size,
-                                                           offset_size,
-                                                           dwarf_version,
-                                                           length,
-                                                           cu_offset, section);
-             putchar (')');
-
-             if (need_frame_base && !has_frame_base)
-               printf (_(" [without DW_AT_frame_base]"));
-
-             if (begin == end)
-               fputs (_(" (start == end)"), stdout);
-             else if (begin > end)
-               fputs (_(" (start > end)"), stdout);
-
-             putchar ('\n');
-
-             start += length;
-           }
+          if (is_dwo)
+            display_loc_list_dwo (section, &start, i, offset, has_frame_base);
+          else
+            display_loc_list (section, &start, i, offset, base_address,
+                              has_frame_base);
        }
     }
 
-  if (start < section_end)
+  if (start < section->start + section->size)
     warn (_("There are %ld unused bytes at the end of section %s\n"),
-         (long) (section_end - start), section->name);
+         (long) (section->start + section->size - start), section->name);
   putchar ('\n');
+  free (array);
   return 1;
 }
 
@@ -3642,19 +4625,19 @@ display_debug_str (struct dwarf_section *section,
 static int
 display_debug_info (struct dwarf_section *section, void *file)
 {
-  return process_debug_info (section, file, abbrev, 0, 0);
+  return process_debug_info (section, file, section->abbrev_sec, 0, 0);
 }
 
 static int
 display_debug_types (struct dwarf_section *section, void *file)
 {
-  return process_debug_info (section, file, abbrev, 0, 1);
+  return process_debug_info (section, file, section->abbrev_sec, 0, 1);
 }
 
 static int
 display_trace_info (struct dwarf_section *section, void *file)
 {
-  return process_debug_info (section, file, trace_abbrev, 0, 0);
+  return process_debug_info (section, file, section->abbrev_sec, 0, 0);
 }
 
 static int
@@ -3679,18 +4662,15 @@ display_debug_aranges (struct dwarf_section *section,
       dwarf_vma address;
       unsigned char address_size;
       int excess;
-      int offset_size;
-      int initial_length_size;
+      unsigned int offset_size;
+      unsigned int initial_length_size;
 
       hdrptr = start;
 
-      arange.ar_length = byte_get (hdrptr, 4);
-      hdrptr += 4;
-
+      SAFE_BYTE_GET_AND_INC (arange.ar_length, hdrptr, 4, end);
       if (arange.ar_length == 0xffffffff)
        {
-         arange.ar_length = byte_get (hdrptr, 8);
-         hdrptr += 8;
+         SAFE_BYTE_GET_AND_INC (arange.ar_length, hdrptr, 8, end);
          offset_size = 8;
          initial_length_size = 12;
        }
@@ -3700,23 +4680,17 @@ display_debug_aranges (struct dwarf_section *section,
          initial_length_size = 4;
        }
 
-      arange.ar_version = byte_get (hdrptr, 2);
-      hdrptr += 2;
-
-      arange.ar_info_offset = byte_get (hdrptr, offset_size);
-      hdrptr += offset_size;
+      SAFE_BYTE_GET_AND_INC (arange.ar_version, hdrptr, 2, end);
+      SAFE_BYTE_GET_AND_INC (arange.ar_info_offset, hdrptr, offset_size, end);
 
       if (num_debug_info_entries != DEBUG_INFO_UNAVAILABLE
          && num_debug_info_entries > 0
          && find_debug_info_for_offset (arange.ar_info_offset) == NULL)
        warn (_(".debug_info offset of 0x%lx in %s section does not point to a CU header.\n"),
-             arange.ar_info_offset, section->name);
+             (unsigned long) arange.ar_info_offset, section->name);
 
-      arange.ar_pointer_size = byte_get (hdrptr, 1);
-      hdrptr += 1;
-
-      arange.ar_segment_size = byte_get (hdrptr, 1);
-      hdrptr += 1;
+      SAFE_BYTE_GET_AND_INC (arange.ar_pointer_size, hdrptr, 1, end);
+      SAFE_BYTE_GET_AND_INC (arange.ar_segment_size, hdrptr, 1, end);
 
       if (arange.ar_version != 2 && arange.ar_version != 3)
        {
@@ -3724,14 +4698,24 @@ display_debug_aranges (struct dwarf_section *section,
          break;
        }
 
-      printf (_("  Length:                   %ld\n"), arange.ar_length);
+      printf (_("  Length:                   %ld\n"),
+             (long) arange.ar_length);
       printf (_("  Version:                  %d\n"), arange.ar_version);
-      printf (_("  Offset into .debug_info:  0x%lx\n"), arange.ar_info_offset);
+      printf (_("  Offset into .debug_info:  0x%lx\n"),
+             (unsigned long) arange.ar_info_offset);
       printf (_("  Pointer Size:             %d\n"), arange.ar_pointer_size);
       printf (_("  Segment Size:             %d\n"), arange.ar_segment_size);
 
       address_size = arange.ar_pointer_size + arange.ar_segment_size;
 
+      /* PR 17512: file: 001-108546-0.001:0.1.  */
+      if (address_size == 0 || address_size > 8)
+       {
+         error (_("Invalid address size in %s section!\n"),
+                section->name);
+         break;
+       }
+
       /* The DWARF spec does not require that the address size be a power
         of two, but we do.  This will have to change if we ever encounter
         an uneven architecture.  */
@@ -3757,13 +4741,8 @@ display_debug_aranges (struct dwarf_section *section,
 
       while (addr_ranges + 2 * address_size <= start)
        {
-         address = byte_get (addr_ranges, address_size);
-
-         addr_ranges += address_size;
-
-         length  = byte_get (addr_ranges, address_size);
-
-         addr_ranges += address_size;
+         SAFE_BYTE_GET_AND_INC (address, addr_ranges, address_size, end);
+         SAFE_BYTE_GET_AND_INC (length, addr_ranges, address_size, end);
 
          printf ("    ");
          print_dwarf_vma (address, address_size);
@@ -3777,17 +4756,110 @@ display_debug_aranges (struct dwarf_section *section,
   return 1;
 }
 
+/* Comparison function for qsort.  */
+static int
+comp_addr_base (const void * v0, const void * v1)
+{
+  debug_info * info0 = (debug_info *) v0;
+  debug_info * info1 = (debug_info *) v1;
+  return info0->addr_base - info1->addr_base;
+}
+
+/* Display the debug_addr section.  */
+static int
+display_debug_addr (struct dwarf_section *section,
+                    void *file)
+{
+  debug_info **debug_addr_info;
+  unsigned char *entry;
+  unsigned char *end;
+  unsigned int i;
+  unsigned int count;
+
+  if (section->size == 0)
+    {
+      printf (_("\nThe %s section is empty.\n"), section->name);
+      return 0;
+    }
+
+  if (load_debug_info (file) == 0)
+    {
+      warn (_("Unable to load/parse the .debug_info section, so cannot interpret the %s section.\n"),
+           section->name);
+      return 0;
+    }
+
+  printf (_("Contents of the %s section:\n\n"), section->name);
+
+  debug_addr_info = (debug_info **) xmalloc ((num_debug_info_entries + 1)
+                                             * sizeof (debug_info *));
+
+  count = 0;
+  for (i = 0; i < num_debug_info_entries; i++)
+    {
+      if (debug_information [i].addr_base != DEBUG_INFO_UNAVAILABLE)
+        debug_addr_info [count++] = &debug_information [i];
+    }
+
+  /* Add a sentinel to make iteration convenient.  */
+  debug_addr_info [count] = (debug_info *) xmalloc (sizeof (debug_info));
+  debug_addr_info [count]->addr_base = section->size;
+
+  qsort (debug_addr_info, count, sizeof (debug_info *), comp_addr_base);
+  for (i = 0; i < count; i++)
+    {
+      unsigned int idx;
+      unsigned int address_size = debug_addr_info [i]->pointer_size;
+
+      printf (_("  For compilation unit at offset 0x%s:\n"),
+              dwarf_vmatoa ("x", debug_addr_info [i]->cu_offset));
+
+      printf (_("\tIndex\tAddress\n"));
+      entry = section->start + debug_addr_info [i]->addr_base;
+      end = section->start + debug_addr_info [i + 1]->addr_base;
+      idx = 0;
+      while (entry < end)
+        {
+          dwarf_vma base = byte_get (entry, address_size);
+          printf (_("\t%d:\t"), idx);
+          print_dwarf_vma (base, address_size);
+          printf ("\n");
+          entry += address_size;
+          idx++;
+        }
+    }
+  printf ("\n");
+
+  free (debug_addr_info);
+  return 1;
+}
+
+/* Display the .debug_str_offsets and .debug_str_offsets.dwo sections.  */
+static int
+display_debug_str_offsets (struct dwarf_section *section,
+                           void *file ATTRIBUTE_UNUSED)
+{
+  if (section->size == 0)
+    {
+      printf (_("\nThe %s section is empty.\n"), section->name);
+      return 0;
+    }
+  /* TODO: Dump the contents.  This is made somewhat difficult by not knowing
+     what the offset size is for this section.  */
+  return 1;
+}
+
 /* Each debug_information[x].range_lists[y] gets this representation for
    sorting purposes.  */
 
 struct range_entry
-  {
-    /* The debug_information[x].range_lists[y] value.  */
-    unsigned long ranges_offset;
+{
+  /* The debug_information[x].range_lists[y] value.  */
+  unsigned long ranges_offset;
 
-    /* Original debug_information to find parameters of the data.  */
-    debug_info *debug_info_p;
-  };
+  /* Original debug_information to find parameters of the data.  */
+  debug_info *debug_info_p;
+};
 
 /* Sort struct range_entry in ascending order of its RANGES_OFFSET.  */
 
@@ -3807,13 +4879,13 @@ display_debug_ranges (struct dwarf_section *section,
                      void *file ATTRIBUTE_UNUSED)
 {
   unsigned char *start = section->start;
-  unsigned long bytes;
+  unsigned char *last_start = start;
+  unsigned long bytes = section->size;
   unsigned char *section_begin = start;
+  unsigned char *finish = start + bytes;
   unsigned int num_range_list, i;
   struct range_entry *range_entries, *range_entry_fill;
 
-  bytes = section->size;
-
   if (bytes == 0)
     {
       printf (_("\nThe %s section is empty.\n"), section->name);
@@ -3832,7 +4904,12 @@ display_debug_ranges (struct dwarf_section *section,
     num_range_list += debug_information [i].num_range_lists;
 
   if (num_range_list == 0)
-    error (_("No range lists in .debug_info section!\n"));
+    {
+      /* This can happen when the file was compiled with -gsplit-debug
+         which removes references to range lists from the primary .o file.  */
+      printf (_("No range lists in .debug_info section.\n"));
+      return 1;
+    }
 
   range_entries = (struct range_entry *)
       xmalloc (sizeof (*range_entries) * num_range_list);
@@ -3854,8 +4931,7 @@ display_debug_ranges (struct dwarf_section *section,
   qsort (range_entries, num_range_list, sizeof (*range_entries),
         range_entry_compar);
 
-  /* DWARF sections under Mach-O have non-zero addresses.  */
-  if (range_entries[0].ranges_offset != section->address)
+  if (dwarf_check != 0 && range_entries[0].ranges_offset != 0)
     warn (_("Range lists in %s section start at 0x%lx\n"),
          section->name, range_entries[0].ranges_offset);
 
@@ -3872,26 +4948,37 @@ display_debug_ranges (struct dwarf_section *section,
       unsigned long base_address;
 
       pointer_size = debug_info_p->pointer_size;
-
-      /* DWARF sections under Mach-O have non-zero addresses.  */
-      offset = range_entry->ranges_offset - section->address;
+      offset = range_entry->ranges_offset;
       next = section_begin + offset;
       base_address = debug_info_p->base_address;
 
-      if (i > 0)
+      /* PR 17512: file: 001-101485-0.001:0.1.  */
+      if (pointer_size < 2 || pointer_size > 8)
+       {
+         warn (_("Corrupt pointer size (%d) in debug entry at offset %8.8lx\n"),
+               pointer_size, offset);
+         continue;
+       }
+      
+      if (dwarf_check != 0 && i > 0)
        {
          if (start < next)
            warn (_("There is a hole [0x%lx - 0x%lx] in %s section.\n"),
                  (unsigned long) (start - section_begin),
                  (unsigned long) (next - section_begin), section->name);
          else if (start > next)
-           warn (_("There is an overlap [0x%lx - 0x%lx] in %s section.\n"),
-                 (unsigned long) (start - section_begin),
-                 (unsigned long) (next - section_begin), section->name);
+           {
+             if (next == last_start)
+               continue;
+             warn (_("There is an overlap [0x%lx - 0x%lx] in %s section.\n"),
+                   (unsigned long) (start - section_begin),
+                   (unsigned long) (next - section_begin), section->name);
+           }
        }
       start = next;
+      last_start = next;
 
-      while (1)
+      while (start < finish)
        {
          dwarf_vma begin;
          dwarf_vma end;
@@ -3901,10 +4988,10 @@ display_debug_ranges (struct dwarf_section *section,
             top 32 bits of a 32-bit address will not affect the values
             that we display since we always show hex values, and always
             the bottom 32-bits.  */
-         begin = byte_get_signed (start, pointer_size);
-         start += pointer_size;
-         end = byte_get_signed (start, pointer_size);
-         start += pointer_size;
+         SAFE_BYTE_GET_AND_INC (begin, start, pointer_size, finish);
+         if (start >= finish)
+           break;
+         SAFE_SIGNED_BYTE_GET_AND_INC (end, start, pointer_size, finish);
 
          printf ("    %8.8lx ", offset);
 
@@ -3953,8 +5040,8 @@ typedef struct Frame_Chunk
   char *augmentation;
   unsigned int code_factor;
   int data_factor;
-  unsigned long pc_begin;
-  unsigned long pc_range;
+  dwarf_vma pc_begin;
+  dwarf_vma pc_range;
   int cfa_reg;
   int cfa_offset;
   int ra;
@@ -3991,6 +5078,14 @@ frame_need_space (Frame_Chunk *fc, unsigned int reg)
   fc->col_type = (short int *) xcrealloc (fc->col_type, fc->ncols,
                                           sizeof (short int));
   fc->col_offset = (int *) xcrealloc (fc->col_offset, fc->ncols, sizeof (int));
+  /* PR 17512: file:002-10025-0.005.  */ 
+  if (fc->col_type == NULL || fc->col_offset == NULL)
+    {
+      error (_("Out of memory allocating %u columns in dwarf frame arrays\n"),
+            fc->ncols);
+      fc->ncols = 0;
+      return -1;
+    }
 
   while (prev < fc->ncols)
     {
@@ -4003,19 +5098,26 @@ frame_need_space (Frame_Chunk *fc, unsigned int reg)
 
 static const char *const dwarf_regnames_i386[] =
 {
-  "eax", "ecx", "edx", "ebx",
-  "esp", "ebp", "esi", "edi",
-  "eip", "eflags", NULL,
-  "st0", "st1", "st2", "st3",
-  "st4", "st5", "st6", "st7",
-  NULL, NULL,
-  "xmm0", "xmm1", "xmm2", "xmm3",
-  "xmm4", "xmm5", "xmm6", "xmm7",
-  "mm0", "mm1", "mm2", "mm3",
-  "mm4", "mm5", "mm6", "mm7",
-  "fcw", "fsw", "mxcsr",
-  "es", "cs", "ss", "ds", "fs", "gs", NULL, NULL,
-  "tr", "ldtr"
+  "eax", "ecx", "edx", "ebx",                    /* 0 - 3  */
+  "esp", "ebp", "esi", "edi",                    /* 4 - 7  */
+  "eip", "eflags", NULL,                         /* 8 - 10  */
+  "st0", "st1", "st2", "st3",                    /* 11 - 14  */
+  "st4", "st5", "st6", "st7",                    /* 15 - 18  */
+  NULL, NULL,                                    /* 19 - 20  */
+  "xmm0", "xmm1", "xmm2", "xmm3",                /* 21 - 24  */
+  "xmm4", "xmm5", "xmm6", "xmm7",                /* 25 - 28  */
+  "mm0", "mm1", "mm2", "mm3",                    /* 29 - 32  */
+  "mm4", "mm5", "mm6", "mm7",                    /* 33 - 36  */
+  "fcw", "fsw", "mxcsr",                         /* 37 - 39  */
+  "es", "cs", "ss", "ds", "fs", "gs", NULL, NULL, /* 40 - 47  */
+  "tr", "ldtr",                                          /* 48 - 49  */
+  NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* 50 - 57  */
+  NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* 58 - 65  */
+  NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* 66 - 73  */
+  NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* 74 - 81  */
+  NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* 82 - 89  */
+  NULL, NULL, NULL,                              /* 90 - 92  */
+  "k0", "k1", "k2", "k3", "k4", "k5", "k6", "k7"  /* 93 - 100  */
 };
 
 void
@@ -4044,7 +5146,17 @@ static const char *const dwarf_regnames_x86_64[] =
   "es", "cs", "ss", "ds", "fs", "gs", NULL, NULL,
   "fs.base", "gs.base", NULL, NULL,
   "tr", "ldtr",
-  "mxcsr", "fcw", "fsw"
+  "mxcsr", "fcw", "fsw",
+  "xmm16",  "xmm17",  "xmm18",  "xmm19",
+  "xmm20",  "xmm21",  "xmm22",  "xmm23",
+  "xmm24",  "xmm25",  "xmm26",  "xmm27",
+  "xmm28",  "xmm29",  "xmm30",  "xmm31",
+  NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* 83 - 90  */
+  NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* 91 - 98  */
+  NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* 99 - 106  */
+  NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* 107 - 114  */
+  NULL, NULL, NULL,                              /* 115 - 117  */
+  "k0", "k1", "k2", "k3", "k4", "k5", "k6", "k7"
 };
 
 void
@@ -4054,6 +5166,29 @@ init_dwarf_regnames_x86_64 (void)
   dwarf_regnames_count = ARRAY_SIZE (dwarf_regnames_x86_64);
 }
 
+static const char *const dwarf_regnames_aarch64[] =
+{
+   "x0",  "x1",  "x2",  "x3",  "x4",  "x5",  "x6",  "x7", 
+   "x8",  "x9", "x10", "x11", "x12", "x13", "x14", "x15", 
+  "x16", "x17", "x18", "x19", "x20", "x21", "x22", "x23",
+  "x24", "x25", "x26", "x27", "x28", "x29", "x30", "sp",
+   NULL, "elr",  NULL,  NULL,  NULL,  NULL,  NULL,  NULL,
+   NULL,  NULL,  NULL,  NULL,  NULL,  NULL,  NULL,  NULL,
+   NULL,  NULL,  NULL,  NULL,  NULL,  NULL,  NULL,  NULL,
+   NULL,  NULL,  NULL,  NULL,  NULL,  NULL,  NULL,  NULL,
+   "v0",  "v1",  "v2",  "v3",  "v4",  "v5",  "v6",  "v7", 
+   "v8",  "v9", "v10", "v11", "v12", "v13", "v14", "v15", 
+  "v16", "v17", "v18", "v19", "v20", "v21", "v22", "v23",
+  "v24", "v25", "v26", "v27", "v28", "v29", "v30", "v31",
+};
+
+void
+init_dwarf_regnames_aarch64 (void)
+{
+  dwarf_regnames = dwarf_regnames_aarch64;
+  dwarf_regnames_count = ARRAY_SIZE (dwarf_regnames_aarch64);
+}
+
 void
 init_dwarf_regnames (unsigned int e_machine)
 {
@@ -4066,9 +5201,14 @@ init_dwarf_regnames (unsigned int e_machine)
 
     case EM_X86_64:
     case EM_L1OM:
+    case EM_K1OM:
       init_dwarf_regnames_x86_64 ();
       break;
 
+    case EM_AARCH64:
+      init_dwarf_regnames_aarch64 ();
+      break;
+
     default:
       break;
     }
@@ -4121,7 +5261,7 @@ frame_display_row (Frame_Chunk *fc, int *need_col_headers, int *max_regs)
       printf ("\n");
     }
 
-  printf ("%0*lx ", eh_addr_size * 2, fc->pc_begin);
+  print_dwarf_vma (fc->pc_begin, eh_addr_size);
   if (fc->cfa_exp)
     strcpy (tmp, "exp");
   else
@@ -4165,9 +5305,110 @@ frame_display_row (Frame_Chunk *fc, int *need_col_headers, int *max_regs)
   printf ("\n");
 }
 
-#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
+#define GET(VAR, N)    SAFE_BYTE_GET_AND_INC (VAR, start, N, end)
+#define LEB()  read_uleb128 (start, & length_return, end); start += length_return
+#define SLEB() read_sleb128 (start, & length_return, end); start += length_return
+
+static unsigned char *
+read_cie (unsigned char *start, unsigned char *end,
+         Frame_Chunk **p_cie, int *p_version,
+         unsigned long *p_aug_len, unsigned char **p_aug)
+{
+  int version;
+  Frame_Chunk *fc;
+  unsigned int length_return;
+  unsigned char *augmentation_data = NULL;
+  unsigned long augmentation_data_len = 0;
+
+  * p_cie = NULL;
+  /* PR 17512: file: 001-228113-0.004.  */
+  if (start >= end)
+    return end;
+
+  fc = (Frame_Chunk *) xmalloc (sizeof (Frame_Chunk));
+  memset (fc, 0, sizeof (Frame_Chunk));
+
+  fc->col_type = (short int *) xmalloc (sizeof (short int));
+  fc->col_offset = (int *) xmalloc (sizeof (int));
+
+  version = *start++;
+
+  fc->augmentation = (char *) start;
+  /* PR 17512: file: 001-228113-0.004.
+     Skip past augmentation name, but avoid running off the end of the data.  */
+  while (start < end)
+    if (* start ++ == '\0')
+      break;
+  if (start == end)
+    {
+      warn (_("No terminator for augmentation name\n"));
+      return start;
+    }
+
+  if (strcmp (fc->augmentation, "eh") == 0)
+    start += eh_addr_size;
+
+  if (version >= 4)
+    {
+      GET (fc->ptr_size, 1);
+      GET (fc->segment_size, 1);
+      eh_addr_size = fc->ptr_size;
+    }
+  else
+    {
+      fc->ptr_size = eh_addr_size;
+      fc->segment_size = 0;
+    }
+  fc->code_factor = LEB ();
+  fc->data_factor = SLEB ();
+  if (version == 1)
+    {
+      GET (fc->ra, 1);
+    }
+  else
+    {
+      fc->ra = LEB ();
+    }
+
+  if (fc->augmentation[0] == 'z')
+    {
+      augmentation_data_len = LEB ();
+      augmentation_data = start;
+      start += augmentation_data_len;
+    }
+
+  if (augmentation_data_len)
+    {
+      unsigned char *p, *q;
+      p = (unsigned char *) 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 if (*p == 'S')
+           ;
+         else
+           break;
+         p++;
+       }
+    }
+
+  *p_cie = fc;
+  if (p_version)
+    *p_version = version;
+  if (p_aug_len)
+    {
+      *p_aug_len = augmentation_data_len;
+      *p_aug = augmentation_data;
+    }
+  return start;
+}
 
 static int
 display_debug_frames (struct dwarf_section *section,
@@ -4176,7 +5417,7 @@ display_debug_frames (struct dwarf_section *section,
   unsigned char *start = section->start;
   unsigned char *end = start + section->size;
   unsigned char *section_start = start;
-  Frame_Chunk *chunks = 0;
+  Frame_Chunk *chunks = 0, *forward_refs = 0;
   Frame_Chunk *remembered_state = 0;
   Frame_Chunk *rs;
   int is_eh = strcmp (section->name, ".eh_frame") == 0;
@@ -4191,19 +5432,20 @@ display_debug_frames (struct dwarf_section *section,
     {
       unsigned char *saved_start;
       unsigned char *block_end;
-      unsigned long length;
-      unsigned long cie_id;
+      dwarf_vma length;
+      dwarf_vma 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 = saved_eh_addr_size;
-      int offset_size;
-      int initial_length_size;
+      unsigned int encoded_ptr_size = saved_eh_addr_size;
+      unsigned int offset_size;
+      unsigned int initial_length_size;
 
       saved_start = start;
-      length = byte_get (start, 4); start += 4;
+
+      SAFE_BYTE_GET_AND_INC (length, start, 4, end);
 
       if (length == 0)
        {
@@ -4214,8 +5456,7 @@ display_debug_frames (struct dwarf_section *section,
 
       if (length == 0xffffffff)
        {
-         length = byte_get (start, 8);
-         start += 8;
+         SAFE_BYTE_GET_AND_INC (length, start, 8, end);
          offset_size = 8;
          initial_length_size = 12;
        }
@@ -4226,76 +5467,50 @@ display_debug_frames (struct dwarf_section *section,
        }
 
       block_end = saved_start + length + initial_length_size;
-      if (block_end > end)
+      if (block_end > end || block_end < start)
        {
-         warn ("Invalid length %#08lx in FDE at %#08lx\n",
-               length, (unsigned long)(saved_start - section_start));
+         warn ("Invalid length 0x%s in FDE at %#08lx\n",
+               dwarf_vmatoa_1 (NULL, length, offset_size),
+               (unsigned long) (saved_start - section_start));
          block_end = end;
        }
-      cie_id = byte_get (start, offset_size); start += offset_size;
 
-      if (is_eh ? (cie_id == 0) : (cie_id == DW_CIE_ID))
+      SAFE_BYTE_GET_AND_INC (cie_id, start, offset_size, end);
+
+      if (is_eh ? (cie_id == 0) : ((offset_size == 4 && cie_id == DW_CIE_ID)
+                                  || (offset_size == 8 && cie_id == DW64_CIE_ID)))
        {
          int version;
+         int mreg;
 
-         fc = (Frame_Chunk *) xmalloc (sizeof (Frame_Chunk));
-         memset (fc, 0, sizeof (Frame_Chunk));
-
+         start = read_cie (start, end, &cie, &version,
+                           &augmentation_data_len, &augmentation_data);
+         /* PR 17512: file: 027-135133-0.005.  */
+         if (cie == NULL)
+           break;
+         fc = cie;
          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 = (char *) start;
-         start = (unsigned char *) strchr ((char *) start, '\0') + 1;
-
-         if (strcmp (fc->augmentation, "eh") == 0)
-           start += eh_addr_size;
+         mreg = max_regs - 1;
+         if (mreg < fc->ra)
+           mreg = fc->ra;
+         frame_need_space (fc, mreg);
+         if (fc->fde_encoding)
+           encoded_ptr_size = size_of_encoded_value (fc->fde_encoding);
 
-         if (version >= 4)
-           {
-             fc->ptr_size = GET (1);
-             fc->segment_size = GET (1);
-             eh_addr_size = fc->ptr_size;
-           }
-         else
-           {
-             fc->ptr_size = eh_addr_size;
-             fc->segment_size = 0;
-           }
-         fc->code_factor = LEB ();
-         fc->data_factor = SLEB ();
-         if (version == 1)
-           {
-             fc->ra = GET (1);
-           }
-         else
-           {
-             fc->ra = LEB ();
-           }
+         printf ("\n%08lx ", (unsigned long) (saved_start - section_start));
+         print_dwarf_vma (length, fc->ptr_size);
+         print_dwarf_vma (cie_id, offset_size);
 
-         if (fc->augmentation[0] == 'z')
+         if (do_debug_frames_interp)
            {
-             augmentation_data_len = LEB ();
-             augmentation_data = start;
-             start += augmentation_data_len;
+             printf ("CIE \"%s\" cf=%d df=%d ra=%d\n", fc->augmentation,
+                     fc->code_factor, fc->data_factor, fc->ra);
            }
-         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 ("CIE\n");
              printf ("  Version:               %d\n", version);
              printf ("  Augmentation:          \"%s\"\n", fc->augmentation);
              if (version >= 4)
@@ -4317,53 +5532,83 @@ display_debug_frames (struct dwarf_section *section,
                }
              putchar ('\n');
            }
+       }
+      else
+       {
+         unsigned char *look_for;
+         static Frame_Chunk fde_fc;
+         unsigned long segment_selector;
 
-         if (augmentation_data_len)
+         if (is_eh)
            {
-             unsigned char *p, *q;
-             p = (unsigned char *) fc->augmentation + 1;
-             q = augmentation_data;
+             dwarf_vma sign = (dwarf_vma) 1 << (offset_size * 8 - 1);
+             look_for = start - 4 - ((cie_id ^ sign) - sign);
+           }
+         else
+           look_for = section_start + cie_id;
 
-             while (1)
+         if (look_for <= saved_start)
+           {
+             for (cie = chunks; cie ; cie = cie->next)
+               if (cie->chunk_start == look_for)
+                 break;
+           }
+         else
+           {
+             for (cie = forward_refs; cie ; cie = cie->next)
+               if (cie->chunk_start == look_for)
+                 break;
+             if (!cie)
                {
-                 if (*p == 'L')
-                   q++;
-                 else if (*p == 'P')
-                   q += 1 + size_of_encoded_value (*q);
-                 else if (*p == 'R')
-                   fc->fde_encoding = *q++;
-                 else if (*p == 'S')
-                   ;
-                 else
-                   break;
-                 p++;
-               }
+                 unsigned int off_size;
+                 unsigned char *cie_scan;
 
-             if (fc->fde_encoding)
-               encoded_ptr_size = size_of_encoded_value (fc->fde_encoding);
+                 cie_scan = look_for;
+                 off_size = 4;
+                 SAFE_BYTE_GET_AND_INC (length, cie_scan, 4, end);
+                 if (length == 0xffffffff)
+                   {
+                     SAFE_BYTE_GET_AND_INC (length, cie_scan, 8, end);
+                     off_size = 8;
+                   }
+                 if (length != 0)
+                   {
+                     dwarf_vma c_id;
+
+                     SAFE_BYTE_GET_AND_INC (c_id, cie_scan, off_size, end);
+                     if (is_eh
+                         ? c_id == 0
+                         : ((off_size == 4 && c_id == DW_CIE_ID)
+                            || (off_size == 8 && c_id == DW64_CIE_ID)))
+                       {
+                         int version;
+                         int mreg;
+
+                         read_cie (cie_scan, end, &cie, &version,
+                                   &augmentation_data_len, &augmentation_data);
+                         cie->next = forward_refs;
+                         forward_refs = cie;
+                         cie->chunk_start = look_for;
+                         mreg = max_regs - 1;
+                         if (mreg < cie->ra)
+                           mreg = cie->ra;
+                         frame_need_space (cie, mreg);
+                         if (cie->fde_encoding)
+                           encoded_ptr_size
+                             = size_of_encoded_value (cie->fde_encoding);
+                       }
+                   }
+               }
            }
 
-         frame_need_space (fc, fc->ra);
-       }
-      else
-       {
-         unsigned char *look_for;
-         static Frame_Chunk fde_fc;
-         unsigned long segment_selector;
-
-         fc = & 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, (unsigned long)(saved_start - section_start));
+             warn ("Invalid CIE pointer 0x%s in FDE at %#08lx\n",
+                   dwarf_vmatoa_1 (NULL, cie_id, offset_size),
+                   (unsigned long) (saved_start - section_start));
              fc->ncols = 0;
              fc->col_type = (short int *) xmalloc (sizeof (short int));
              fc->col_offset = (int *) xmalloc (sizeof (int));
@@ -4399,16 +5644,15 @@ display_debug_frames (struct dwarf_section *section,
 
          segment_selector = 0;
          if (fc->segment_size)
-           {
-             segment_selector = byte_get (start, fc->segment_size);
-             start += fc->segment_size;
-           }
-         fc->pc_begin = get_encoded_value (start, fc->fde_encoding);
-         if ((fc->fde_encoding & 0x70) == DW_EH_PE_pcrel)
-           fc->pc_begin += section->address + (start - section_start);
-         start += encoded_ptr_size;
-         fc->pc_range = byte_get (start, encoded_ptr_size);
-         start += encoded_ptr_size;
+           SAFE_BYTE_GET_AND_INC (segment_selector, start, fc->segment_size, end);
+
+         fc->pc_begin = get_encoded_value (&start, fc->fde_encoding, section, end);
+
+         /* FIXME: It appears that sometimes the final pc_range value is
+            encoded in less than encoded_ptr_size bytes.  See the x86_64
+            run of the "objcopy on compressed debug sections" test for an
+            example of this.  */
+         SAFE_BYTE_GET_AND_INC (fc->pc_range, start, encoded_ptr_size, end);
 
          if (cie->augmentation[0] == 'z')
            {
@@ -4417,12 +5661,19 @@ display_debug_frames (struct dwarf_section *section,
              start += augmentation_data_len;
            }
 
-         printf ("\n%08lx %08lx %08lx FDE cie=%08lx pc=",
-                 (unsigned long)(saved_start - section_start), length, cie_id,
+         printf ("\n%08lx %s %s FDE cie=%08lx pc=",
+                 (unsigned long)(saved_start - section_start),
+                 dwarf_vmatoa_1 (NULL, length, fc->ptr_size),
+                 dwarf_vmatoa_1 (NULL, cie_id, offset_size),
                  (unsigned long)(cie->chunk_start - section_start));
+
          if (fc->segment_size)
            printf ("%04lx:", segment_selector);
-         printf ("%08lx..%08lx\n", fc->pc_begin, fc->pc_begin + fc->pc_range);
+
+         printf ("%s..%s\n",
+                 dwarf_vmatoa_1 (NULL, fc->pc_begin, fc->ptr_size),
+                 dwarf_vmatoa_1 (NULL, fc->pc_begin + fc->pc_range, fc->ptr_size));
+
          if (! do_debug_frames_interp && augmentation_data_len)
            {
              unsigned long i;
@@ -4450,8 +5701,8 @@ display_debug_frames (struct dwarf_section *section,
 
          while (start < block_end)
            {
-             unsigned op, opa;
-             unsigned long reg, temp;
+             unsigned int reg, op, opa;
+             unsigned long temp;
 
              op = *start++;
              opa = op & 0x3f;
@@ -4523,13 +5774,26 @@ display_debug_frames (struct dwarf_section *section,
                  break;
                case DW_CFA_def_cfa_expression:
                  temp = LEB ();
-                 start += temp;
+                 if (start + temp < start)
+                   {
+                     warn (_("Corrupt CFA_def expression value: %lu\n"), temp);
+                     start = block_end;
+                   }
+                 else
+                   start += temp;
                  break;
                case DW_CFA_expression:
                case DW_CFA_val_expression:
                  reg = LEB ();
                  temp = LEB ();
-                 start += temp;
+                 if (start + temp < start)
+                   {
+                     /* PR 17512: file:306-192417-0.005.  */ 
+                     warn (_("Corrupt CFA expression value: %lu\n"), temp);
+                     start = block_end;
+                   }
+                 else
+                   start += temp;
                  if (frame_need_space (fc, reg) >= 0)
                    fc->col_type[reg] = DW_CFA_undefined;
                  break;
@@ -4570,7 +5834,8 @@ display_debug_frames (struct dwarf_section *section,
        {
          unsigned op, opa;
          unsigned long ul, reg, roffs;
-         long l, ofs;
+         long l;
+         dwarf_vma ofs;
          dwarf_vma vma;
          const char *reg_prefix = "";
 
@@ -4587,9 +5852,11 @@ display_debug_frames (struct dwarf_section *section,
              if (do_debug_frames_interp)
                frame_display_row (fc, &need_col_headers, &max_regs);
              else
-               printf ("  DW_CFA_advance_loc: %d to %08lx\n",
+               printf ("  DW_CFA_advance_loc: %d to %s\n",
                        opa * fc->code_factor,
-                       fc->pc_begin + opa * fc->code_factor);
+                       dwarf_vmatoa_1 (NULL, 
+                                       fc->pc_begin + opa * fc->code_factor,
+                                       fc->ptr_size));
              fc->pc_begin += opa * fc->code_factor;
              break;
 
@@ -4619,51 +5886,58 @@ display_debug_frames (struct dwarf_section *section,
                {
                  fc->col_type[opa] = cie->col_type[opa];
                  fc->col_offset[opa] = cie->col_offset[opa];
+                 if (do_debug_frames_interp
+                     && fc->col_type[opa] == DW_CFA_unreferenced)
+                   fc->col_type[opa] = DW_CFA_undefined;
                }
              break;
 
            case DW_CFA_set_loc:
-             vma = get_encoded_value (start, fc->fde_encoding);
-             if ((fc->fde_encoding & 0x70) == DW_EH_PE_pcrel)
-               vma += section->address + (start - section_start);
-             start += encoded_ptr_size;
+             vma = get_encoded_value (&start, fc->fde_encoding, section, end);
              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);
+               printf ("  DW_CFA_set_loc: %s\n",
+                       dwarf_vmatoa_1 (NULL, vma, fc->ptr_size));
              fc->pc_begin = vma;
              break;
 
            case DW_CFA_advance_loc1:
-             ofs = byte_get (start, 1); start += 1;
+             SAFE_BYTE_GET_AND_INC (ofs, start, 1, end);
              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);
+               printf ("  DW_CFA_advance_loc1: %ld to %s\n",
+                       (unsigned long) (ofs * fc->code_factor),
+                       dwarf_vmatoa_1 (NULL,
+                                       fc->pc_begin + ofs * fc->code_factor,
+                                       fc->ptr_size));
              fc->pc_begin += ofs * fc->code_factor;
              break;
 
            case DW_CFA_advance_loc2:
-             ofs = byte_get (start, 2); start += 2;
+             SAFE_BYTE_GET_AND_INC (ofs, start, 2, end);
              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);
+               printf ("  DW_CFA_advance_loc2: %ld to %s\n",
+                       (unsigned long) (ofs * fc->code_factor),
+                       dwarf_vmatoa_1 (NULL,
+                                       fc->pc_begin + ofs * fc->code_factor,
+                                       fc->ptr_size));
              fc->pc_begin += ofs * fc->code_factor;
              break;
 
            case DW_CFA_advance_loc4:
-             ofs = byte_get (start, 4); start += 4;
+             SAFE_BYTE_GET_AND_INC (ofs, start, 4, end);
              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);
+               printf ("  DW_CFA_advance_loc4: %ld to %s\n",
+                       (unsigned long) (ofs * fc->code_factor),
+                       dwarf_vmatoa_1 (NULL,
+                                       fc->pc_begin + ofs * fc->code_factor,
+                                       fc->ptr_size));
              fc->pc_begin += ofs * fc->code_factor;
              break;
 
@@ -4764,12 +6038,16 @@ display_debug_frames (struct dwarf_section *section,
              if (! do_debug_frames_interp)
                printf ("  DW_CFA_remember_state\n");
              rs = (Frame_Chunk *) xmalloc (sizeof (Frame_Chunk));
+              rs->cfa_offset = fc->cfa_offset;
+             rs->cfa_reg = fc->cfa_reg;
+             rs->ra = fc->ra;
+             rs->cfa_exp = fc->cfa_exp;
              rs->ncols = fc->ncols;
              rs->col_type = (short int *) xcmalloc (rs->ncols,
-                                                     sizeof (short int));
-             rs->col_offset = (int *) xcmalloc (rs->ncols, sizeof (int));
-             memcpy (rs->col_type, fc->col_type, rs->ncols);
-             memcpy (rs->col_offset, fc->col_offset, rs->ncols * sizeof (int));
+                                                     sizeof (* rs->col_type));
+             rs->col_offset = (int *) xcmalloc (rs->ncols, sizeof (* rs->col_offset));
+             memcpy (rs->col_type, fc->col_type, rs->ncols * sizeof (* fc->col_type));
+             memcpy (rs->col_offset, fc->col_offset, rs->ncols * sizeof (* fc->col_offset));
              rs->next = remembered_state;
              remembered_state = rs;
              break;
@@ -4781,10 +6059,14 @@ display_debug_frames (struct dwarf_section *section,
              if (rs)
                {
                  remembered_state = rs->next;
+                 fc->cfa_offset = rs->cfa_offset;
+                 fc->cfa_reg = rs->cfa_reg;
+                 fc->ra = rs->ra;
+                 fc->cfa_exp = rs->cfa_exp;
                  frame_need_space (fc, rs->ncols - 1);
-                 memcpy (fc->col_type, rs->col_type, rs->ncols);
+                 memcpy (fc->col_type, rs->col_type, rs->ncols * sizeof (* rs->col_type));
                  memcpy (fc->col_offset, rs->col_offset,
-                         rs->ncols * sizeof (int));
+                         rs->ncols * sizeof (* rs->col_offset));
                  free (rs->col_type);
                  free (rs->col_offset);
                  free (rs);
@@ -4920,13 +6202,15 @@ display_debug_frames (struct dwarf_section *section,
              break;
 
            case DW_CFA_MIPS_advance_loc8:
-             ofs = byte_get (start, 8); start += 8;
+             SAFE_BYTE_GET_AND_INC (ofs, start, 8, end);
              if (do_debug_frames_interp)
                frame_display_row (fc, &need_col_headers, &max_regs);
              else
-               printf ("  DW_CFA_MIPS_advance_loc8: %ld to %08lx\n",
-                       ofs * fc->code_factor,
-                       fc->pc_begin + ofs * fc->code_factor);
+               printf ("  DW_CFA_MIPS_advance_loc8: %ld to %s\n",
+                       (unsigned long) (ofs * fc->code_factor),
+                       dwarf_vmatoa_1 (NULL,
+                                       fc->pc_begin + ofs * fc->code_factor,
+                                       fc->ptr_size));
              fc->pc_begin += ofs * fc->code_factor;
              break;
 
@@ -4961,7 +6245,7 @@ display_debug_frames (struct dwarf_section *section,
              if (op >= DW_CFA_lo_user && op <= DW_CFA_hi_user)
                printf (_("  DW_CFA_??? (User defined call frame op: %#x)\n"), op);
              else
-               warn (_("unsupported or unknown Dwarf Call Frame Instruction number: %#x\n"), op);
+               warn (_("Unsupported or unknown Dwarf Call Frame Instruction number: %#x\n"), op);
              start = block_end;
            }
        }
@@ -4983,6 +6267,522 @@ display_debug_frames (struct dwarf_section *section,
 #undef SLEB
 
 static int
+display_gdb_index (struct dwarf_section *section,
+                  void *file ATTRIBUTE_UNUSED)
+{
+  unsigned char *start = section->start;
+  uint32_t version;
+  uint32_t cu_list_offset, tu_list_offset;
+  uint32_t address_table_offset, symbol_table_offset, constant_pool_offset;
+  unsigned int cu_list_elements, tu_list_elements;
+  unsigned int address_table_size, symbol_table_slots;
+  unsigned char *cu_list, *tu_list;
+  unsigned char *address_table, *symbol_table, *constant_pool;
+  unsigned int i;
+
+  /* The documentation for the format of this file is in gdb/dwarf2read.c.  */
+
+  printf (_("Contents of the %s section:\n"), section->name);
+
+  if (section->size < 6 * sizeof (uint32_t))
+    {
+      warn (_("Truncated header in the %s section.\n"), section->name);
+      return 0;
+    }
+
+  version = byte_get_little_endian (start, 4);
+  printf (_("Version %ld\n"), (long) version);
+
+  /* Prior versions are obsolete, and future versions may not be
+     backwards compatible.  */
+  if (version < 3 || version > 8)
+    {
+      warn (_("Unsupported version %lu.\n"), (unsigned long) version);
+      return 0;
+    }
+  if (version < 4)
+    warn (_("The address table data in version 3 may be wrong.\n"));
+  if (version < 5)
+    warn (_("Version 4 does not support case insensitive lookups.\n"));
+  if (version < 6)
+    warn (_("Version 5 does not include inlined functions.\n"));
+  if (version < 7)
+      warn (_("Version 6 does not include symbol attributes.\n"));
+  /* Version 7 indices generated by Gold have bad type unit references,
+     PR binutils/15021.  But we don't know if the index was generated by
+     Gold or not, so to avoid worrying users with gdb-generated indices
+     we say nothing for version 7 here.  */
+
+  cu_list_offset = byte_get_little_endian (start + 4, 4);
+  tu_list_offset = byte_get_little_endian (start + 8, 4);
+  address_table_offset = byte_get_little_endian (start + 12, 4);
+  symbol_table_offset = byte_get_little_endian (start + 16, 4);
+  constant_pool_offset = byte_get_little_endian (start + 20, 4);
+
+  if (cu_list_offset > section->size
+      || tu_list_offset > section->size
+      || address_table_offset > section->size
+      || symbol_table_offset > section->size
+      || constant_pool_offset > section->size)
+    {
+      warn (_("Corrupt header in the %s section.\n"), section->name);
+      return 0;
+    }
+
+  cu_list_elements = (tu_list_offset - cu_list_offset) / 8;
+  tu_list_elements = (address_table_offset - tu_list_offset) / 8;
+  address_table_size = symbol_table_offset - address_table_offset;
+  symbol_table_slots = (constant_pool_offset - symbol_table_offset) / 8;
+
+  cu_list = start + cu_list_offset;
+  tu_list = start + tu_list_offset;
+  address_table = start + address_table_offset;
+  symbol_table = start + symbol_table_offset;
+  constant_pool = start + constant_pool_offset;
+
+  printf (_("\nCU table:\n"));
+  for (i = 0; i < cu_list_elements; i += 2)
+    {
+      uint64_t cu_offset = byte_get_little_endian (cu_list + i * 8, 8);
+      uint64_t cu_length = byte_get_little_endian (cu_list + i * 8 + 8, 8);
+
+      printf (_("[%3u] 0x%lx - 0x%lx\n"), i / 2,
+             (unsigned long) cu_offset,
+             (unsigned long) (cu_offset + cu_length - 1));
+    }
+
+  printf (_("\nTU table:\n"));
+  for (i = 0; i < tu_list_elements; i += 3)
+    {
+      uint64_t tu_offset = byte_get_little_endian (tu_list + i * 8, 8);
+      uint64_t type_offset = byte_get_little_endian (tu_list + i * 8 + 8, 8);
+      uint64_t signature = byte_get_little_endian (tu_list + i * 8 + 16, 8);
+
+      printf (_("[%3u] 0x%lx 0x%lx "), i / 3,
+             (unsigned long) tu_offset,
+             (unsigned long) type_offset);
+      print_dwarf_vma (signature, 8);
+      printf ("\n");
+    }
+
+  printf (_("\nAddress table:\n"));
+  for (i = 0; i < address_table_size; i += 2 * 8 + 4)
+    {
+      uint64_t low = byte_get_little_endian (address_table + i, 8);
+      uint64_t high = byte_get_little_endian (address_table + i + 8, 8);
+      uint32_t cu_index = byte_get_little_endian (address_table + i + 16, 4);
+
+      print_dwarf_vma (low, 8);
+      print_dwarf_vma (high, 8);
+      printf (_("%lu\n"), (unsigned long) cu_index);
+    }
+
+  printf (_("\nSymbol table:\n"));
+  for (i = 0; i < symbol_table_slots; ++i)
+    {
+      uint32_t name_offset = byte_get_little_endian (symbol_table + i * 8, 4);
+      uint32_t cu_vector_offset = byte_get_little_endian (symbol_table + i * 8 + 4, 4);
+      uint32_t num_cus, cu;
+
+      if (name_offset != 0
+         || cu_vector_offset != 0)
+       {
+         unsigned int j;
+
+         printf ("[%3u] %s:", i, constant_pool + name_offset);
+         num_cus = byte_get_little_endian (constant_pool + cu_vector_offset, 4);
+         if (num_cus > 1)
+           printf ("\n");
+         for (j = 0; j < num_cus; ++j)
+           {
+             int is_static;
+             gdb_index_symbol_kind kind;
+
+             cu = byte_get_little_endian (constant_pool + cu_vector_offset + 4 + j * 4, 4);
+             is_static = GDB_INDEX_SYMBOL_STATIC_VALUE (cu);
+             kind = GDB_INDEX_SYMBOL_KIND_VALUE (cu);
+             cu = GDB_INDEX_CU_VALUE (cu);
+             /* Convert to TU number if it's for a type unit.  */
+             if (cu >= cu_list_elements / 2)
+               printf ("%cT%lu", num_cus > 1 ? '\t' : ' ',
+                       (unsigned long) (cu - cu_list_elements / 2));
+             else
+               printf ("%c%lu", num_cus > 1 ? '\t' : ' ', (unsigned long) cu);
+
+             printf (" [%s, %s]",
+                     is_static ? _("static") : _("global"),
+                     get_gdb_index_symbol_kind_name (kind));
+             if (num_cus > 1)
+               printf ("\n");
+           }
+         if (num_cus <= 1)
+           printf ("\n");
+       }
+    }
+
+  return 1;
+}
+
+/* Pre-allocate enough space for the CU/TU sets needed.  */
+
+static void
+prealloc_cu_tu_list (unsigned int nshndx)
+{
+  if (shndx_pool == NULL)
+    {
+      shndx_pool_size = nshndx;
+      shndx_pool_used = 0;
+      shndx_pool = (unsigned int *) xcmalloc (shndx_pool_size,
+                                             sizeof (unsigned int));
+    }
+  else
+    {
+      shndx_pool_size = shndx_pool_used + nshndx;
+      shndx_pool = (unsigned int *) xcrealloc (shndx_pool, shndx_pool_size,
+                                              sizeof (unsigned int));
+    }
+}
+
+static void
+add_shndx_to_cu_tu_entry (unsigned int shndx)
+{
+  if (shndx_pool_used >= shndx_pool_size)
+    {
+      error (_("Internal error: out of space in the shndx pool.\n"));
+      return;
+    }
+  shndx_pool [shndx_pool_used++] = shndx;
+}
+
+static void
+end_cu_tu_entry (void)
+{
+  if (shndx_pool_used >= shndx_pool_size)
+    {
+      error (_("Internal error: out of space in the shndx pool.\n"));
+      return;
+    }
+  shndx_pool [shndx_pool_used++] = 0;
+}
+
+/* Return the short name of a DWARF section given by a DW_SECT enumerator.  */
+
+static const char *
+get_DW_SECT_short_name (unsigned int dw_sect)
+{
+  static char buf[16];
+
+  switch (dw_sect)
+    {
+      case DW_SECT_INFO:
+       return "info";
+      case DW_SECT_TYPES:
+       return "types";
+      case DW_SECT_ABBREV:
+       return "abbrev";
+      case DW_SECT_LINE:
+       return "line";
+      case DW_SECT_LOC:
+       return "loc";
+      case DW_SECT_STR_OFFSETS:
+       return "str_off";
+      case DW_SECT_MACINFO:
+       return "macinfo";
+      case DW_SECT_MACRO:
+       return "macro";
+      default:
+        break;
+    }
+
+  snprintf (buf, sizeof (buf), "%d", dw_sect);
+  return buf;
+}
+
+/* Process a CU or TU index.  If DO_DISPLAY is true, print the contents.
+   These sections are extensions for Fission.
+   See http://gcc.gnu.org/wiki/DebugFissionDWP.  */
+
+static int
+process_cu_tu_index (struct dwarf_section *section, int do_display)
+{
+  unsigned char *phdr = section->start;
+  unsigned char *limit = phdr + section->size;
+  unsigned char *phash;
+  unsigned char *pindex;
+  unsigned char *ppool;
+  unsigned int version;
+  unsigned int ncols = 0;
+  unsigned int nused;
+  unsigned int nslots;
+  unsigned int i;
+  unsigned int j;
+  dwarf_vma signature_high;
+  dwarf_vma signature_low;
+  char buf[64];
+
+  version = byte_get (phdr, 4);
+  if (version >= 2)
+    ncols = byte_get (phdr + 4, 4);
+  nused = byte_get (phdr + 8, 4);
+  nslots = byte_get (phdr + 12, 4);
+  phash = phdr + 16;
+  pindex = phash + nslots * 8;
+  ppool = pindex + nslots * 4;
+
+  if (do_display)
+    {
+      printf (_("Contents of the %s section:\n\n"), section->name);
+      printf (_("  Version:                 %d\n"), version);
+      if (version >= 2)
+       printf (_("  Number of columns:       %d\n"), ncols);
+      printf (_("  Number of used entries:  %d\n"), nused);
+      printf (_("  Number of slots:         %d\n\n"), nslots);
+    }
+
+  if (ppool > limit)
+    {
+      warn (_("Section %s too small for %d hash table entries\n"),
+           section->name, nslots);
+      return 0;
+    }
+
+  if (version == 1)
+    {
+      if (!do_display)
+       prealloc_cu_tu_list ((limit - ppool) / 4);
+      for (i = 0; i < nslots; i++)
+       {
+         unsigned char *shndx_list;
+         unsigned int shndx;
+
+         byte_get_64 (phash, &signature_high, &signature_low);
+         if (signature_high != 0 || signature_low != 0)
+           {
+             j = byte_get (pindex, 4);
+             shndx_list = ppool + j * 4;
+             if (do_display)
+               printf (_("  [%3d] Signature:  0x%s  Sections: "),
+                       i, dwarf_vmatoa64 (signature_high, signature_low,
+                                          buf, sizeof (buf)));
+             for (;;)
+               {
+                 if (shndx_list >= limit)
+                   {
+                     warn (_("Section %s too small for shndx pool\n"),
+                           section->name);
+                     return 0;
+                   }
+                 shndx = byte_get (shndx_list, 4);
+                 if (shndx == 0)
+                   break;
+                 if (do_display)
+                   printf (" %d", shndx);
+                 else
+                   add_shndx_to_cu_tu_entry (shndx);
+                 shndx_list += 4;
+               }
+             if (do_display)
+               printf ("\n");
+             else
+               end_cu_tu_entry ();
+           }
+         phash += 8;
+         pindex += 4;
+       }
+    }
+  else if (version == 2)
+    {
+      unsigned int val;
+      unsigned int dw_sect;
+      unsigned char *ph = phash;
+      unsigned char *pi = pindex;
+      unsigned char *poffsets = ppool + ncols * 4;
+      unsigned char *psizes = poffsets + nused * ncols * 4;
+      unsigned char *pend = psizes + nused * ncols * 4;
+      bfd_boolean is_tu_index;
+      struct cu_tu_set *this_set = NULL;
+      unsigned int row;
+      unsigned char *prow;
+
+      is_tu_index = strcmp (section->name, ".debug_tu_index") == 0;
+
+      if (pend > limit)
+       {
+         warn (_("Section %s too small for offset and size tables\n"),
+               section->name);
+         return 0;
+       }
+
+      if (do_display)
+       {
+         printf (_("  Offset table\n"));
+         printf ("  slot  %-16s  ",
+                is_tu_index ? _("signature") : _("dwo_id"));
+       }
+      else
+       {
+         if (is_tu_index)
+           {
+             tu_count = nused;
+             tu_sets = xcmalloc (nused, sizeof (struct cu_tu_set));
+             this_set = tu_sets;
+           }
+         else
+           {
+             cu_count = nused;
+             cu_sets = xcmalloc (nused, sizeof (struct cu_tu_set));
+             this_set = cu_sets;
+           }
+       }
+      if (do_display)
+       {
+         for (j = 0; j < ncols; j++)
+           {
+             dw_sect = byte_get (ppool + j * 4, 4);
+             printf (" %8s", get_DW_SECT_short_name (dw_sect));
+           }
+         printf ("\n");
+       }
+      for (i = 0; i < nslots; i++)
+       {
+         byte_get_64 (ph, &signature_high, &signature_low);
+         row = byte_get (pi, 4);
+         if (row != 0)
+           {
+             if (!do_display)
+               memcpy (&this_set[row - 1].signature, ph, sizeof (uint64_t));
+             prow = poffsets + (row - 1) * ncols * 4;
+             if (do_display)
+               printf (_("  [%3d] 0x%s"),
+                       i, dwarf_vmatoa64 (signature_high, signature_low,
+                                          buf, sizeof (buf)));
+             for (j = 0; j < ncols; j++)
+               {
+                 val = byte_get (prow + j * 4, 4);
+                 if (do_display)
+                   printf (" %8d", val);
+                 else
+                   {
+                     dw_sect = byte_get (ppool + j * 4, 4);
+                     this_set [row - 1].section_offsets [dw_sect] = val;
+                   }
+               }
+             if (do_display)
+               printf ("\n");
+           }
+         ph += 8;
+         pi += 4;
+       }
+
+      ph = phash;
+      pi = pindex;
+      if (do_display)
+        {
+         printf ("\n");
+         printf (_("  Size table\n"));
+         printf ("  slot  %-16s  ",
+                is_tu_index ? _("signature") : _("dwo_id"));
+        }
+      for (j = 0; j < ncols; j++)
+       {
+         val = byte_get (ppool + j * 4, 4);
+         if (do_display)
+           printf (" %8s", get_DW_SECT_short_name (val));
+       }
+      if (do_display)
+       printf ("\n");
+      for (i = 0; i < nslots; i++)
+       {
+         byte_get_64 (ph, &signature_high, &signature_low);
+         row = byte_get (pi, 4);
+         if (row != 0)
+           {
+             prow = psizes + (row - 1) * ncols * 4;
+             if (do_display)
+               printf (_("  [%3d] 0x%s"),
+                       i, dwarf_vmatoa64 (signature_high, signature_low,
+                                          buf, sizeof (buf)));
+             for (j = 0; j < ncols; j++)
+               {
+                 val = byte_get (prow + j * 4, 4);
+                 if (do_display)
+                   printf (" %8d", val);
+                 else
+                   {
+                     dw_sect = byte_get (ppool + j * 4, 4);
+                     this_set [row - 1].section_sizes [dw_sect] = val;
+                   }
+               }
+             if (do_display)
+               printf ("\n");
+           }
+         ph += 8;
+         pi += 4;
+       }
+    }
+  else if (do_display)
+    printf (_("  Unsupported version\n"));
+
+  if (do_display)
+      printf ("\n");
+
+  return 1;
+}
+
+/* Load the CU and TU indexes if present.  This will build a list of
+   section sets that we can use to associate a .debug_info.dwo section
+   with its associated .debug_abbrev.dwo section in a .dwp file.  */
+
+static void
+load_cu_tu_indexes (void *file)
+{
+  /* If we have already loaded (or tried to load) the CU and TU indexes
+     then do not bother to repeat the task.  */
+  if (cu_tu_indexes_read)
+    return;
+
+  if (load_debug_section (dwp_cu_index, file))
+    process_cu_tu_index (&debug_displays [dwp_cu_index].section, 0);
+
+  if (load_debug_section (dwp_tu_index, file))
+    process_cu_tu_index (&debug_displays [dwp_tu_index].section, 0);
+
+  cu_tu_indexes_read = 1;
+}
+
+/* Find the set of sections that includes section SHNDX.  */
+
+unsigned int *
+find_cu_tu_set (void *file, unsigned int shndx)
+{
+  unsigned int i;
+
+  load_cu_tu_indexes (file);
+
+  /* Find SHNDX in the shndx pool.  */
+  for (i = 0; i < shndx_pool_used; i++)
+    if (shndx_pool [i] == shndx)
+      break;
+
+  if (i >= shndx_pool_used)
+    return NULL;
+
+  /* Now backup to find the first entry in the set.  */
+  while (i > 0 && shndx_pool [i - 1] != 0)
+    i--;
+
+  return shndx_pool + i;
+}
+
+/* Display a .debug_cu_index or .debug_tu_index section.  */
+
+static int
+display_cu_index (struct dwarf_section *section, void *file ATTRIBUTE_UNUSED)
+{
+  return process_cu_tu_index (section, 1);
+}
+
+static int
 display_debug_not_supported (struct dwarf_section *section,
                             void *file ATTRIBUTE_UNUSED)
 {
@@ -5023,28 +6823,6 @@ xcrealloc (void *ptr, size_t nmemb, size_t size)
 }
 
 void
-error (const char *message, ...)
-{
-  va_list args;
-
-  va_start (args, message);
-  fprintf (stderr, _("%s: Error: "), program_name);
-  vfprintf (stderr, message, args);
-  va_end (args);
-}
-
-void
-warn (const char *message, ...)
-{
-  va_list args;
-
-  va_start (args, message);
-  fprintf (stderr, _("%s: Warning: "), program_name);
-  vfprintf (stderr, message, args);
-  va_end (args);
-}
-
-void
 free_debug_memory (void)
 {
   unsigned int i;
@@ -5092,13 +6870,16 @@ dwarf_select_sections_by_names (const char *names)
       /* Please keep this table alpha- sorted.  */
       { "Ranges", & do_debug_ranges, 1 },
       { "abbrev", & do_debug_abbrevs, 1 },
+      { "addr", & do_debug_addr, 1 },
       { "aranges", & do_debug_aranges, 1 },
+      { "cu_index", & do_debug_cu_index, 1 },
+      { "decodedline", & do_debug_lines, FLAG_DEBUG_LINES_DECODED },
       { "frames", & do_debug_frames, 1 },
       { "frames-interp", & do_debug_frames_interp, 1 },
+      /* The special .gdb_index section.  */
+      { "gdb_index", & do_gdb_index, 1 },
       { "info", & do_debug_info, 1 },
       { "line", & do_debug_lines, FLAG_DEBUG_LINES_RAW }, /* For backwards compatibility.  */
-      { "rawline", & do_debug_lines, FLAG_DEBUG_LINES_RAW },
-      { "decodedline", & do_debug_lines, FLAG_DEBUG_LINES_DECODED },
       { "loc",  & do_debug_loc, 1 },
       { "macro", & do_debug_macinfo, 1 },
       { "pubnames", & do_debug_pubnames, 1 },
@@ -5106,6 +6887,7 @@ dwarf_select_sections_by_names (const char *names)
       /* This entry is for compatability
         with earlier versions of readelf.  */
       { "ranges", & do_debug_aranges, 1 },
+      { "rawline", & do_debug_lines, FLAG_DEBUG_LINES_RAW },
       { "str", & do_debug_str, 1 },
       /* These trace_* sections are used by Itanium VMS.  */
       { "trace_abbrev", & do_trace_abbrevs, 1 },
@@ -5115,21 +6897,21 @@ dwarf_select_sections_by_names (const char *names)
     };
 
   const char *p;
-  
+
   p = names;
   while (*p)
     {
       const debug_dump_long_opts * entry;
-      
+
       for (entry = opts_table; entry->option; entry++)
        {
          size_t len = strlen (entry->option);
-         
+
          if (strncmp (p, entry->option, len) == 0
              && (p[len] == ',' || p[len] == '\0'))
            {
              * entry->variable |= entry->val;
-             
+
              /* The --debug-dump=frames-interp option also
                 enables the --debug-dump=frames option.  */
              if (do_debug_frames_interp)
@@ -5139,7 +6921,7 @@ dwarf_select_sections_by_names (const char *names)
              break;
            }
        }
-      
+
       if (entry->option == NULL)
        {
          warn (_("Unrecognized debug option '%s'\n"), p);
@@ -5147,7 +6929,7 @@ dwarf_select_sections_by_names (const char *names)
          if (p == NULL)
            break;
        }
-      
+
       if (*p == ',')
        p++;
     }
@@ -5164,53 +6946,53 @@ dwarf_select_sections_by_letters (const char *letters)
       case 'i':
        do_debug_info = 1;
        break;
-       
+
       case 'a':
        do_debug_abbrevs = 1;
        break;
-       
+
       case 'l':
        do_debug_lines |= FLAG_DEBUG_LINES_RAW;
        break;
-       
+
       case 'L':
        do_debug_lines |= FLAG_DEBUG_LINES_DECODED;
        break;
-       
+
       case 'p':
        do_debug_pubnames = 1;
        break;
-       
+
       case 't':
        do_debug_pubtypes = 1;
        break;
-       
+
       case 'r':
        do_debug_aranges = 1;
        break;
-       
+
       case 'R':
        do_debug_ranges = 1;
        break;
-       
+
       case 'F':
        do_debug_frames_interp = 1;
       case 'f':
        do_debug_frames = 1;
        break;
-       
+
       case 'm':
        do_debug_macinfo = 1;
        break;
-       
+
       case 's':
        do_debug_str = 1;
        break;
-       
+
       case 'o':
        do_debug_loc = 1;
        break;
-       
+
       default:
        warn (_("Unrecognized debug option '%s'\n"), optarg);
        break;
@@ -5231,49 +7013,86 @@ dwarf_select_sections_all (void)
   do_debug_macinfo = 1;
   do_debug_str = 1;
   do_debug_loc = 1;
+  do_gdb_index = 1;
   do_trace_info = 1;
   do_trace_abbrevs = 1;
   do_trace_aranges = 1;
+  do_debug_addr = 1;
+  do_debug_cu_index = 1;
 }
 
 struct dwarf_section_display debug_displays[] =
 {
-  { { ".debug_abbrev",         ".zdebug_abbrev",       NULL, NULL, 0, 0 },
-    display_debug_abbrev,              &do_debug_abbrevs,      0 },
-  { { ".debug_aranges",                ".zdebug_aranges",      NULL, NULL, 0, 0 },
-    display_debug_aranges,             &do_debug_aranges,      1 },
-  { { ".debug_frame",          ".zdebug_frame",        NULL, NULL, 0, 0 },
-    display_debug_frames,              &do_debug_frames,       1 },
-  { { ".debug_info",           ".zdebug_info",         NULL, NULL, 0, 0 },
-    display_debug_info,                        &do_debug_info,         1 },
-  { { ".debug_line",           ".zdebug_line",         NULL, NULL, 0, 0 },
-    display_debug_lines,               &do_debug_lines,        1 },
-  { { ".debug_pubnames",       ".zdebug_pubnames",     NULL, NULL, 0, 0 },
-    display_debug_pubnames,            &do_debug_pubnames,     0 },
-  { { ".eh_frame",             "",                     NULL, NULL, 0, 0 },
-    display_debug_frames,              &do_debug_frames,       1 },
-  { { ".debug_macinfo",                ".zdebug_macinfo",      NULL, NULL, 0, 0 },
-    display_debug_macinfo,             &do_debug_macinfo,      0 },
-  { { ".debug_str",            ".zdebug_str",          NULL, NULL, 0, 0 },
-    display_debug_str,                 &do_debug_str,          0 },
-  { { ".debug_loc",            ".zdebug_loc",          NULL, NULL, 0, 0 },
-    display_debug_loc,                 &do_debug_loc,          1 },
-  { { ".debug_pubtypes",       ".zdebug_pubtypes",     NULL, NULL, 0, 0 },
-    display_debug_pubnames,            &do_debug_pubtypes,     0 },
-  { { ".debug_ranges",         ".zdebug_ranges",       NULL, NULL, 0, 0 },
-    display_debug_ranges,              &do_debug_ranges,       1 },
-  { { ".debug_static_func",    ".zdebug_static_func",  NULL, NULL, 0, 0 },
-    display_debug_not_supported,       NULL,                   0 },
-  { { ".debug_static_vars",    ".zdebug_static_vars",  NULL, NULL, 0, 0 },
-    display_debug_not_supported,       NULL,                   0 },
-  { { ".debug_types",          ".zdebug_types",        NULL, NULL, 0, 0 },
-    display_debug_types,               &do_debug_info,         1 },
-  { { ".debug_weaknames",      ".zdebug_weaknames",    NULL, NULL, 0, 0 },
-    display_debug_not_supported,       NULL,                   0 },
-  { { ".trace_info",           "",                     NULL, NULL, 0, 0 },
-    display_trace_info,                        &do_trace_info,         1 },
-  { { ".trace_abbrev",         "",                     NULL, NULL, 0, 0 },
-    display_debug_abbrev,              &do_trace_abbrevs,      0 },
-  { { ".trace_aranges",                "",                     NULL, NULL, 0, 0 },
-    display_debug_aranges,             &do_trace_aranges,      0 }
+  { { ".debug_abbrev",     ".zdebug_abbrev",   NULL, NULL, 0, 0, 0 },
+    display_debug_abbrev,   &do_debug_abbrevs, 0 },
+  { { ".debug_aranges",            ".zdebug_aranges",  NULL, NULL, 0, 0, 0 },
+    display_debug_aranges,  &do_debug_aranges, 1 },
+  { { ".debug_frame",       ".zdebug_frame",   NULL, NULL, 0, 0, 0 },
+    display_debug_frames,   &do_debug_frames,  1 },
+  { { ".debug_info",       ".zdebug_info",     NULL, NULL, 0, 0, abbrev },
+    display_debug_info,            &do_debug_info,     1 },
+  { { ".debug_line",       ".zdebug_line",     NULL, NULL, 0, 0, 0 },
+    display_debug_lines,    &do_debug_lines,   1 },
+  { { ".debug_pubnames",    ".zdebug_pubnames",        NULL, NULL, 0, 0, 0 },
+    display_debug_pubnames, &do_debug_pubnames,        0 },
+  { { ".debug_gnu_pubnames", ".zdebug_gnu_pubnames", NULL, NULL, 0, 0, 0 },
+    display_debug_gnu_pubnames, &do_debug_pubnames, 0 },
+  { { ".eh_frame",         "",                 NULL, NULL, 0, 0, 0 },
+    display_debug_frames,   &do_debug_frames,  1 },
+  { { ".debug_macinfo",            ".zdebug_macinfo",  NULL, NULL, 0, 0, 0 },
+    display_debug_macinfo,  &do_debug_macinfo, 0 },
+  { { ".debug_macro",      ".zdebug_macro",    NULL, NULL, 0, 0, 0 },
+    display_debug_macro,    &do_debug_macinfo, 1 },
+  { { ".debug_str",        ".zdebug_str",      NULL, NULL, 0, 0, 0 },
+    display_debug_str,     &do_debug_str,      0 },
+  { { ".debug_loc",        ".zdebug_loc",      NULL, NULL, 0, 0, 0 },
+    display_debug_loc,     &do_debug_loc,      1 },
+  { { ".debug_pubtypes",    ".zdebug_pubtypes",        NULL, NULL, 0, 0, 0 },
+    display_debug_pubnames, &do_debug_pubtypes,        0 },
+  { { ".debug_gnu_pubtypes", ".zdebug_gnu_pubtypes", NULL, NULL, 0, 0, 0 },
+    display_debug_gnu_pubnames, &do_debug_pubtypes, 0 },
+  { { ".debug_ranges",     ".zdebug_ranges",   NULL, NULL, 0, 0, 0 },
+    display_debug_ranges,   &do_debug_ranges,  1 },
+  { { ".debug_static_func", ".zdebug_static_func", NULL, NULL, 0, 0, 0 },
+    display_debug_not_supported, NULL,         0 },
+  { { ".debug_static_vars", ".zdebug_static_vars", NULL, NULL, 0, 0, 0 },
+    display_debug_not_supported, NULL,         0 },
+  { { ".debug_types",      ".zdebug_types",    NULL, NULL, 0, 0, abbrev },
+    display_debug_types,    &do_debug_info,    1 },
+  { { ".debug_weaknames",   ".zdebug_weaknames", NULL, NULL, 0, 0, 0 },
+    display_debug_not_supported, NULL,         0 },
+  { { ".gdb_index",        "",                 NULL, NULL, 0, 0, 0 },
+    display_gdb_index,      &do_gdb_index,     0 },
+  { { ".trace_info",       "",                 NULL, NULL, 0, 0, trace_abbrev },
+    display_trace_info,            &do_trace_info,     1 },
+  { { ".trace_abbrev",     "",                 NULL, NULL, 0, 0, 0 },
+    display_debug_abbrev,   &do_trace_abbrevs, 0 },
+  { { ".trace_aranges",            "",                 NULL, NULL, 0, 0, 0 },
+    display_debug_aranges,  &do_trace_aranges, 0 },
+  { { ".debug_info.dwo",    ".zdebug_info.dwo",        NULL, NULL, 0, 0, abbrev_dwo },
+    display_debug_info,            &do_debug_info,     1 },
+  { { ".debug_abbrev.dwo",  ".zdebug_abbrev.dwo", NULL, NULL, 0, 0, 0 },
+    display_debug_abbrev,   &do_debug_abbrevs, 0 },
+  { { ".debug_types.dwo",   ".zdebug_types.dwo", NULL, NULL, 0, 0, abbrev_dwo },
+    display_debug_types,    &do_debug_info,    1 },
+  { { ".debug_line.dwo",    ".zdebug_line.dwo", NULL, NULL, 0, 0, 0 },
+    display_debug_lines,    &do_debug_lines,   1 },
+  { { ".debug_loc.dwo",            ".zdebug_loc.dwo",  NULL, NULL, 0, 0, 0 },
+    display_debug_loc,     &do_debug_loc,      1 },
+  { { ".debug_macro.dwo",   ".zdebug_macro.dwo", NULL, NULL, 0, 0, 0 },
+    display_debug_macro,    &do_debug_macinfo, 1 },
+  { { ".debug_macinfo.dwo", ".zdebug_macinfo.dwo", NULL, NULL, 0, 0, 0 },
+    display_debug_macinfo,  &do_debug_macinfo, 0 },
+  { { ".debug_str.dwo",     ".zdebug_str.dwo",  NULL, NULL, 0, 0, 0 },
+    display_debug_str,      &do_debug_str,     1 },
+  { { ".debug_str_offsets", ".zdebug_str_offsets", NULL, NULL, 0, 0, 0 },
+    display_debug_str_offsets, NULL,           0 },
+  { { ".debug_str_offsets.dwo", ".zdebug_str_offsets.dwo", NULL, NULL, 0, 0, 0 },
+    display_debug_str_offsets, NULL,           0 },
+  { { ".debug_addr",       ".zdebug_addr",     NULL, NULL, 0, 0, 0 },
+    display_debug_addr,     &do_debug_addr,    1 },
+  { { ".debug_cu_index",    "",                        NULL, NULL, 0, 0, 0 },
+    display_cu_index,       &do_debug_cu_index,        0 },
+  { { ".debug_tu_index",    "",                        NULL, NULL, 0, 0, 0 },
+    display_cu_index,       &do_debug_cu_index,        0 },
 };