PR24898, An out-of-bounds read occured in display_data
[deliverable/binutils-gdb.git] / binutils / dwarf.c
index 17a608c9fa0a0877b337f43efd700ea34f22c780..e792a17018cc908bdc2af1ca397822cfad0e0260 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-2019 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"
+#include "filenames.h"
+#include "safe-ctype.h"
+#include <assert.h>
+
+#undef MAX
+#undef MIN
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
 
 static const char *regname (unsigned int regno, int row);
 
 static int have_frame_base;
 static int need_base_address;
 
-static unsigned int last_pointer_size = 0;
-static int warned_about_missing_comp_units = FALSE;
-
 static unsigned int num_debug_info_entries = 0;
+static unsigned int alloc_num_debug_info_entries = 0;
 static debug_info *debug_information = NULL;
 /* Special value for num_debug_info_entries to indicate
    that the .debug_info section could not be loaded/parsed.  */
 #define DEBUG_INFO_UNAVAILABLE  (unsigned int) -1
 
-int eh_addr_size;
+/* A .debug_info section can contain multiple links to separate
+   DWO object files.  We use these structures to record these links.  */
+typedef enum dwo_type
+{
+ DWO_NAME,
+ DWO_DIR,
+ DWO_ID
+} dwo_type;
+
+typedef struct dwo_info
+{
+  dwo_type          type;
+  const char *      value;
+  struct dwo_info * next;
+} dwo_info;
+
+static dwo_info *   first_dwo_info = NULL;
+static bfd_boolean  need_dwo_info;
+
+separate_info * first_separate_info = NULL;
+
+unsigned int eh_addr_size;
 
 int do_debug_info;
 int do_debug_abbrevs;
@@ -55,135 +84,59 @@ 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;
+int do_debug_links;
+int do_follow_links;
 
-/* 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);
+/* Convenient constant, to avoid having to cast -1 to dwarf_vma when
+   testing whether e.g. a locview list is present.  */
+static const dwarf_vma vm1 = -1;
 
-    default:
-      error (_("Unhandled data length: %d\n"), size);
-      abort ();
-    }
-}
+/* 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.  */
 
-dwarf_vma
-byte_get_big_endian (unsigned char *field, int size)
-{
-  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);
-       }
+static unsigned int *shndx_pool = NULL;
+static unsigned int shndx_pool_size = 0;
+static unsigned int shndx_pool_used = 0;
 
-    default:
-      error (_("Unhandled data length: %d\n"), size);
-      abort ();
-    }
-}
+/* 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.  */
 
-static dwarf_vma
-byte_get_signed (unsigned char *field, int size)
+struct cu_tu_set
 {
-  dwarf_vma x = byte_get (field, size);
+  uint64_t signature;
+  dwarf_vma section_offsets[DW_SECT_MAX];
+  size_t section_sizes[DW_SECT_MAX];
+};
 
-  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 ();
-    }
-}
+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 int
+static bfd_boolean load_cu_tu_indexes (void *);
+
+/* Values for do_debug_lines.  */
+#define FLAG_DEBUG_LINES_RAW    1
+#define FLAG_DEBUG_LINES_DECODED 2
+
+static unsigned int
 size_of_encoded_value (int encoding)
 {
   switch (encoding & 0x7)
@@ -197,73 +150,341 @@ 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)
 {
-  int size = size_of_encoded_value (encoding);
+  unsigned char * data = * pdata;
+  unsigned 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;
+    }
+
+  /* PR 17512: file: 002-829853-0.004.  */
+  if (size > 8)
+    {
+      warn (_("Encoded size of %d is too large to read\n"), size);
+      * pdata = end;
+      return 0;
+    }
+
+  /* PR 17512: file: 1085-5603-0.004.  */
+  if (size == 0)
+    {
+      warn (_("Encoded size of 0 is too small to read\n"));
+      * pdata = end;
+      return 0;
+    }
 
   if (encoding & DW_EH_PE_signed)
-    return byte_get_signed (data, size);
+    val = byte_get_signed (data, size);
+  else
+    val = byte_get (data, size);
+
+  if ((encoding & 0x70) == DW_EH_PE_pcrel)
+    val += section->address + (data - section->start);
+
+  * pdata = data + size;
+  return val;
+}
+
+#if defined HAVE_LONG_LONG && SIZEOF_LONG_LONG > SIZEOF_LONG
+# ifndef __MINGW32__
+#  define DWARF_VMA_FMT                "ll"
+#  define DWARF_VMA_FMT_LONG   "%16.16llx"
+# else
+#  define DWARF_VMA_FMT                "I64"
+#  define DWARF_VMA_FMT_LONG   "%016I64x"
+# endif
+#else
+# define DWARF_VMA_FMT         "l"
+# define DWARF_VMA_FMT_LONG    "%16.16lx"
+#endif
+
+/* 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 specifying 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
-    return byte_get (data, size);
+    {
+      char fmt[32];
+
+      if (fmtch)
+       sprintf (fmt, "%%%s%s", DWARF_VMA_FMT, fmtch);
+      else
+       sprintf (fmt, "%%%s", DWARF_VMA_FMT);
+      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 byte_size parameter.  */
+   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 val, unsigned byte_size)
+print_dwarf_vma (dwarf_vma value, unsigned num_bytes)
 {
-  static char buff[18];
+  printf ("%s ", dwarf_vmatoa_1 (NULL, value, 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.  */
-#if __STDC_VERSION__ >= 199901L || (defined(__GNUC__) && __GNUC__ >= 2)
-#ifndef __MSVCRT__
-  snprintf (buff, sizeof (buff), "%16.16llx ", val);
-#else
-  snprintf (buff, sizeof (buff), "%016I64x ", val);
-#endif
-#else
-  snprintf (buff, sizeof (buff), "%16.16lx ", val);
-#endif
+/* Print a view number in hexadecimal value, with the same width
+   print_dwarf_vma would have printed it with the same num_bytes.
+   Print blanks for zero view, unless force is nonzero.  */
+
+static void
+print_dwarf_view (dwarf_vma value, unsigned num_bytes, int force)
+{
+  int len;
+  if (!num_bytes)
+    len = 4;
+  else
+    len = num_bytes * 2;
+
+  assert (value == (unsigned long) value);
+  if (value || force)
+    printf ("v%0*lx ", len - 1, (unsigned long) value);
+  else
+    printf ("%*s", len + 1, "");
+}
 
-  fputs (buff + (byte_size == 4 ? 8 : 0), stdout);
+/* 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;
 
+      /* PR 17512: file: 0ca183b8.
+        FIXME: Should we signal this error somehow ?  */
+      if (shift >= sizeof (result) * 8)
+       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 SKIP_ULEB()    read_uleb128 (start, & length_return, end); start += length_return
+#define SKIP_SLEB()    read_sleb128 (start, & length_return, end); start += length_return
+
+#define READ_ULEB(var)                                         \
+  do                                                           \
+    {                                                          \
+      dwarf_vma _val;                                          \
+                                                               \
+      (var) = _val = read_uleb128 (start, &length_return, end);        \
+      if ((var) != _val)                                       \
+       error (_("Internal error: %s:%d: LEB value (%s) "       \
+                "too large for containing variable\n"),        \
+              __FILE__, __LINE__, dwarf_vmatoa ("u", _val));   \
+      start += length_return;                                  \
+    }                                                          \
+  while (0)
+
+#define READ_SLEB(var)                                         \
+  do                                                           \
+    {                                                          \
+      dwarf_signed_vma _val;                                   \
+                                                               \
+      (var) = _val = read_sleb128 (start, &length_return, end);        \
+      if ((var) != _val)                                       \
+       error (_("Internal error: %s:%d: LEB value (%s) "       \
+                "too large for containing variable\n"),        \
+              __FILE__, __LINE__, dwarf_vmatoa ("d", _val));   \
+      start += length_return;                                  \
+    }                                                          \
+  while (0)
+
+/* Read AMOUNT bytes from PTR and store them in VAL as an unsigned value.
+   Checks to make sure that the read will not reach or pass END
+   and that VAL is big enough to hold AMOUNT bytes.  */
+#define SAFE_BYTE_GET(VAL, PTR, AMOUNT, END)   \
+  do                                           \
+    {                                          \
+      unsigned int amount = (AMOUNT);          \
+      if (sizeof (VAL) < amount)               \
+       {                                       \
+         error (ngettext ("internal error: attempt to read %d byte "   \
+                          "of data in to %d sized variable",           \
+                          "internal error: attempt to read %d bytes "  \
+                          "of data in to %d sized variable",           \
+                          amount),                                     \
+                amount, (int) sizeof (VAL));   \
+         amount = sizeof (VAL);                \
+       }                                       \
+      if (((PTR) + amount) >= (END))           \
+       {                                       \
+         if ((PTR) < (END))                    \
+           amount = (END) - (PTR);             \
+         else                                  \
+           amount = 0;                         \
+       }                                       \
+      if (amount == 0 || amount > 8)           \
+       VAL = 0;                                \
+      else                                     \
+       VAL = byte_get ((PTR), amount);         \
+    }                                          \
+  while (0)
+
+/* Like SAFE_BYTE_GET, but also increments PTR by AMOUNT.  */
+#define SAFE_BYTE_GET_AND_INC(VAL, PTR, AMOUNT, END)   \
+  do                                                   \
+    {                                                  \
+      SAFE_BYTE_GET (VAL, PTR, AMOUNT, END);           \
+      PTR += AMOUNT;                                   \
+    }                                                  \
+  while (0)
+
+/* Like SAFE_BYTE_GET, but reads a signed value.  */
+#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)
+
+/* Like SAFE_SIGNED_BYTE_GET, but also increments PTR by AMOUNT.  */
+#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 view;
   unsigned int file;
   unsigned int line;
   unsigned int column;
@@ -271,8 +492,8 @@ typedef struct State_Machine_Registers
   int basic_block;
   unsigned char op_index;
   unsigned char end_sequence;
-/* This variable hold the number of the last entry seen
-   in the File Table.  */
+  /* This variable hold the number of the last entry seen
+     in the File Table.  */
   unsigned int last_file_entry;
 } SMR;
 
@@ -282,6 +503,7 @@ static void
 reset_state_machine (int is_stmt)
 {
   state_machine_regs.address = 0;
+  state_machine_regs.view = 0;
   state_machine_regs.op_index = 0;
   state_machine_regs.file = 1;
   state_machine_regs.line = 1;
@@ -296,20 +518,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 || len > (uintptr_t) (end - data))
     {
-      warn (_("badly formed extended line op encountered!\n"));
+      warn (_("Badly formed extended line op encountered!\n"));
       return bytes_read;
     }
 
@@ -326,30 +551,48 @@ 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);
+      /* PR 17512: file: 002-100480-0.004.  */
+      if (len - bytes_read - 1 > 8)
+       {
+         warn (_("Length (%d) of DW_LNE_set_address op is too long\n"),
+               len - bytes_read - 1);
+         adr = 0;
+       }
+      else
+       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.view = 0;
       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 += bytes_read;
-      printf (_("%lu\t"), read_leb128 (data, & bytes_read, 0));
-      data += bytes_read;
-      printf (_("%lu\t"), read_leb128 (data, & bytes_read, 0));
-      printf (_("%s\n\n"), name);
+      {
+       size_t l;
+
+       name = data;
+       l = strnlen ((char *) data, end - data);
+       data += len + 1;
+       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\n", (int) l, 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 +626,201 @@ 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;
+  const unsigned char * ret;
+
+  if (section->start == NULL)
+    return (const unsigned char *) _("<no .debug_str section>");
+
+  if (offset >= section->size)
+    {
+      warn (_("DW_FORM_strp offset too big: %s\n"),
+           dwarf_vmatoa ("x", offset));
+      return (const unsigned char *) _("<offset is too big>");
+    }
+
+  ret = section->start + offset;
+  /* Unfortunately we cannot rely upon the .debug_str section ending with a
+     NUL byte.  Since our caller is expecting to receive a well formed C
+     string we test for the lack of a terminating byte here.  */
+  if (strnlen ((const char *) ret, section->size - offset)
+      == section->size - offset)
+    ret = (const unsigned char *)
+      _("<no NUL byte at end of .debug_str section>");
+
+  return ret; 
+}
+
+static const unsigned char *
+fetch_indirect_line_string (dwarf_vma offset)
+{
+  struct dwarf_section *section = &debug_displays [line_str].section;
+  const unsigned char * ret;
+
+  if (section->start == NULL)
+    return (const unsigned char *) _("<no .debug_line_str section>");
+
+  if (offset >= section->size)
+    {
+      warn (_("DW_FORM_line_strp offset too big: %s\n"),
+           dwarf_vmatoa ("x", offset));
+      return (const unsigned char *) _("<offset is too big>");
+    }
+
+  ret = section->start + offset;
+  /* Unfortunately we cannot rely upon the .debug_line_str section ending
+     with a NUL byte.  Since our caller is expecting to receive a well formed
+     C string we test for the lack of a terminating byte here.  */
+  if (strnlen ((const char *) ret, section->size - offset)
+      == section->size - offset)
+    ret = (const unsigned char *)
+      _("<no NUL byte at end of .debug_line_str section>");
+
+  return ret;
+}
+
+static const char *
+fetch_indexed_string (dwarf_vma idx, struct cu_tu_set *this_set,
+                     dwarf_vma offset_size, bfd_boolean 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;
+  const char * ret;
+
+  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>");
+    }
+
+  ret = (const char *) str_section->start + str_offset;
+  /* Unfortunately we cannot rely upon str_section ending with a NUL byte.
+     Since our caller is expecting to receive a well formed C string we test
+     for the lack of a terminating byte here.  */
+  if (strnlen (ret, str_section->size - str_offset)
+      == str_section->size - str_offset)
+    ret = (const char *) _("<no NUL byte at end of section>");
+
+  return ret;
+}
+
+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_str section>");
+    return (_("<no .debug_addr section>"));
 
-  /* DWARF sections under Mach-O have non-zero addresses.  */
-  offset -= section->address;
-  if (offset > section->size)
+  if (offset + bytes > section->size)
     {
-      warn (_("DW_FORM_strp offset too big: %lx\n"), offset);
-      return _("<offset is too big>");
+      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.  */
@@ -425,6 +828,7 @@ typedef struct abbrev_attr
 {
   unsigned long attribute;
   unsigned long form;
+  bfd_signed_vma implicit_const;
   struct abbrev_attr *next;
 }
 abbrev_attr;
@@ -474,7 +878,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;
@@ -495,18 +898,19 @@ add_abbrev (unsigned long number, unsigned long tag, int children)
 }
 
 static void
-add_abbrev_attr (unsigned long attribute, unsigned long form)
+add_abbrev_attr (unsigned long attribute, unsigned long form,
+                bfd_signed_vma implicit_const)
 {
   abbrev_attr *attr;
 
   attr = (abbrev_attr *) malloc (sizeof (*attr));
-
   if (attr == NULL)
     /* ugg */
     return;
 
   attr->attribute = attribute;
   attr->form      = form;
+  attr->implicit_const = implicit_const;
   attr->next      = NULL;
 
   if (last_abbrev->first_attr == NULL)
@@ -536,17 +940,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++;
 
@@ -555,153 +963,106 @@ process_abbrev_section (unsigned char *start, unsigned char *end)
       do
        {
          unsigned long form;
+         /* Initialize it due to a false compiler warning.  */
+         bfd_signed_vma implicit_const = -1;
 
-         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 (form == DW_FORM_implicit_const)
+           {
+             implicit_const = read_sleb128 (start, & bytes_read, end);
+             start += bytes_read;
+             if (start == end)
+               break;
+           }
 
-         if (attribute != 0)
-           add_abbrev_attr (attribute, form);
+         add_abbrev_attr (attribute, form, implicit_const);
        }
       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)
-    {
-    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];
+  const char *name = get_DW_TAG_name ((unsigned int) tag);
 
-       snprintf (buffer, sizeof (buffer), _("Unknown TAG value: %lx"), tag);
-       return buffer;
-      }
+  if (name == NULL)
+    {
+      static char buffer[100];
+
+      if (tag >= DW_TAG_lo_user && tag <= DW_TAG_hi_user)
+       snprintf (buffer, sizeof (buffer), _("User TAG value: %#lx"), tag);
+      else
+       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 const char *
+get_IDX_name (unsigned long idx)
+{
+  const char *name = get_DW_IDX_name ((unsigned int) idx);
+
+  if (name == NULL)
+    {
+      static char buffer[100];
+
+      snprintf (buffer, sizeof (buffer), _("Unknown IDX value: %lx"), idx);
+      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, char delimiter)
 {
-  printf (_(" %lu byte block: "), length);
+  dwarf_vma maxlen;
+
+  printf (_("%c%s byte block: "), delimiter, dwarf_vmatoa ("u", length));
+  if (data > end)
+    return (unsigned char *) end;
+
+  maxlen = (dwarf_vma) (end - data);
+  length = length > maxlen ? maxlen : length;
 
   while (length --)
     printf ("%lx ", (unsigned long) byte_get (data++, 1));
@@ -714,13 +1075,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 +1093,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 +1155,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 +1198,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 +1215,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 +1237,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 +1344,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");
@@ -1018,19 +1393,21 @@ decode_location_expression (unsigned char * data,
          printf ("DW_OP_push_object_address");
          break;
        case DW_OP_call2:
-         /* XXX: Strictly speaking for 64-bit DWARF3 files
+         /* FIXME: 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
+         /* FIXME: 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
+         /* FIXME: Strictly speaking for 64-bit DWARF3 files
             this ought to be an 8-byte wide computation.  */
          if (dwarf_version == -1)
            {
@@ -1040,16 +1417,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 +1433,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 +1448,14 @@ 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);
-         data += uvalue;
+         data = display_block (data, uvalue, end, ' ');
          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");
@@ -1088,42 +1463,148 @@ decode_location_expression (unsigned char * data,
          break;
        case DW_OP_GNU_encoded_addr:
          {
-           int encoding;
+           int encoding = 0;
            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);
+
+           if (data < end)
+             encoding = *data++;
+           addr = get_encoded_value (&data, encoding, section, end);
 
            printf ("DW_OP_GNU_encoded_addr: fmt:%02x addr:", encoding);
            print_dwarf_vma (addr, pointer_size);
          }
          break;
+       case DW_OP_implicit_pointer:
        case DW_OP_GNU_implicit_pointer:
-         /* XXX: Strictly speaking for 64-bit DWARF3 files
+         /* FIXME: Strictly speaking for 64-bit DWARF3 files
+            this ought to be an 8-byte wide computation.  */
+         if (dwarf_version == -1)
+           {
+             printf (_("(%s in frame info)"),
+                     (op == DW_OP_implicit_pointer
+                      ? "DW_OP_implicit_pointer"
+                      : "DW_OP_GNU_implicit_pointer"));
+             /* No way to tell where the next op is, so just bail.  */
+             return need_frame_base;
+           }
+         if (dwarf_version == 2)
+           {
+             SAFE_BYTE_GET_AND_INC (uvalue, data, pointer_size, end);
+           }
+         else
+           {
+             SAFE_BYTE_GET_AND_INC (uvalue, data, offset_size, end);
+           }
+         printf ("%s: <0x%s> %s",
+                 (op == DW_OP_implicit_pointer
+                  ? "DW_OP_implicit_pointer" : "DW_OP_GNU_implicit_pointer"),
+                 dwarf_vmatoa ("x", uvalue),
+                 dwarf_vmatoa ("d", read_sleb128 (data,
+                                                  &bytes_read, end)));
+         data += bytes_read;
+         break;
+       case DW_OP_entry_value:
+       case DW_OP_GNU_entry_value:
+         uvalue = read_uleb128 (data, &bytes_read, end);
+         data += bytes_read;
+         /* PR 17531: file: 0cc9cd00.  */
+         if (uvalue > (dwarf_vma) (end - data))
+           uvalue = end - data;
+         printf ("%s: (", (op == DW_OP_entry_value ? "DW_OP_entry_value"
+                                                   : "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;
+         if (data > end)
+           data = end;
+         break;
+       case DW_OP_const_type:
+       case DW_OP_GNU_const_type:
+         uvalue = read_uleb128 (data, &bytes_read, end);
+         data += bytes_read;
+         printf ("%s: <0x%s> ",
+                 (op == DW_OP_const_type ? "DW_OP_const_type"
+                                         : "DW_OP_GNU_const_type"),
+                 dwarf_vmatoa ("x", cu_offset + uvalue));
+         SAFE_BYTE_GET_AND_INC (uvalue, data, 1, end);
+         data = display_block (data, uvalue, end, ' ');
+         break;
+       case DW_OP_regval_type:
+       case DW_OP_GNU_regval_type:
+         uvalue = read_uleb128 (data, &bytes_read, end);
+         data += bytes_read;
+         printf ("%s: %s (%s)",
+                 (op == DW_OP_regval_type ? "DW_OP_regval_type"
+                                          : "DW_OP_GNU_regval_type"),
+                 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_deref_type:
+       case DW_OP_GNU_deref_type:
+         SAFE_BYTE_GET_AND_INC (uvalue, data, 1, end);
+         printf ("%s: %ld",
+                 (op == DW_OP_deref_type ? "DW_OP_deref_type"
+                                         : "DW_OP_GNU_deref_type"),
+                 (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_convert:
+       case DW_OP_GNU_convert:
+         uvalue = read_uleb128 (data, &bytes_read, end);
+         data += bytes_read;
+         printf ("%s <0x%s>",
+                 (op == DW_OP_convert ? "DW_OP_convert" : "DW_OP_GNU_convert"),
+                 dwarf_vmatoa ("x", uvalue ? cu_offset + uvalue : 0));
+         break;
+       case DW_OP_reinterpret:
+       case DW_OP_GNU_reinterpret:
+         uvalue = read_uleb128 (data, &bytes_read, end);
+         data += bytes_read;
+         printf ("%s <0x%s>",
+                 (op == DW_OP_reinterpret ? "DW_OP_reinterpret"
+                                          : "DW_OP_GNU_reinterpret"),
+                 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;
+       case DW_OP_GNU_variable_value:
+         /* FIXME: Strictly speaking for 64-bit DWARF3 files
             this ought to be an 8-byte wide computation.  */
          if (dwarf_version == -1)
            {
-             printf (_("(DW_OP_GNU_implicit_pointer in frame info)"));
+             printf (_("(DW_OP_GNU_variable_value in frame info)"));
              /* No way to tell where the next op is, so just bail.  */
              return need_frame_base;
            }
          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_variable_value: <0x%s>", dwarf_vmatoa ("x", uvalue));
          break;
 
          /* HP extensions.  */
@@ -1164,9 +1645,9 @@ decode_location_expression (unsigned char * data,
        default:
          if (op >= DW_OP_lo_user
              && op <= DW_OP_hi_user)
-           printf (_("(User defined location op)"));
+           printf (_("(User defined location op 0x%x)"), op);
          else
-           printf (_("(Unknown location op)"));
+           printf (_("(Unknown location op 0x%x)"), op);
          /* No way to tell where the next op is, so just bail.  */
          return need_frame_base;
        }
@@ -1179,54 +1660,230 @@ decode_location_expression (unsigned char * data,
   return need_frame_base;
 }
 
-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,
-                            int dwarf_version,
-                            debug_info * debug_info_p,
-                            int do_loc,
-                            struct dwarf_section * section)
-{
-  unsigned long uvalue = 0;
-  unsigned char *block_start = NULL;
-  unsigned char * orig_data = data;
-  unsigned int bytes_read;
+/* Find the CU or TU set corresponding to the given CU_OFFSET.
+   This is used for DWARF package files.  */
 
-  switch (form)
+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)
     {
-    default:
-      break;
+      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;
+}
 
-    case DW_FORM_ref_addr:
-      if (dwarf_version == 2)
-       {
-         uvalue = byte_get (data, pointer_size);
-         data += pointer_size;
-       }
-      else if (dwarf_version == 3 || dwarf_version == 4)
-       {
-         uvalue = byte_get (data, offset_size);
-         data += offset_size;
-       }
+/* 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 const char *
+fetch_alt_indirect_string (dwarf_vma offset)
+{
+  separate_info * i;
+
+  if (! do_follow_links)
+    return "";
+
+  if (first_separate_info == NULL)
+    return _("<no links available>");
+
+  for (i = first_separate_info; i != NULL; i = i->next)
+    {
+      struct dwarf_section * section;
+      const char *           ret;
+
+      if (! load_debug_section (separate_debug_str, i->handle))
+       continue;
+
+      section = &debug_displays [separate_debug_str].section;
+
+      if (section->start == NULL)
+       continue;
+
+      if (offset >= section->size)
+       continue;
+
+      ret = (const char *) (section->start + offset);
+      /* Unfortunately we cannot rely upon the .debug_str section ending with a
+        NUL byte.  Since our caller is expecting to receive a well formed C
+        string we test for the lack of a terminating byte here.  */
+      if (strnlen ((const char *) ret, section->size - offset)
+         == section->size - offset)
+       return _("<no NUL byte at end of alt .debug_str section>");
+
+      return ret;
+    }
+  
+  warn (_("DW_FORM_GNU_strp_alt offset (%s) too big or no string sections available\n"),
+       dwarf_vmatoa ("x", offset));
+  return _("<offset is too big>");
+}
+       
+static const char *
+get_AT_name (unsigned long attribute)
+{
+  const char *name;
+
+  if (attribute == 0)
+    return "DW_AT value: 0";
+
+  /* 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 void
+add_dwo_info (const char * field, dwo_type type)
+{
+  dwo_info * dwinfo = xmalloc (sizeof * dwinfo);
+
+  dwinfo->type = type;
+  dwinfo->value = field;
+  dwinfo->next = first_dwo_info;
+  first_dwo_info = dwinfo;
+}
+
+static void
+add_dwo_name (const char * name)
+{
+  add_dwo_info (name, DWO_NAME);
+}
+
+static void
+add_dwo_dir (const char * dir)
+{
+  add_dwo_info (dir, DWO_DIR);
+}
+
+static void
+add_dwo_id (const char * id)
+{
+  add_dwo_info (id, DWO_ID);
+}
+
+static void
+free_dwo_info (void)
+{
+  dwo_info * dwinfo;
+  dwo_info * next;
+
+  for (dwinfo = first_dwo_info; dwinfo != NULL; dwinfo = next)
+    {
+      next = dwinfo->next;
+      free (dwinfo);
+    }
+  first_dwo_info = NULL;
+}
+
+static unsigned char *
+read_and_display_attr_value (unsigned long           attribute,
+                            unsigned long           form,
+                            dwarf_signed_vma        implicit_const,
+                            unsigned char *         data,
+                            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 cu_tu_set *      this_set,
+                            char                    delimiter)
+{
+  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:
+      break;
+
+    case DW_FORM_ref_addr:
+      if (dwarf_version == 2)
+       SAFE_BYTE_GET_AND_INC (uvalue, data, pointer_size, end);
+      else if (dwarf_version == 3 || dwarf_version == 4)
+       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_line_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 +1893,67 @@ 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,
-                                         cu_offset, pointer_size,
+       printf ("%c%s", delimiter, get_FORM_name (form));
+      if (form == DW_FORM_implicit_const)
+       {
+         implicit_const = read_sleb128 (data, & bytes_read, end);
+         data += bytes_read;
+       }
+      return read_and_display_attr_value (attribute, form, implicit_const, data,
+                                         end, cu_offset, pointer_size,
                                          offset_size, dwarf_version,
                                          debug_info_p, do_loc,
-                                         section);
+                                         section, this_set, delimiter);
+    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 ("%c<0x%s>", delimiter, dwarf_vmatoa ("x",uvalue));
+      break;
+
+    case DW_FORM_GNU_ref_alt:
+      if (!do_loc)
+       printf ("%c<alt 0x%s>", delimiter, dwarf_vmatoa ("x",uvalue));
+      /* FIXME: Follow the reference...  */
       break;
 
     case DW_FORM_ref1:
@@ -1286,14 +1961,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 ("%c<0x%s>", delimiter, 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 ("%c0x%s", delimiter, dwarf_vmatoa ("x", uvalue));
       break;
 
     case DW_FORM_flag_present:
@@ -1303,75 +1978,199 @@ read_and_display_attr_value (unsigned long attribute,
     case DW_FORM_sdata:
     case DW_FORM_udata:
       if (!do_loc)
-       printf (" %ld", uvalue);
+       printf ("%c%s", delimiter, dwarf_vmatoa ("d", uvalue));
+      break;
+
+    case DW_FORM_implicit_const:
+      if (!do_loc)
+       printf ("%c%s", delimiter, dwarf_vmatoa ("d", implicit_const));
       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 ("%c0x%s", delimiter,
+                 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_data16:
+      if (!do_loc)
+       {
+         dwarf_vma left_high_bits, left_low_bits;
+         dwarf_vma right_high_bits, right_low_bits;
+
+         SAFE_BYTE_GET64 (data, &left_high_bits, &left_low_bits, end);
+         SAFE_BYTE_GET64 (data + 8, &right_high_bits, &right_low_bits, end);
+         if (byte_get == byte_get_little_endian)
+           {
+             /* Swap them.  */
+             left_high_bits ^= right_high_bits;
+             right_high_bits ^= left_high_bits;
+             left_high_bits ^= right_high_bits;
+             left_low_bits ^= right_low_bits;
+             right_low_bits ^= left_low_bits;
+             left_low_bits ^= right_low_bits;
+           }
+         printf (" 0x%08" DWARF_VMA_FMT "x%08" DWARF_VMA_FMT "x"
+                 "%08" DWARF_VMA_FMT "x%08" DWARF_VMA_FMT "x",
+                 left_high_bits, left_low_bits, right_high_bits,
+                 right_low_bits);
+       }
+      data += 16;
+      break;
+
     case DW_FORM_string:
       if (!do_loc)
-       printf (" %s", data);
-      data += strlen ((char *) data) + 1;
+       printf ("%c%.*s", delimiter, (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;
+      if (block_start >= end)
+       {
+         warn (_("Block ends prematurely\n"));
+         uvalue = 0;
+         block_start = end;
+       }
+      /* FIXME: Testing "(block_start + uvalue) < block_start" miscompiles with
+        gcc 4.8.3 running on an x86_64 host in 32-bit mode.  So we pre-compute
+        block_start + uvalue here.  */
+      data = block_start + uvalue;
+      /* PR 17512: file: 008-103549-0.001:0.1.  */
+      if (block_start + uvalue > end || data < block_start)
+       {
+         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, delimiter);
       break;
 
     case DW_FORM_block1:
-      uvalue = byte_get (data, 1);
+      SAFE_BYTE_GET (uvalue, data, 1, end);
       block_start = data + 1;
+      if (block_start >= end)
+       {
+         warn (_("Block ends prematurely\n"));
+         uvalue = 0;
+         block_start = end;
+       }
+      data = block_start + uvalue;
+      if (block_start + uvalue > end || data < block_start)
+       {
+         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, delimiter);
       break;
 
     case DW_FORM_block2:
-      uvalue = byte_get (data, 2);
+      SAFE_BYTE_GET (uvalue, data, 2, end);
       block_start = data + 2;
+      if (block_start >= end)
+       {
+         warn (_("Block ends prematurely\n"));
+         uvalue = 0;
+         block_start = end;
+       }
+      data = block_start + uvalue;
+      if (block_start + uvalue > end || data < block_start)
+       {
+         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, delimiter);
       break;
 
     case DW_FORM_block4:
-      uvalue = byte_get (data, 4);
+      SAFE_BYTE_GET (uvalue, data, 4, end);
       block_start = data + 4;
+      /* PR 17512: file: 3371-3907-0.004.  */
+      if (block_start >= end)
+       {
+         warn (_("Block ends prematurely\n"));
+         uvalue = 0;
+         block_start = end;
+       }
+      data = block_start + uvalue;
+      if (block_start + uvalue > end
+         /* PR 17531: file: 5b5f0592.  */
+         || data < block_start)
+       {
+         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, delimiter);
       break;
 
     case DW_FORM_strp:
       if (!do_loc)
-       printf (_(" (indirect string, offset: 0x%lx): %s"),
-               uvalue, fetch_indirect_string (uvalue));
+       printf (_("%c(indirect string, offset: 0x%s): %s"), delimiter,
+               dwarf_vmatoa ("x", uvalue),
+               fetch_indirect_string (uvalue));
+      break;
+
+    case DW_FORM_line_strp:
+      if (!do_loc)
+       printf (_("%c(indirect line string, offset: 0x%s): %s"), delimiter,
+               dwarf_vmatoa ("x", uvalue),
+               fetch_indirect_line_string (uvalue));
+      break;
+
+    case DW_FORM_GNU_str_index:
+      if (!do_loc)
+       {
+         const char * suffix = strrchr (section->name, '.');
+         bfd_boolean  dwo = (suffix && strcmp (suffix, ".dwo") == 0) ? TRUE : FALSE;
+
+         printf (_("%c(indexed string: 0x%s): %s"), delimiter,
+                 dwarf_vmatoa ("x", uvalue),
+                 fetch_indexed_string (uvalue, this_set, offset_size, dwo));
+       }
+      break;
+
+    case DW_FORM_GNU_strp_alt:
+      if (!do_loc)
+       {
+         printf (_("%c(alt indirect string, offset: 0x%s) %s"), delimiter,
+                 dwarf_vmatoa ("x", uvalue),
+                 fetch_alt_indirect_string (uvalue));
+       }
       break;
 
     case DW_FORM_indirect:
@@ -1381,16 +2180,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 ("%csignature: 0x%s", delimiter,
+                 dwarf_vmatoa64 (high_bits, uvalue, buf, sizeof (buf)));
        }
-      else
-        data += 8;
+      data += 8;
+      break;
+
+    case DW_FORM_GNU_addr_index:
+      if (!do_loc)
+       printf (_("%c(addr_index: 0x%s): %s"), delimiter,
+               dwarf_vmatoa ("x", uvalue),
+               fetch_indexed_value (uvalue * pointer_size, pointer_size));
       break;
 
     default:
@@ -1399,13 +2203,16 @@ 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)
        {
        case DW_AT_frame_base:
          have_frame_base = 1;
+         /* Fall through.  */
        case DW_AT_location:
+       case DW_AT_GNU_locviews:
        case DW_AT_string_length:
        case DW_AT_return_addr:
        case DW_AT_data_member_location:
@@ -1413,8 +2220,16 @@ 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_call_value:
+       case DW_AT_GNU_call_site_value:
+       case DW_AT_call_data_value:
+       case DW_AT_GNU_call_site_data_value:
+       case DW_AT_call_target:
+       case DW_AT_GNU_call_site_target:
+       case DW_AT_call_target_clobbered:
+       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,17 +2239,45 @@ read_and_display_attr_value (unsigned long attribute,
              if (lmax == 0 || num >= lmax)
                {
                  lmax += 1024;
-                 debug_info_p->loc_offsets = (long unsigned int *)
-                      xcrealloc (debug_info_p->loc_offsets,
-                                lmax, sizeof (*debug_info_p->loc_offsets));
+                 debug_info_p->loc_offsets = (dwarf_vma *)
+                   xcrealloc (debug_info_p->loc_offsets,
+                              lmax, sizeof (*debug_info_p->loc_offsets));
+                 debug_info_p->loc_views = (dwarf_vma *)
+                   xcrealloc (debug_info_p->loc_views,
+                              lmax, sizeof (*debug_info_p->loc_views));
                  debug_info_p->have_frame_base = (int *)
-                      xcrealloc (debug_info_p->have_frame_base,
-                                lmax, sizeof (*debug_info_p->have_frame_base));
+                   xcrealloc (debug_info_p->have_frame_base,
+                              lmax, sizeof (*debug_info_p->have_frame_base));
                  debug_info_p->max_loc_offsets = lmax;
                }
-             debug_info_p->loc_offsets [num] = uvalue;
+             if (this_set != NULL)
+               uvalue += this_set->section_offsets [DW_SECT_LOC];
              debug_info_p->have_frame_base [num] = have_frame_base;
-             debug_info_p->num_loc_offsets++;
+             if (attribute != DW_AT_GNU_locviews)
+               {
+                 /* Corrupt DWARF info can produce more offsets than views.
+                    See PR 23062 for an example.  */
+                 if (debug_info_p->num_loc_offsets
+                     > debug_info_p->num_loc_views)
+                   warn (_("More location offset attributes than DW_AT_GNU_locview attributes\n"));
+                 else
+                   {
+                     debug_info_p->loc_offsets [num] = uvalue;
+                     debug_info_p->num_loc_offsets++;
+                   }
+               }
+             else
+               {
+                 assert (debug_info_p->num_loc_views <= num);
+                 num = debug_info_p->num_loc_views;
+                 if (num > debug_info_p->num_loc_offsets)
+                   warn (_("More DW_AT_GNU_locview attributes than location offset attributes\n"));
+                 else
+                   {
+                     debug_info_p->loc_views [num] = uvalue;
+                     debug_info_p->num_loc_views++;
+                   }
+               }
            }
          break;
 
@@ -1443,9 +2286,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,9 +2306,9 @@ read_and_display_attr_value (unsigned long attribute,
              if (lmax == 0 || num >= lmax)
                {
                  lmax += 1024;
-                 debug_info_p->range_lists = (long unsigned int *)
-                      xcrealloc (debug_info_p->range_lists,
-                                lmax, sizeof (*debug_info_p->range_lists));
+                 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;
                }
              debug_info_p->range_lists [num] = uvalue;
@@ -1465,20 +2316,79 @@ read_and_display_attr_value (unsigned long attribute,
            }
          break;
 
+       case DW_AT_GNU_dwo_name:
+       case DW_AT_dwo_name:
+         if (need_dwo_info)
+           switch (form)
+             {
+             case DW_FORM_strp:
+               add_dwo_name ((const char *) fetch_indirect_string (uvalue));
+               break;
+             case DW_FORM_GNU_str_index:
+               add_dwo_name (fetch_indexed_string (uvalue, this_set, offset_size, FALSE));
+               break;
+             case DW_FORM_string:
+               add_dwo_name ((const char *) orig_data);
+               break;
+             default:
+               warn (_("Unsupported form (%s) for attribute %s\n"),
+                     get_FORM_name (form), get_AT_name (attribute));
+               break;
+             }
+         break;
+             
+       case DW_AT_comp_dir:
+         /* FIXME: Also extract a build-id in a CU/TU.  */
+         if (need_dwo_info)
+           switch (form)
+             {
+             case DW_FORM_strp:
+               add_dwo_dir ((const char *) fetch_indirect_string (uvalue));
+               break;
+             case DW_FORM_line_strp:
+               add_dwo_dir ((const char *) fetch_indirect_line_string (uvalue));
+               break;
+             case DW_FORM_GNU_str_index:
+               add_dwo_dir (fetch_indexed_string (uvalue, this_set, offset_size, FALSE));
+               break;
+             case DW_FORM_string:
+               add_dwo_dir ((const char *) orig_data);
+               break;
+             default:
+               warn (_("Unsupported form (%s) for attribute %s\n"),
+                     get_FORM_name (form), get_AT_name (attribute));
+               break;
+             }
+         break;
+             
+       case DW_AT_GNU_dwo_id:
+         if (need_dwo_info)
+           switch (form)
+             {
+             case DW_FORM_data8:
+               /* FIXME: Record the length of the ID as well ?  */
+               add_dwo_id ((const char *) (data - 8));
+               break;
+             default:
+               warn (_("Unsupported form (%s) for attribute %s\n"),
+                     get_FORM_name (form), get_AT_name (attribute));
+               break;
+             }
+         break;
+             
        default:
          break;
        }
     }
 
-  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 +2404,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 +2438,39 @@ 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_OpenCL:            printf ("(OpenCL)"); break;
+       case DW_LANG_Go:                printf ("(Go)"); break;
+       case DW_LANG_Modula3:           printf ("(Modula 3)"); break;
+       case DW_LANG_Haskell:           printf ("(Haskell)"); break;
+       case DW_LANG_C_plus_plus_03:    printf ("(C++03)"); break;
+       case DW_LANG_C_plus_plus_11:    printf ("(C++11)"); break;
+       case DW_LANG_OCaml:             printf ("(OCaml)"); break;
+       case DW_LANG_Rust:              printf ("(Rust)"); break;
+       case DW_LANG_C11:               printf ("(C11)"); break;
+       case DW_LANG_Swift:             printf ("(Swift)"); break;
+       case DW_LANG_Julia:             printf ("(Julia)"); break;
+       case DW_LANG_Dylan:             printf ("(Dylan)"); break;
+       case DW_LANG_C_plus_plus_14:    printf ("(C++14)"); break;
+       case DW_LANG_Fortran03:         printf ("(Fortran 03)"); break;
+       case DW_LANG_Fortran08:         printf ("(Fortran 08)"); break;
+       case DW_LANG_RenderScript:      printf ("(RenderScript)"); 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;
@@ -1560,6 +2491,12 @@ read_and_display_attr_value (unsigned long attribute,
        case DW_ATE_edited:             printf ("(edited)"); break;
        case DW_ATE_signed_fixed:       printf ("(signed_fixed)"); break;
        case DW_ATE_unsigned_fixed:     printf ("(unsigned_fixed)"); break;
+         /* DWARF 4 values:  */
+       case DW_ATE_UTF:                printf ("(unicode string)"); break;
+         /* DWARF 5 values:  */
+       case DW_ATE_UCS:                printf ("(UCS)"); break;
+       case DW_ATE_ASCII:              printf ("(ASCII)"); break;
+
          /* HP extensions:  */
        case DW_ATE_HP_float80:         printf ("(HP_float80)"); break;
        case DW_ATE_HP_complex_float80: printf ("(HP_complex_float80)"); break;
@@ -1572,82 +2509,144 @@ 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_endianity:
+      printf ("\t");
+      switch (uvalue)
+       {
+       case DW_END_default:            printf ("(default)"); break;
+       case DW_END_big:                printf ("(big)"); break;
+       case DW_END_little:             printf ("(little)"); break;
+       default:
+         if (uvalue >= DW_END_lo_user && uvalue <= DW_END_hi_user)
+           printf (_("(user specified)"));
+         else
+           printf (_("(unknown endianity)"));
+         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;
        case DW_CC_program:     printf ("(program)"); break;
        case DW_CC_nocall:      printf ("(nocall)"); break;
+       case DW_CC_pass_by_reference: printf ("(pass by ref)"); break;
+       case DW_CC_pass_by_value: printf ("(pass by value)"); break;
+       case DW_CC_GNU_renesas_sh: printf ("(Rensas SH)"); break;
+       case DW_CC_GNU_borland_fastcall_i386: printf ("(Borland fastcall i386)"); break;
        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 255:
+       case -1: printf (_("(undefined)")); break;
        case 0:  printf ("(row major)"); break;
        case 1:  printf ("(column major)"); break;
        }
       break;
 
+    case DW_AT_decimal_sign:
+      printf ("\t");
+      switch (uvalue)
+       {
+       case DW_DS_unsigned:            printf (_("(unsigned)")); break;
+       case DW_DS_leading_overpunch:   printf (_("(leading overpunch)")); break;
+       case DW_DS_trailing_overpunch:  printf (_("(trailing overpunch)")); break;
+       case DW_DS_leading_separate:    printf (_("(leading separate)")); break;
+       case DW_DS_trailing_separate:   printf (_("(trailing separate)")); break;
+       default:                        printf (_("(unrecognised)")); break;
+       }
+      break;
+
+    case DW_AT_defaulted:
+      printf ("\t");
+      switch (uvalue)
+       {
+       case DW_DEFAULTED_no:           printf (_("(no)")); break;
+       case DW_DEFAULTED_in_class:     printf (_("(in class)")); break;
+       case DW_DEFAULTED_out_of_class: printf (_("(out of class)")); break;
+       default:                        printf (_("(unrecognised)")); break;
+       }
+      break;
+
+    case DW_AT_discr_list:
+      printf ("\t");
+      switch (uvalue)
+       {
+       case DW_DSC_label:  printf (_("(label)")); break;
+       case DW_DSC_range:  printf (_("(range)")); break;
+       default:            printf (_("(unrecognised)")); break;
+       }
+      break;
+      
     case DW_AT_frame_base:
       have_frame_base = 1;
+      /* Fall through.  */
     case DW_AT_location:
     case DW_AT_string_length:
     case DW_AT_return_addr:
@@ -1656,10 +2655,18 @@ 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_call_value:
+    case DW_AT_GNU_call_site_value:
+    case DW_AT_call_data_value:
+    case DW_AT_GNU_call_site_data_value:
+    case DW_AT_call_target:
+    case DW_AT_GNU_call_site_target:
+    case DW_AT_call_target_clobbered:
+    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 +2678,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,
@@ -1684,32 +2691,57 @@ read_and_display_attr_value (unsigned long attribute,
        }
       break;
 
+    case DW_AT_data_bit_offset:
+    case DW_AT_byte_size:
+    case DW_AT_bit_size:
+    case DW_AT_string_length_byte_size:
+    case DW_AT_string_length_bit_size:
+    case DW_AT_bit_stride:
+      if (form == DW_FORM_exprloc)
+       {
+         printf ("\t(");
+         (void) decode_location_expression (block_start, pointer_size,
+                                            offset_size, dwarf_version,
+                                            uvalue, cu_offset, section);
+         printf (")");
+       }
+      break;
+
     case DW_AT_import:
       {
-        if (form == DW_FORM_ref_sig8)
-          break;
+       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 0x%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,310 +2754,234 @@ read_and_display_attr_value (unsigned long attribute,
   return data;
 }
 
-static 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";
-
-    default:
-      {
-       static char buffer[100];
-
-       snprintf (buffer, sizeof (buffer), _("Unknown AT value: %lx"),
-                 attribute);
-       return buffer;
-      }
-    }
-}
-
 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,
-                      int dwarf_version,
-                      debug_info * debug_info_p,
-                      int do_loc,
-                      struct dwarf_section * section)
+read_and_display_attr (unsigned long           attribute,
+                      unsigned long           form,
+                      dwarf_signed_vma        implicit_const,
+                      unsigned char *         data,
+                      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 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, implicit_const, 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;
 }
 
+/* Like load_debug_section, but if the ordinary call fails, and we are
+   following debug links, then attempt to load the requested section
+   from one of the separate debug info files.  */
 
-/* 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
-   a .debug_types section instead of a .debug_info section.  */
-
-static int
-process_debug_info (struct dwarf_section *section,
-                   void *file,
-                    enum dwarf_section_display_enum abbrev_sec,
-                   int do_loc,
-                   int do_types)
+static bfd_boolean
+load_debug_section_with_follow (enum dwarf_section_display_enum sec_enum,
+                               void * handle)
 {
-  unsigned char *start = section->start;
-  unsigned char *end = start + section->size;
-  unsigned char *section_begin;
-  unsigned int unit;
-  unsigned int num_units = 0;
+  if (load_debug_section (sec_enum, handle))
+    {
+      if (debug_displays[sec_enum].section.filename == NULL)
+       {
+         /* See if we can associate a filename with this section.  */
+         separate_info * i;
 
-  if ((do_loc || do_debug_loc || do_debug_ranges)
-      && num_debug_info_entries == 0
-      && ! do_types)
+         for (i = first_separate_info; i != NULL; i = i->next)
+           if (i->handle == handle)
+             {
+               debug_displays[sec_enum].section.filename = i->filename;
+               break;
+             }
+       }
+
+      return TRUE;
+    }
+
+  if (do_follow_links)
     {
-      unsigned long length;
+      separate_info * i;
 
-      /* First scan the section to get the number of comp units.  */
-      for (section_begin = start, num_units = 0; section_begin < end;
-          num_units ++)
+      for (i = first_separate_info; i != NULL; i = i->next)
        {
-         /* 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);
-
-         if (length == 0xffffffff)
+         if (load_debug_section (sec_enum, i->handle))
            {
-             length = byte_get (section_begin + 4, 8);
+             debug_displays[sec_enum].section.filename = i->filename;
+
+             /* FIXME: We should check to see if any of the remaining debug info
+                files also contain this section, and, umm, do something about it.  */
+             return TRUE;
+           }
+       }
+    }
+
+  return FALSE;
+}
+
+static void
+introduce (struct dwarf_section * section, bfd_boolean raw)
+{
+  if (raw)
+    {
+      if (do_follow_links && section->filename)
+       printf (_("Raw dump of debug contents of section %s (loaded from %s):\n\n"),
+               section->name, section->filename);
+      else
+       printf (_("Raw dump of debug contents of section %s:\n\n"), section->name);
+    }
+  else
+    {
+      if (do_follow_links && section->filename)
+       printf (_("Contents of the %s section (loaded from %s):\n\n"),
+               section->name, section->filename);
+      else
+       printf (_("Contents of the %s section:\n\n"), section->name);
+    }
+}
+  
+/* Process the contents of a .debug_info section.
+   If do_loc is TRUE then we are scanning for location lists and dwo tags
+   and we do not want to display anything to the user.
+   If do_types is TRUE, we are processing a .debug_types section instead of
+   a .debug_info section.
+   The information displayed is restricted by the values in DWARF_START_DIE
+   and DWARF_CUTOFF_LEVEL.
+   Returns TRUE upon success.  Otherwise an error or warning message is
+   printed and FALSE is returned.  */
+
+static bfd_boolean
+process_debug_info (struct dwarf_section *           section,
+                   void *                           file,
+                   enum dwarf_section_display_enum  abbrev_sec,
+                   bfd_boolean                      do_loc,
+                   bfd_boolean                      do_types)
+{
+  unsigned char *start = section->start;
+  unsigned char *end = start + section->size;
+  unsigned char *section_begin;
+  unsigned int unit;
+  unsigned int num_units = 0;
+
+  if ((do_loc || do_debug_loc || do_debug_ranges)
+      && num_debug_info_entries == 0
+      && ! do_types)
+    {
+      dwarf_vma length;
+
+      /* First scan the section to get the number of comp units.  */
+      for (section_begin = start, num_units = 0; section_begin < end;
+          num_units ++)
+       {
+         /* 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.  */
+         SAFE_BYTE_GET (length, section_begin, 4, end);
+
+         if (length == 0xffffffff)
+           {
+             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);
-             return 0;
+             warn (_("Reserved length value (0x%s) found in section %s\n"),
+                   dwarf_vmatoa ("x", length), section->name);
+             return FALSE;
            }
          else
            section_begin += length + 4;
 
          /* Negative values are illegal, they may even cause infinite
             looping.  This can happen if we can't accurately apply
-            relocations to an object file.  */
-         if ((signed long) length <= 0)
+            relocations to an object file, or if the file is corrupt.  */
+         if ((signed long) length <= 0 || section_begin < start)
            {
-             warn (_("Corrupt unit length (%lx) found in section %s\n"), length, section->name);
-             return 0;
+             warn (_("Corrupt unit length (0x%s) found in section %s\n"),
+                   dwarf_vmatoa ("x", length), section->name);
+             return FALSE;
            }
        }
 
       if (num_units == 0)
        {
-         error (_("No comp units in %s section ?"), section->name);
-         return 0;
+         error (_("No comp units in %s section ?\n"), section->name);
+         return FALSE;
        }
 
       /* Then allocate an array to hold the information.  */
       debug_information = (debug_info *) cmalloc (num_units,
-                                                  sizeof (* debug_information));
+                                                 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;
+         alloc_num_debug_info_entries = num_debug_info_entries = 0;
+         return FALSE;
        }
+
+      /* PR 17531: file: 92ca3797.
+        We cannot rely upon the debug_information array being initialised
+        before it is used.  A corrupt file could easily contain references
+        to a unit for which information has not been made available.  So
+        we ensure that the array is zeroed here.  */
+      memset (debug_information, 0, num_units * sizeof (*debug_information));
+
+      alloc_num_debug_info_entries = num_units;
     }
 
   if (!do_loc)
     {
-      printf (_("Contents of the %s section:\n\n"), section->name);
-
-      load_debug_section (str, file);
+      load_debug_section_with_follow (str, file);
+      load_debug_section_with_follow (line_str, file);
+      load_debug_section_with_follow (str_dwo, file);
+      load_debug_section_with_follow (str_index, file);
+      load_debug_section_with_follow (str_index_dwo, file);
+      load_debug_section_with_follow (debug_addr, file);
     }
 
-  load_debug_section (abbrev_sec, file);
+  load_debug_section_with_follow (abbrev_sec, file);
   if (debug_displays [abbrev_sec].section.start == NULL)
     {
       warn (_("Unable to locate %s section!\n"),
-           debug_displays [abbrev_sec].section.name);
-      return 0;
+           debug_displays [abbrev_sec].section.uncompressed_name);
+      return FALSE;
     }
 
+  if (!do_loc && dwarf_start_die == 0)
+    introduce (section, FALSE);
+  
   for (section_begin = start, unit = 0; start < end; unit++)
     {
       DWARF2_Internal_CompUnit compunit;
       unsigned char *hdrptr;
       unsigned char *tags;
-      int level;
-      unsigned long cu_offset;
-      int offset_size;
-      int initial_length_size;
-      unsigned char signature[8] = { 0 };
-      unsigned long type_offset = 0;
+      int level, last_level, saved_level;
+      dwarf_vma cu_offset;
+      unsigned long sec_off;
+      unsigned int offset_size;
+      unsigned int initial_length_size;
+      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,30 +2991,64 @@ 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);
+
+      if (compunit.cu_version < 5)
+       {
+         compunit.cu_unit_type = DW_UT_compile;
+         /* Initialize it due to a false compiler warning.  */
+         compunit.cu_pointer_size = -1;
+       }
+      else
+       {
+         SAFE_BYTE_GET_AND_INC (compunit.cu_unit_type, hdrptr, 1, end);
+         do_types = (compunit.cu_unit_type == DW_UT_type);
+
+         SAFE_BYTE_GET_AND_INC (compunit.cu_pointer_size, hdrptr, 1, end);
+       }
 
-      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];
+       }
+
+      if (compunit.cu_version < 5)
+       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;
+       }
 
-          for (i = 0; i < 8; i++)
-            {
-              signature[i] = byte_get (hdrptr, 1);
-              hdrptr += 1;
-            }
+      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);
+       }
 
-          type_offset = byte_get (hdrptr, offset_size);
-          hdrptr += offset_size;
-        }
+      if (dwarf_start_die > (cu_offset + compunit.cu_length
+                            + initial_length_size))
+       {
+         start = section_begin + cu_offset + compunit.cu_length
+           + initial_length_size;
+         continue;
+       }
 
       if ((do_loc || do_debug_loc || do_debug_ranges)
          && num_debug_info_entries == 0
@@ -2070,6 +3060,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,60 +3071,103 @@ 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)
+      sec_off = cu_offset + initial_length_size;
+      if (sec_off + compunit.cu_length < sec_off
+         || sec_off + compunit.cu_length > 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, %s header at %#lx has length %s\n"),
+               section->name,
+               (unsigned long) cu_offset,
+               dwarf_vmatoa ("x", compunit.cu_length));
+         num_units = unit;
          break;
        }
+
       tags = hdrptr;
       start += compunit.cu_length + initial_length_size;
 
-      if (compunit.cu_version != 2
-         && compunit.cu_version != 3
-         && compunit.cu_version != 4)
+      if (compunit.cu_version < 2 || compunit.cu_version > 5)
+       {
+         warn (_("CU at offset %s contains corrupt or "
+                 "unsupported version number: %d.\n"),
+               dwarf_vmatoa ("x", cu_offset), compunit.cu_version);
+         continue;
+       }
+
+      if (compunit.cu_unit_type != DW_UT_compile
+         && compunit.cu_unit_type != DW_UT_type)
        {
-         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 unit type: %d.\n"),
+               dwarf_vmatoa ("x", cu_offset), compunit.cu_unit_type);
          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) abbrev_size);
+      /* PR 17531: file:4bcd9ce9.  */
+      else if ((abbrev_base + abbrev_size)
+              > debug_displays [abbrev_sec].section.size)
+       warn (_("Debug info is corrupted, abbrev size (%lx) is larger than abbrev section size (%lx)\n"),
+             (unsigned long) abbrev_base + abbrev_size,
              (unsigned long) debug_displays [abbrev_sec].section.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 +3175,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 +3198,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 +3211,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 TRUE;
              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,18 +3252,18 @@ process_debug_info (struct dwarf_section *section,
 
          if (entry == NULL)
            {
-             if (!do_loc)
+             if (!do_loc && do_printing)
                {
                  printf ("\n");
                  fflush (stdout);
                }
-             warn (_("DIE at offset %lx refers to abbreviation number %lu which does not exist\n"),
+             warn (_("DIE at offset 0x%lx refers to abbreviation number %lu which does not exist\n"),
                    die_offset, abbrev_number);
-             return 0;
+             return FALSE;
            }
 
-         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)
            {
@@ -2211,7 +3271,8 @@ process_debug_info (struct dwarf_section *section,
              need_base_address = 0;
              break;
            case DW_TAG_compile_unit:
-             need_base_address = 1;
+             need_base_address = 1;    
+             need_dwo_info = do_loc;
              break;
            case DW_TAG_entry_point:
            case DW_TAG_subprogram:
@@ -2221,25 +3282,64 @@ process_debug_info (struct dwarf_section *section,
              break;
            }
 
-         for (attr = entry->first_attr; attr; attr = attr->next)
+         debug_info *debug_info_p =
+           (debug_information && unit < alloc_num_debug_info_entries)
+           ? debug_information + unit : NULL;
+
+         assert (!debug_info_p
+                 || (debug_info_p->num_loc_offsets
+                     == debug_info_p->num_loc_views));
+
+         for (attr = entry->first_attr;
+              attr && attr->attribute;
+              attr = attr->next)
            {
-             if (! do_loc)
+             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));
              tags = read_and_display_attr (attr->attribute,
                                            attr->form,
-                                           tags, cu_offset,
+                                           attr->implicit_const,
+                                           tags,
+                                           end,
+                                           cu_offset,
                                            compunit.cu_pointer_size,
                                            offset_size,
                                            compunit.cu_version,
-                                           debug_information + unit,
-                                           do_loc, section);
+                                           debug_info_p,
+                                           do_loc || ! do_printing,
+                                           section,
+                                           this_set);
+           }
+
+         /* If a locview attribute appears before a location one,
+            make sure we don't associate it with an earlier
+            loclist. */
+         if (debug_info_p)
+           switch (debug_info_p->num_loc_offsets - debug_info_p->num_loc_views)
+             {
+             case 1:
+               debug_info_p->loc_views [debug_info_p->num_loc_views] = vm1;
+               debug_info_p->num_loc_views++;
+               assert (debug_info_p->num_loc_views
+                       == debug_info_p->num_loc_offsets);
+               break;
+
+             case 0:
+               break;
+
+             case -1:
+               warn(_("DIE has locviews without loclist\n"));
+               debug_info_p->num_loc_views--;
+               break;
+
+             default:
+               assert (0);
            }
 
-         if (entry->children)
-           ++level;
-       }
+         if (entry->children)
+           ++level;
+       }
     }
 
   /* Set num_debug_info_entries here so that it can be used to check if
@@ -2247,14 +3347,17 @@ process_debug_info (struct dwarf_section *section,
   if ((do_loc || do_debug_loc || do_debug_ranges)
       && num_debug_info_entries == 0
       && ! do_types)
-    num_debug_info_entries = num_units;
-
-  if (!do_loc)
     {
-      printf ("\n");
+      if (num_units > alloc_num_debug_info_entries)
+       num_debug_info_entries = alloc_num_debug_info_entries;
+      else
+       num_debug_info_entries = num_units;
     }
 
-  return 1;
+  if (!do_loc)
+    printf ("\n");
+
+  return TRUE;
 }
 
 /* Locate and scan the .debug_info section in the file and record the pointer
@@ -2266,13 +3369,8 @@ process_debug_info (struct dwarf_section *section,
 static unsigned int
 load_debug_info (void * file)
 {
-  /* Reset the last pointer size so that we can issue correct error
-     messages if we are displaying the contents of more than one section.  */
-  last_pointer_size = 0;
-  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,351 +3378,681 @@ load_debug_info (void * file)
   if (num_debug_info_entries > 0)
     return num_debug_info_entries;
 
-  if (load_debug_section (info, file)
-      && process_debug_info (&debug_displays [info].section, file, abbrev, 1, 0))
+  /* If this is a DWARF package file, load the CU and TU indexes.  */
+  (void) load_cu_tu_indexes (file);
+
+  if (load_debug_section_with_follow (info, file)
+      && process_debug_info (&debug_displays [info].section, file, abbrev, TRUE, FALSE))
+    return num_debug_info_entries;
+
+  if (load_debug_section_with_follow (info_dwo, file)
+      && process_debug_info (&debug_displays [info_dwo].section, file,
+                            abbrev_dwo, TRUE, FALSE))
     return num_debug_info_entries;
 
   num_debug_info_entries = DEBUG_INFO_UNAVAILABLE;
   return 0;
 }
 
-static int
-display_debug_lines_raw (struct dwarf_section *section,
-                        unsigned char *data,
-                         unsigned char *end)
-{
-  unsigned char *start = section->start;
+/* 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.  */
 
-  printf (_("Raw dump of debug contents of section %s:\n\n"),
-          section->name);
+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 initial_length_size;
+  unsigned char address_size, segment_selector_size;
 
-  while (data < end)
-    {
-      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;
-      int i;
+  /* Extract information from the Line Number Program Header.
+     (section 6.2.4 in the Dwarf3 doc).  */
+  hdrptr = data;
 
-      hdrptr = data;
-      hdroff = hdrptr - start;
+  /* Get and check the length of the block.  */
+  SAFE_BYTE_GET_AND_INC (linfo->li_length, hdrptr, 4, end);
 
-      /* Check the length of the block.  */
-      linfo.li_length = byte_get (hdrptr, 4);
-      hdrptr += 4;
+  if (linfo->li_length == 0xffffffff)
+    {
+      /* This section is 64-bit DWARF 3.  */
+      SAFE_BYTE_GET_AND_INC (linfo->li_length, hdrptr, 8, end);
+      linfo->li_offset_size = 8;
+      initial_length_size = 12;
+    }
+  else
+    {
+      linfo->li_offset_size = 4;
+      initial_length_size = 4;
+    }
 
-      if (linfo.li_length == 0xffffffff)
+  if (linfo->li_length + initial_length_size > section->size)
+    {
+      /* If the length field has a relocation against it, then we should
+        not complain if it is inaccurate (and probably negative).  This
+        happens in object files when the .debug_line section is actually
+        comprised of several different .debug_line.* sections, (some of
+        which may be removed by linker garbage collection), and a relocation
+        is used to compute the correct length once that is done.  */
+      if (reloc_at (section, (hdrptr - section->start) - linfo->li_offset_size))
        {
-         /* This section is 64-bit DWARF 3.  */
-         linfo.li_length = byte_get (hdrptr, 8);
-         hdrptr += 8;
-         offset_size = 8;
-         initial_length_size = 12;
+         linfo->li_length = (end - data) - initial_length_size;
        }
       else
        {
-         offset_size = 4;
-         initial_length_size = 4;
+         warn (_("The length field (0x%lx) in the debug_line header is wrong - the section is too small\n"),
+               (long) linfo->li_length);
+         return NULL;
        }
+    }
+
+  /* Get and check the version number.  */
+  SAFE_BYTE_GET_AND_INC (linfo->li_version, hdrptr, 2, end);
 
-      if (linfo.li_length + initial_length_size > section->size)
+  if (linfo->li_version != 2
+      && linfo->li_version != 3
+      && linfo->li_version != 4
+      && linfo->li_version != 5)
+    {
+      warn (_("Only DWARF version 2, 3, 4 and 5 line info "
+             "is currently supported.\n"));
+      return NULL;
+    }
+
+  if (linfo->li_version >= 5)
+    {
+      SAFE_BYTE_GET_AND_INC (address_size, hdrptr, 1, end);
+
+      SAFE_BYTE_GET_AND_INC (segment_selector_size, hdrptr, 1, end);
+      if (segment_selector_size != 0)
        {
-         warn
-           (_("The information in section %s appears to be corrupt - the section is too small\n"),
-            section->name);
+         warn (_("The %s section contains "
+                 "unsupported segment selector size: %d.\n"),
+               section->name, segment_selector_size);
          return 0;
        }
+    }
+
+  SAFE_BYTE_GET_AND_INC (linfo->li_prologue_length, hdrptr,
+                        linfo->li_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);
 
-      /* 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)
+      if (linfo->li_max_ops_per_insn == 0)
        {
-         warn (_("Only DWARF version 2, 3 and 4 line info is currently supported.\n"));
-         return 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;
+  /* PR 17512: file:002-117414-0.004.  */
+  if (* end_of_sequence > end)
+    {
+      warn (_("Line length %s extends beyond end of section\n"),
+           dwarf_vmatoa ("u", linfo->li_length));
+      * end_of_sequence = end;
+      return NULL;
+    }
 
-      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)
+  return hdrptr;
+}
+
+static unsigned char *
+display_formatted_table (unsigned char *                   data,
+                        unsigned char *                   start,
+                        unsigned char *                   end,
+                        const DWARF2_Internal_LineInfo *  linfo,
+                        struct dwarf_section *            section,
+                        bfd_boolean                       is_dir)
+{
+  unsigned char *format_start, format_count, *format, formati;
+  dwarf_vma data_count, datai;
+  unsigned int bytes_read, namepass, last_entry = 0;
+
+  SAFE_BYTE_GET_AND_INC (format_count, data, 1, end);
+  format_start = data;
+  for (formati = 0; formati < format_count; formati++)
+    {
+      read_uleb128 (data, & bytes_read, end);
+      data += bytes_read;
+      read_uleb128 (data, & bytes_read, end);
+      data += bytes_read;
+      if (data == end)
        {
-         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;
-           }
+         if (is_dir)
+           warn (_("Corrupt directory format table entry\n"));
+         else
+           warn (_("Corrupt file name format table entry\n"));
+         return data;
        }
+    }
+
+  data_count = read_uleb128 (data, & bytes_read, end);
+  data += bytes_read;
+  if (data == end)
+    {
+      if (is_dir)
+       warn (_("Corrupt directory list\n"));
       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)
+       warn (_("Corrupt file name list\n"));
+      return data;
+    }
+
+  if (data_count == 0)
+    {
+      if (is_dir)
        printf (_("\n The Directory Table is empty.\n"));
       else
+       printf (_("\n The File Name Table is empty.\n"));
+      return data;
+    }
+
+  if (is_dir)
+    printf (_("\n The Directory Table (offset 0x%lx):\n"),
+           (long) (data - start));
+  else
+    printf (_("\n The File Name Table (offset 0x%lx):\n"),
+           (long) (data - start));
+
+  printf (_("  Entry"));
+  /* Delay displaying name as the last entry for better screen layout.  */ 
+  for (namepass = 0; namepass < 2; namepass++)
+    {
+      format = format_start;
+      for (formati = 0; formati < format_count; formati++)
        {
-         printf (_("\n The Directory Table:\n"));
+         dwarf_vma content_type;
+
+         content_type = read_uleb128 (format, & bytes_read, end);
+         format += bytes_read;
+         if ((content_type == DW_LNCT_path) == (namepass == 1))
+           switch (content_type)
+             {
+             case DW_LNCT_path:
+               printf (_("\tName"));
+               break;
+             case DW_LNCT_directory_index:
+               printf (_("\tDir"));
+               break;
+             case DW_LNCT_timestamp:
+               printf (_("\tTime"));
+               break;
+             case DW_LNCT_size:
+               printf (_("\tSize"));
+               break;
+             case DW_LNCT_MD5:
+               printf (_("\tMD5"));
+               break;
+             default:
+               printf (_("\t(Unknown format content type %s)"),
+                       dwarf_vmatoa ("u", content_type));
+             }
+         read_uleb128 (format, & bytes_read, end);
+         format += bytes_read;
+       }
+    }
+  putchar ('\n');
 
-         while (*data != 0)
-           {
-             printf (_("  %s\n"), data);
+  for (datai = 0; datai < data_count; datai++)
+    {
+      unsigned char *datapass = data;
 
-             data += strlen ((char *) data) + 1;
+      printf ("  %d", last_entry++);
+      /* Delay displaying name as the last entry for better screen layout.  */ 
+      for (namepass = 0; namepass < 2; namepass++)
+       {
+         format = format_start;
+         data = datapass;
+         for (formati = 0; formati < format_count; formati++)
+           {
+             dwarf_vma content_type, form;
+
+             content_type = read_uleb128 (format, & bytes_read, end);
+             format += bytes_read;
+             form = read_uleb128 (format, & bytes_read, end);
+             format += bytes_read;
+             data = read_and_display_attr_value (0, form, 0, data, end, 0, 0,
+                                                 linfo->li_offset_size,
+                                                 linfo->li_version, NULL,
+                           ((content_type == DW_LNCT_path) != (namepass == 1)),
+                                                 section, NULL, '\t');
            }
        }
+      if (data == end)
+       {
+         if (is_dir)
+           warn (_("Corrupt directory entries list\n"));
+         else
+           warn (_("Corrupt file name entries list\n"));
+         return data;
+       }
+      putchar ('\n');
+    }
+  return data;
+}
 
-      /* Skip the NUL at the end of the table.  */
-      data++;
+static int
+display_debug_lines_raw (struct dwarf_section *  section,
+                        unsigned char *         data,
+                        unsigned char *         end,
+                        void *                  file)
+{
+  unsigned char *start = section->start;
+  int verbose_view = 0;
 
-      /* Display the contents of the File Name table.  */
-      if (*data == 0)
-       printf (_("\n The File Name Table is empty.\n"));
+  introduce (section, TRUE);
+
+  while (data < end)
+    {
+      static DWARF2_Internal_LineInfo saved_linfo;
+      DWARF2_Internal_LineInfo linfo;
+      unsigned char *standard_opcodes;
+      unsigned char *end_of_sequence;
+      int i;
+
+      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)
+       {
+         /* 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;
+         /* PR 17531: file: 0522b371.  */
+         if (linfo.li_line_range == 0)
+           {
+             warn (_("Partial .debug_line. section encountered without a prior full .debug_line section\n"));
+             return 0;
+           }
+         reset_state_machine (linfo.li_default_is_stmt);
+       }
       else
        {
-         printf (_("\n The File Name Table:\n"));
-         printf (_("  Entry\tDir\tTime\tSize\tName\n"));
-
-         while (*data != 0)
+         unsigned char * hdrptr;
+
+         if ((hdrptr = read_debug_line_header (section, data, end, & linfo,
+                                               & end_of_sequence)) == NULL)
+           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"), (int) 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);
+
+         /* PR 17512: file: 1665-6428-0.004.  */
+         if (linfo.li_line_range == 0)
            {
-             unsigned char *name;
-             unsigned int bytes_read;
+             warn (_("Line range of 0 is invalid, using 1 instead\n"));
+             linfo.li_line_range = 1;
+           }
 
-             printf (_("  %d\t"), ++state_machine_regs.last_file_entry);
-             name = data;
+         reset_state_machine (linfo.li_default_is_stmt);
 
-             data += strlen ((char *) data) + 1;
+         /* Display the contents of the Opcodes table.  */
+         standard_opcodes = hdrptr;
 
-             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);
+         /* PR 17512: file: 002-417945-0.004.  */
+         if (standard_opcodes + linfo.li_opcode_base >= end)
+           {
+             warn (_("Line Base extends beyond end of section\n"));
+             return 0;
            }
-       }
 
-      /* Skip the NUL at the end of the table.  */
-      data++;
+         printf (_("\n Opcodes:\n"));
 
-      /* Now display the statements.  */
-      printf (_("\n Line Number Statements:\n"));
+         for (i = 1; i < linfo.li_opcode_base; i++)
+           printf (ngettext ("  Opcode %d has %d arg\n",
+                             "  Opcode %d has %d args\n",
+                             standard_opcodes[i - 1]),
+                   i, standard_opcodes[i - 1]);
 
-      while (data < end_of_sequence)
-       {
-         unsigned char op_code;
-         int adv;
-         unsigned long int uladv;
-         unsigned int bytes_read;
+         /* Display the contents of the Directory table.  */
+         data = standard_opcodes + linfo.li_opcode_base - 1;
 
-         op_code = *data++;
+         if (linfo.li_version >= 5)
+           {
+             load_debug_section_with_follow (line_str, file);
 
-         if (op_code >= linfo.li_opcode_base)
+             data = display_formatted_table (data, start, end, &linfo, section,
+                                             TRUE);
+             data = display_formatted_table (data, start, end, &linfo, section,
+                                             FALSE);
+           }
+         else
            {
-             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);
-               }
+             if (*data == 0)
+               printf (_("\n The Directory Table is empty.\n"));
              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)
-           {
-           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;
-
-           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
-               {
-                 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;
+                 unsigned int last_dir_entry = 0;
 
-           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;
+                 printf (_("\n The Directory Table (offset 0x%lx):\n"),
+                         (long)(data - start));
 
-           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;
+                 while (data < end && *data != 0)
+                   {
+                     printf ("  %d\t%.*s\n", ++last_dir_entry, (int) (end - data), data);
 
-           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;
+                     data += strnlen ((char *) data, end - data) + 1;
+                   }
 
-           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;
+                 /* PR 17512: file: 002-132094-0.004.  */
+                 if (data >= end - 1)
+                   break;
+               }
 
-           case DW_LNS_set_basic_block:
-             printf (_("  Set basic block\n"));
-             state_machine_regs.basic_block = 1;
-             break;
+             /* Skip the NUL at the end of the table.  */
+             data++;
 
-           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);
-               }
+             /* Display the contents of the File Name table.  */
+             if (*data == 0)
+               printf (_("\n The File Name Table is empty.\n"));
              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);
+                 printf (_("\n The File Name Table (offset 0x%lx):\n"),
+                         (long)(data - start));
+                 printf (_("  Entry\tDir\tTime\tSize\tName\n"));
+
+                 while (data < end && *data != 0)
+                   {
+                     unsigned char *name;
+                     unsigned int bytes_read;
+
+                     printf ("  %d\t", ++state_machine_regs.last_file_entry);
+                     name = data;
+                     data += strnlen ((char *) data, end - data) + 1;
+
+                     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", (int)(end - name), name);
+
+                     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++;
+           }
 
-           case DW_LNS_set_prologue_end:
-             printf (_("  Set prologue_end to true\n"));
-             break;
+         putchar ('\n');
+         saved_linfo = linfo;
+       }
 
-           case DW_LNS_set_epilogue_begin:
-             printf (_("  Set epilogue_begin 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_isa:
-             uladv = read_leb128 (data, & bytes_read, 0);
-             data += bytes_read;
-             printf (_("  Set ISA to %lu\n"), uladv);
-             break;
+         while (data < end_of_sequence)
+           {
+             unsigned char op_code;
+             dwarf_signed_vma adv;
+             dwarf_vma uladv;
+             unsigned int bytes_read;
 
-           default:
-             printf (_("  Unknown opcode %d with operands: "), op_code);
+             printf ("  [0x%08lx]", (long)(data - start));
+
+             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;
+                     if (uladv)
+                       state_machine_regs.view = 0;
+                     printf (_("  Special opcode %d: "
+                               "advance Address by %s to 0x%s%s"),
+                             op_code, dwarf_vmatoa ("u", uladv),
+                             dwarf_vmatoa ("x", state_machine_regs.address),
+                             verbose_view && uladv
+                             ? _(" (reset view)") : "");
+                   }
+                 else
+                   {
+                     unsigned addrdelta
+                       = ((state_machine_regs.op_index + uladv)
+                           / linfo.li_max_ops_per_insn)
+                       * linfo.li_min_insn_length;
+
+                     state_machine_regs.address += addrdelta;
+                     state_machine_regs.op_index
+                       = (state_machine_regs.op_index + uladv)
+                       % linfo.li_max_ops_per_insn;
+                     if (addrdelta)
+                       state_machine_regs.view = 0;
+                     printf (_("  Special opcode %d: "
+                               "advance Address by %s to 0x%s[%d]%s"),
+                             op_code, dwarf_vmatoa ("u", uladv),
+                             dwarf_vmatoa ("x", state_machine_regs.address),
+                             state_machine_regs.op_index,
+                             verbose_view && addrdelta
+                             ? _(" (reset view)") : "");
+                   }
+                 adv = (op_code % linfo.li_line_range) + linfo.li_line_base;
+                 state_machine_regs.line += adv;
+                 printf (_(" and Line by %s to %d"),
+                         dwarf_vmatoa ("d", adv), state_machine_regs.line);
+                 if (verbose_view || state_machine_regs.view)
+                   printf (_(" (view %u)\n"), state_machine_regs.view);
+                 else
+                   putchar ('\n');
+                 state_machine_regs.view++;
                }
-             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"));
+                      if (verbose_view || state_machine_regs.view)
+                        printf (_(" (view %u)\n"), state_machine_regs.view);
+                      else
+                        putchar ('\n');
+                      state_machine_regs.view++;
+                      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;
+                          if (uladv)
+                            state_machine_regs.view = 0;
+                          printf (_("  Advance PC by %s to 0x%s%s\n"),
+                                  dwarf_vmatoa ("u", uladv),
+                                  dwarf_vmatoa ("x", state_machine_regs.address),
+                                  verbose_view && uladv
+                                  ? _(" (reset view)") : "");
+                        }
+                      else
+                        {
+                          unsigned addrdelta
+                            = ((state_machine_regs.op_index + uladv)
+                               / linfo.li_max_ops_per_insn)
+                            * linfo.li_min_insn_length;
+                          state_machine_regs.address
+                            += addrdelta;
+                          state_machine_regs.op_index
+                            = (state_machine_regs.op_index + uladv)
+                            % linfo.li_max_ops_per_insn;
+                          if (addrdelta)
+                            state_machine_regs.view = 0;
+                          printf (_("  Advance PC by %s to 0x%s[%d]%s\n"),
+                                  dwarf_vmatoa ("u", uladv),
+                                  dwarf_vmatoa ("x", state_machine_regs.address),
+                                  state_machine_regs.op_index,
+                                  verbose_view && addrdelta
+                                  ? _(" (reset view)") : "");
+                        }
+                      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;
+                          if (uladv)
+                            state_machine_regs.view = 0;
+                          printf (_("  Advance PC by constant %s to 0x%s%s\n"),
+                                  dwarf_vmatoa ("u", uladv),
+                                  dwarf_vmatoa ("x", state_machine_regs.address),
+                                  verbose_view && uladv
+                                  ? _(" (reset view)") : "");
+                        }
+                      else
+                        {
+                          unsigned addrdelta
+                            = ((state_machine_regs.op_index + uladv)
+                               / linfo.li_max_ops_per_insn)
+                            * linfo.li_min_insn_length;
+                          state_machine_regs.address
+                            += addrdelta;
+                          state_machine_regs.op_index
+                            = (state_machine_regs.op_index + uladv)
+                            % linfo.li_max_ops_per_insn;
+                          if (addrdelta)
+                            state_machine_regs.view = 0;
+                          printf (_("  Advance PC by constant %s to 0x%s[%d]%s\n"),
+                                  dwarf_vmatoa ("u", uladv),
+                                  dwarf_vmatoa ("x", state_machine_regs.address),
+                                  state_machine_regs.op_index,
+                                  verbose_view && addrdelta
+                                  ? _(" (reset view)") : "");
+                        }
+                      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));
+                      /* Do NOT reset view.  */
+                      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,21 +4060,23 @@ 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.  */
 
 static int
-display_debug_lines_decoded (struct dwarf_section *section,
-                            unsigned char *data,
-                            unsigned char *end)
+display_debug_lines_decoded (struct dwarf_section *  section,
+                            unsigned char *         data,
+                            unsigned char *         end,
+                            void *                  fileptr)
 {
-  printf (_("Decoded dump of debug contents of section %s:\n\n"),
-          section->name);
+  static DWARF2_Internal_LineInfo saved_linfo;
+
+  introduce (section, FALSE);
 
   while (data < end)
     {
@@ -2654,203 +4084,372 @@ 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;
+      dwarf_vma 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)
-        {
-          /* This section is 64-bit DWARF 3.  */
-          linfo.li_length = byte_get (hdrptr, 8);
-          hdrptr += 8;
-          offset_size = 8;
-          initial_length_size = 12;
-        }
-      else
-        {
-          offset_size = 4;
-          initial_length_size = 4;
-        }
-
-      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;
-        }
-
-      /* 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;
-        }
-
-      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)
+      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)
+       {
+         /* See comment in display_debug_lines_raw().  */
+         end_of_sequence = end;
+         standard_opcodes = NULL;
+         linfo = saved_linfo;
+         /* PR 17531: file: 0522b371.  */
+         if (linfo.li_line_range == 0)
            {
-             warn (_("Invalid maximum operations per insn.\n"));
+             warn (_("Partial .debug_line. section encountered without a prior full .debug_line section\n"));
              return 0;
            }
+         reset_state_machine (linfo.li_default_is_stmt);
        }
       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;
-
-         while (*data != 0)
+       {
+         unsigned char *hdrptr;
+
+         if ((hdrptr = read_debug_line_header (section, data, end, & linfo,
+                                               & end_of_sequence)) == NULL)
+             return 0;
+
+         /* PR 17531: file: 0522b371.  */
+         if (linfo.li_line_range == 0)
+           {
+             warn (_("Line range of 0 is invalid, using 1 instead\n"));
+             linfo.li_line_range = 1;
+           }
+         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;
+         /* PR 20440 */
+         if (data >= end)
            {
-             data += strlen ((char *) data) + 1;
-             n_directories++;
+             warn (_("opcode base of %d extends beyond end of section\n"),
+                   linfo.li_opcode_base);
+             return 0;
            }
 
-          /* Go through the directory table again to save the directories.  */
-          directory_table = (unsigned char **)
-              xmalloc (n_directories * sizeof (unsigned char *));
-
-          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++;
-
-      /* 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;
-
-          while (*data != 0)
-            {
+         if (linfo.li_version >= 5)
+           {
+             unsigned char *format_start, format_count, *format;
+             dwarf_vma formati, entryi;
              unsigned int bytes_read;
 
-              /* 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++;
-            }
-
-          /* Go through the file table again to save the strings.  */
-          file_table = (File_Entry *) xmalloc (n_files * sizeof (File_Entry));
-
-          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;
-
-          /* 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"));
-            }
-        }
-
-      /* Skip the NUL at the end of the table.  */
-      data++;
+             load_debug_section_with_follow (line_str, fileptr);
+
+             /* Skip directories format.  */
+             SAFE_BYTE_GET_AND_INC (format_count, data, 1, end);
+             format_start = data;
+             for (formati = 0; formati < format_count; formati++)
+               {
+                 read_uleb128 (data, & bytes_read, end);
+                 data += bytes_read;
+                 read_uleb128 (data, & bytes_read, end);
+                 data += bytes_read;
+               }
+
+             n_directories = read_uleb128 (data, & bytes_read, end);
+             data += bytes_read;
+             if (data == end)
+               {
+                 warn (_("Corrupt directories list\n"));
+                 break;
+               }
+
+             directory_table = (unsigned char **)
+               xmalloc (n_directories * sizeof (unsigned char *));
+
+             for (entryi = 0; entryi < n_directories; entryi++)
+               {
+                 unsigned char **pathp = &directory_table[entryi];
+
+                 format = format_start;
+                 for (formati = 0; formati < format_count; formati++)
+                   {
+                     dwarf_vma content_type, form;
+                     dwarf_vma uvalue;
+
+                     content_type = read_uleb128 (format, & bytes_read, end);
+                     format += bytes_read;
+                     form = read_uleb128 (format, & bytes_read, end);
+                     format += bytes_read;
+                     if (data == end)
+                       {
+                         warn (_("Corrupt directories list\n"));
+                         break;
+                       }
+                     switch (content_type)
+                       {
+                       case DW_LNCT_path:
+                         switch (form)
+                           {
+                           case DW_FORM_string:
+                             *pathp = data;
+                             break;
+                           case DW_FORM_line_strp:
+                             SAFE_BYTE_GET (uvalue, data, linfo.li_offset_size,
+                                            end);
+                             /* Remove const by the cast.  */
+                             *pathp = (unsigned char *)
+                                      fetch_indirect_line_string (uvalue);
+                             break;
+                           }
+                         break;
+                       }
+                     data = read_and_display_attr_value (0, form, 0, data, end,
+                                                         0, 0,
+                                                         linfo.li_offset_size,
+                                                         linfo.li_version,
+                                                         NULL, 1, section,
+                                                         NULL, '\t');
+                   }
+                 if (data == end)
+                   {
+                     warn (_("Corrupt directories list\n"));
+                     break;
+                   }
+               }
+
+             /* Skip files format.  */
+             SAFE_BYTE_GET_AND_INC (format_count, data, 1, end);
+             format_start = data;
+             for (formati = 0; formati < format_count; formati++)
+               {
+                 read_uleb128 (data, & bytes_read, end);
+                 data += bytes_read;
+                 read_uleb128 (data, & bytes_read, end);
+                 data += bytes_read;
+               }
+
+             n_files = read_uleb128 (data, & bytes_read, end);
+             data += bytes_read;
+             if (data == end)
+               {
+                 warn (_("Corrupt file name list\n"));
+                 break;
+               }
+
+             file_table = (File_Entry *) xcalloc (1, n_files
+                                                     * sizeof (File_Entry));
+
+             for (entryi = 0; entryi < n_files; entryi++)
+               {
+                 File_Entry *file = &file_table[entryi];
+
+                 format = format_start;
+                 for (formati = 0; formati < format_count; formati++)
+                   {
+                     dwarf_vma content_type, form;
+                     dwarf_vma uvalue;
+
+                     content_type = read_uleb128 (format, & bytes_read, end);
+                     format += bytes_read;
+                     form = read_uleb128 (format, & bytes_read, end);
+                     format += bytes_read;
+                     if (data == end)
+                       {
+                         warn (_("Corrupt file name list\n"));
+                         break;
+                       }
+                     switch (content_type)
+                       {
+                       case DW_LNCT_path:
+                         switch (form)
+                           {
+                           case DW_FORM_string:
+                             file->name = data;
+                             break;
+                           case DW_FORM_line_strp:
+                             SAFE_BYTE_GET (uvalue, data, linfo.li_offset_size,
+                                            end);
+                             /* Remove const by the cast.  */
+                             file->name = (unsigned char *)
+                                          fetch_indirect_line_string (uvalue);
+                             break;
+                           }
+                         break;
+                       case DW_LNCT_directory_index:
+                         switch (form)
+                           {
+                           case DW_FORM_data1:
+                             SAFE_BYTE_GET (file->directory_index, data, 1,
+                                            end);
+                             break;
+                           case DW_FORM_data2:
+                             SAFE_BYTE_GET (file->directory_index, data, 2,
+                                            end);
+                             break;
+                           case DW_FORM_udata:
+                             file->directory_index = read_uleb128 (data, NULL,
+                                                                   end);
+                             break;
+                           }
+                         break;
+                       }
+                     data = read_and_display_attr_value (0, form, 0, data, end,
+                                                         0, 0,
+                                                         linfo.li_offset_size,
+                                                         linfo.li_version,
+                                                         NULL, 1, section,
+                                                         NULL, '\t');
+                   }
+                 if (data == end)
+                   {
+                     warn (_("Corrupt file name list\n"));
+                     break;
+                   }
+               }
+           }
+         else
+           {
+             if (*data != 0)
+               {
+                 unsigned char *ptr_directory_table = data;
+
+                 while (data < end && *data != 0)
+                   {
+                     data += strnlen ((char *) data, end - data) + 1;
+                     n_directories++;
+                   }
+
+                 /* PR 20440 */
+                 if (data >= end)
+                   {
+                     warn (_("directory table ends unexpectedly\n"));
+                     n_directories = 0;
+                     break;
+                   }
+
+                 /* Go through the directory table again to save the directories.  */
+                 directory_table = (unsigned char **)
+                   xmalloc (n_directories * sizeof (unsigned char *));
+
+                 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++;
+
+             /* Traverse the File Name table just to count the entries.  */
+             if (data < end && *data != 0)
+               {
+                 unsigned char *ptr_file_name_table = data;
+
+                 while (data < end && *data != 0)
+                   {
+                     unsigned int bytes_read;
+
+                     /* 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;
+
+                     n_files++;
+                   }
+
+                 if (data >= end)
+                   {
+                     warn (_("file table ends unexpectedly\n"));
+                     n_files = 0;
+                     break;
+                   }
+
+                 /* Go through the file table again to save the strings.  */
+                 file_table = (File_Entry *) xmalloc (n_files * sizeof (File_Entry));
+
+                 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;
+               }
+
+             /* Skip the NUL at the end of the table.  */
+             data++;
+           }
+
+         /* Print the Compilation Unit's name and a header.  */
+         if (file_table == NULL)
+           ;
+         else if (directory_table == NULL)
+           printf (_("CU: %s:\n"), file_table[0].name);
+         else
+           {
+             unsigned int ix = file_table[0].directory_index;
+             const char *directory;
+
+             if (ix == 0)
+               directory = ".";
+             /* PR 20439 */
+             else if (n_directories == 0)
+               directory = _("<unknown>");
+             else if (ix > n_directories)
+               {
+                 warn (_("directory index %u > number of directories %s\n"),
+                       ix, dwarf_vmatoa ("u", n_directories));
+                 directory = _("<corrupt>");
+               }
+             else
+               directory = (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    View    Stmt\n"));
+         saved_linfo = linfo;
+       }
 
       /* This loop iterates through the Dwarf Line Number Program.  */
       while (data < end_of_sequence)
-        {
+       {
          unsigned char op_code;
-          int adv;
-          unsigned long int uladv;
-          unsigned int bytes_read;
-          int is_special_opcode = 0;
+         int xop;
+         int adv;
+         unsigned long int uladv;
+         unsigned int bytes_read;
+         int is_special_opcode = 0;
 
-          op_code = *data++;
+         op_code = *data++;
+         xop = op_code;
 
-          if (op_code >= linfo.li_opcode_base)
+         if (op_code >= linfo.li_opcode_base)
            {
              op_code -= linfo.li_opcode_base;
              uladv = (op_code / linfo.li_line_range);
@@ -2858,247 +4457,353 @@ display_debug_lines_decoded (struct dwarf_section *section,
                {
                  uladv *= linfo.li_min_insn_length;
                  state_machine_regs.address += uladv;
+                 if (uladv)
+                   state_machine_regs.view = 0;
                }
              else
                {
+                 unsigned addrdelta
+                   = ((state_machine_regs.op_index + uladv)
+                      / linfo.li_max_ops_per_insn)
+                   * linfo.li_min_insn_length;
                  state_machine_regs.address
-                   += ((state_machine_regs.op_index + uladv)
-                       / linfo.li_max_ops_per_insn)
-                      * linfo.li_min_insn_length;
+                   += addrdelta;
                  state_machine_regs.op_index
                    = (state_machine_regs.op_index + uladv)
-                     % linfo.li_max_ops_per_insn;
+                   % linfo.li_max_ops_per_insn;
+                 if (addrdelta)
+                   state_machine_regs.view = 0;
                }
 
-              adv = (op_code % linfo.li_line_range) + linfo.li_line_base;
-              state_machine_regs.line += adv;
-              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)
+             adv = (op_code % linfo.li_line_range) + linfo.li_line_base;
+             state_machine_regs.line += adv;
+             is_special_opcode = 1;
+             /* Increment view after printing this row.  */
+           }
+         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_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++;
+                    xop = ext_op_code;
+                    xop = -xop;
+
+                    switch (ext_op_code)
+                      {
+                      case DW_LNE_end_sequence:
+                        /* Reset stuff after printing this row.  */
+                        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;
+                        state_machine_regs.view = 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:
+                  /* Increment view after printing this row.  */
+                  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;
+                      if (uladv)
+                        state_machine_regs.view = 0;
+                    }
+                  else
+                    {
+                      unsigned addrdelta
+                        = ((state_machine_regs.op_index + uladv)
+                           / linfo.li_max_ops_per_insn)
+                        * linfo.li_min_insn_length;
+                      state_machine_regs.address
+                        += addrdelta;
+                      state_machine_regs.op_index
+                        = (state_machine_regs.op_index + uladv)
+                        % linfo.li_max_ops_per_insn;
+                      if (addrdelta)
+                        state_machine_regs.view = 0;
+                    }
+                  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;
+
+                  {
+                    unsigned file = state_machine_regs.file - 1;
+                    unsigned dir;
+
+                    if (file_table == NULL || n_files == 0)
+                      printf (_("\n [Use file table entry %d]\n"), file);
+                    /* PR 20439 */
+                    else if (file >= n_files)
+                      {
+                        warn (_("file index %u > number of files %u\n"), file + 1, n_files);
+                        printf (_("\n <over large file table index %u>"), file);
+                      }
+                    else if ((dir = file_table[file].directory_index) == 0)
+                      /* If directory index is 0, that means current directory.  */
+                      printf ("\n./%s:[++]\n", file_table[file].name);
+                    else if (directory_table == NULL || n_directories == 0)
+                      printf (_("\n [Use file %s in directory table entry %d]\n"),
+                              file_table[file].name, dir);
+                    /* PR 20439 */
+                    else if (dir > n_directories)
+                      {
+                        warn (_("directory index %u > number of directories %s\n"),
+                              dir, dwarf_vmatoa ("u", n_directories));
+                        printf (_("\n <over large directory table entry %u>\n"), dir);
+                      }
+                    else
+                      printf ("\n%s/%s:\n",
+                              /* The directory index starts counting at 1.  */
+                              directory_table[dir - 1], file_table[file].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;
+                      if (uladv)
+                        state_machine_regs.view = 0;
+                    }
+                  else
+                    {
+                      unsigned addrdelta
+                        = ((state_machine_regs.op_index + uladv)
+                           / linfo.li_max_ops_per_insn)
+                        * linfo.li_min_insn_length;
+                      state_machine_regs.address
+                        += addrdelta;
+                      state_machine_regs.op_index
+                        = (state_machine_regs.op_index + uladv)
+                        % linfo.li_max_ops_per_insn;
+                      if (addrdelta)
+                        state_machine_regs.view = 0;
+                    }
+                  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;
+                  /* Do NOT reset view.  */
+                  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.  */
+         if ((is_special_opcode) || (xop == -DW_LNE_end_sequence)
+             || (xop == DW_LNS_copy))
+           {
+             const unsigned int MAX_FILENAME_LENGTH = 35;
+             char *fileName;
+             char *newFileName = NULL;
+             size_t fileNameLength;
+
+             if (file_table)
                {
-                 uladv *= linfo.li_min_insn_length;
-                 state_machine_regs.address += uladv;
+                 unsigned indx = state_machine_regs.file - 1;
+                 /* PR 20439  */
+                 if (indx >= n_files)
+                   {
+                     warn (_("corrupt file index %u encountered\n"), indx);
+                     fileName = _("<corrupt>");
+                   }
+                 else
+                   fileName = (char *) file_table[indx].name;
                }
              else
+               fileName = _("<unknown>");
+
+             fileNameLength = strlen (fileName);
+
+             if ((fileNameLength > MAX_FILENAME_LENGTH) && (!do_wide))
                {
-                 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;
+                 newFileName = (char *) xmalloc (MAX_FILENAME_LENGTH + 1);
+                 /* Truncate file name */
+                 strncpy (newFileName,
+                          fileName + fileNameLength - MAX_FILENAME_LENGTH,
+                          MAX_FILENAME_LENGTH + 1);
                }
              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;
+                 newFileName = (char *) xmalloc (fileNameLength + 1);
+                 strncpy (newFileName, fileName, fileNameLength + 1);
                }
-              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;
-            }
-
-          /* Only Special opcodes, DW_LNS_copy and DW_LNE_end_sequence adds a row
-             to the DWARF address/line matrix.  */
-          if ((is_special_opcode) || (op_code == DW_LNE_end_sequence)
-             || (op_code == DW_LNS_copy))
-            {
-              const unsigned int MAX_FILENAME_LENGTH = 35;
-              char *fileName = (char *)file_table[state_machine_regs.file - 1].name;
-              char *newFileName = NULL;
-              size_t fileNameLength = strlen (fileName);
-
-              if ((fileNameLength > MAX_FILENAME_LENGTH) && (!do_wide))
-                {
-                  newFileName = (char *) xmalloc (MAX_FILENAME_LENGTH + 1);
-                  /* Truncate file name */
-                  strncpy (newFileName,
-                           fileName + fileNameLength - MAX_FILENAME_LENGTH,
-                           MAX_FILENAME_LENGTH + 1);
-                }
-              else
-                {
-                  newFileName = (char *) xmalloc (fileNameLength + 1);
-                  strncpy (newFileName, fileName, fileNameLength + 1);
-                }
-
-              if (!do_wide || (fileNameLength <= MAX_FILENAME_LENGTH))
-                {
+
+             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",
+                           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]",
+                           newFileName, state_machine_regs.line,
                            state_machine_regs.address,
                            state_machine_regs.op_index);
-                }
-              else
-                {
+               }
+             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",
+                           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]",
+                           newFileName, state_machine_regs.line,
                            state_machine_regs.address,
                            state_machine_regs.op_index);
-                }
+               }
 
-              if (op_code == DW_LNE_end_sequence)
-               printf ("\n");
+             if (state_machine_regs.view)
+               printf ("  %6u", state_machine_regs.view);
+             else
+               printf ("        ");
+
+             if (state_machine_regs.is_stmt)
+               printf ("       x");
+
+             putchar ('\n');
+             state_machine_regs.view++;
+
+             if (xop == -DW_LNE_end_sequence)
+               {
+                 reset_state_machine (linfo.li_default_is_stmt);
+                 putchar ('\n');
+               }
+
+             free (newFileName);
+           }
+       }
+
+      if (file_table)
+       {
+         free (file_table);
+         file_table = NULL;
+         n_files = 0;
+       }
+
+      if (directory_table)
+       {
+         free (directory_table);
+         directory_table = NULL;
+         n_directories = 0;
+       }
 
-              free (newFileName);
-            }
-        }
-      free (file_table);
-      file_table = NULL;
-      free (directory_table);
-      directory_table = NULL;
       putchar ('\n');
     }
 
@@ -3106,7 +4811,7 @@ display_debug_lines_decoded (struct dwarf_section *section,
 }
 
 static int
-display_debug_lines (struct dwarf_section *section, void *file ATTRIBUTE_UNUSED)
+display_debug_lines (struct dwarf_section *section, void *file)
 {
   unsigned char *data = section->start;
   unsigned char *end = data + section->size;
@@ -3117,10 +4822,10 @@ display_debug_lines (struct dwarf_section *section, void *file ATTRIBUTE_UNUSED)
     do_debug_lines |= FLAG_DEBUG_LINES_RAW;
 
   if (do_debug_lines & FLAG_DEBUG_LINES_RAW)
-    retValRaw = display_debug_lines_raw (section, data, end);
+    retValRaw = display_debug_lines_raw (section, data, end, file);
 
   if (do_debug_lines & FLAG_DEBUG_LINES_DECODED)
-    retValDecoded = display_debug_lines_decoded (section, data, end);
+    retValDecoded = display_debug_lines_decoded (section, data, end, file);
 
   if (!retValRaw || !retValDecoded)
     return 0;
@@ -3143,9 +4848,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;
@@ -3155,22 +4880,18 @@ display_debug_pubnames (struct dwarf_section *section,
      we test for that later on.  */
   load_debug_info (file);
 
-  printf (_("Contents of the %s section:\n\n"), section->name);
+  introduce (section, FALSE);
 
   while (start < end)
     {
       unsigned char *data;
-      unsigned long offset;
-      int offset_size, initial_length_size;
-
-      data = start;
+      unsigned long sec_off;
+      unsigned int offset_size, initial_length_size;
 
-      names.pn_length = byte_get (data, 4);
-      data += 4;
+      SAFE_BYTE_GET_AND_INC (names.pn_length, start, 4, end);
       if (names.pn_length == 0xffffffff)
        {
-         names.pn_length = byte_get (data, 8);
-         data += 8;
+         SAFE_BYTE_GET_AND_INC (names.pn_length, start, 8, end);
          offset_size = 8;
          initial_length_size = 12;
        }
@@ -3180,22 +4901,39 @@ display_debug_pubnames (struct dwarf_section *section,
          initial_length_size = 4;
        }
 
-      names.pn_version = byte_get (data, 2);
-      data += 2;
+      sec_off = start - section->start;
+      if (sec_off + names.pn_length < sec_off
+         || sec_off + names.pn_length > section->size)
+       {
+         warn (_("Debug info is corrupted, %s header at %#lx has length %s\n"),
+               section->name,
+               sec_off - initial_length_size,
+               dwarf_vmatoa ("x", names.pn_length));
+         break;
+       }
+
+      data = start;
+      start += names.pn_length;
 
-      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;
+      printf (_("  Length:                              %ld\n"),
+             (long) names.pn_length);
+      printf (_("  Version:                             %d\n"),
+             names.pn_version);
+      printf (_("  Offset into .debug_info section:     0x%lx\n"),
+             (unsigned long) names.pn_offset);
+      printf (_("  Size of area in .debug_info section: %ld\n"),
+             (long) names.pn_size);
 
       if (names.pn_version != 2 && names.pn_version != 3)
        {
@@ -3210,35 +4948,74 @@ display_debug_pubnames (struct dwarf_section *section,
          continue;
        }
 
-      printf (_("  Length:                              %ld\n"),
-             names.pn_length);
-      printf (_("  Version:                             %d\n"),
-             names.pn_version);
-      printf (_("  Offset into .debug_info section:     0x%lx\n"),
-             names.pn_offset);
-      printf (_("  Size of area in .debug_info section: %ld\n"),
-             names.pn_size);
-
-      printf (_("\n    Offset\tName\n"));
+      if (is_gnu)
+       printf (_("\n    Offset  Kind          Name\n"));
+      else
+       printf (_("\n    Offset\tName\n"));
 
-      do
+      while (1)
        {
-         offset = byte_get (data, offset_size);
+         bfd_size_type maxprint;
+         dwarf_vma offset;
 
-         if (offset != 0)
-           {
-             data += offset_size;
-             printf ("    %-6lx\t%s\n", offset, data);
-             data += strlen ((char *) data) + 1;
-           }
+         SAFE_BYTE_GET (offset, data, offset_size, end);
+
+         if (offset == 0)
+           break;
+
+         data += offset_size;
+         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",
+                     (unsigned long) offset, is_static ? _("s") : _("g"),
+                     kind_name, (int) maxprint, data);
+           }
+         else
+           printf ("    %-6lx\t%.*s\n",
+                   (unsigned long) offset, (int) maxprint, data);
+
+         data += strnlen ((char *) data, maxprint) + 1;
+         if (data >= end)
+           break;
        }
-      while (offset != 0);
     }
 
   printf ("\n");
   return 1;
 }
 
+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)
@@ -3249,12 +5026,12 @@ display_debug_macinfo (struct dwarf_section *section,
   unsigned int bytes_read;
   enum dwarf_macinfo_record_type op;
 
-  printf (_("Contents of the %s section:\n\n"), section->name);
+  introduce (section, FALSE);
 
   while (curr < end)
     {
       unsigned int lineno;
-      const char *string;
+      const unsigned char *string;
 
       op = (enum dwarf_macinfo_record_type) *curr;
       curr++;
@@ -3265,9 +5042,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 +5057,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 +5078,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,1672 +5092,4559 @@ display_debug_macinfo (struct dwarf_section *section,
   return 1;
 }
 
-static int
-display_debug_abbrev (struct dwarf_section *section,
-                     void *file ATTRIBUTE_UNUSED)
+/* 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)
 {
-  abbrev_entry *entry;
-  unsigned char *start = section->start;
-  unsigned char *end = start + section->size;
+  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;
 
-  printf (_("Contents of the %s section:\n\n"), section->name);
+  hdrptr = section->start + line_offset;
+  end = section->start + section->size;
 
-  do
+  SAFE_BYTE_GET_AND_INC (length, hdrptr, 4, end);
+  if (length == 0xffffffff)
     {
-      free_abbrevs ();
-
-      start = process_abbrev_section (start, end);
-
-      if (first_abbrev == NULL)
-       continue;
+      /* 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 < length
+      || length + initial_length_size > section->size)
+    return NULL;
 
-      printf (_("  Number TAG\n"));
+  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.  */
 
-      for (entry = first_abbrev; entry; entry = entry->next)
-       {
-         abbrev_attr *attr;
+  SAFE_BYTE_GET_AND_INC (opcode_base, hdrptr, 1, end);
+  if (opcode_base == 0)
+    return NULL;
 
-         printf (_("   %ld      %s    [%s]\n"),
-                 entry->entry,
-                 get_TAG_name (entry->tag),
-                 entry->children ? _("has children") : _("no children"));
+  hdrptr += opcode_base - 1;
+  if (hdrptr >= end)
+    return NULL;
 
-         for (attr = entry->first_attr; attr; attr = attr->next)
-           printf (_("    %-18s %s\n"),
-                   get_AT_name (attr->attribute),
-                   get_FORM_name (attr->form));
-       }
+  dirtable = hdrptr;
+  /* Skip over dirname table.  */
+  while (*hdrptr != '\0')
+    {
+      hdrptr += strnlen ((char *) hdrptr, end - hdrptr) + 1;
+      if (hdrptr >= end)
+       return NULL;
     }
-  while (start);
+  hdrptr++;                /* Skip the NUL at the end of the table.  */
 
-  printf ("\n");
+  /* Now skip over preceding filename table entries.  */
+  for (; hdrptr < end && *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;
 
-  return 1;
+  file_name = hdrptr;
+  hdrptr += strnlen ((char *) hdrptr, end - hdrptr) + 1;
+  if (hdrptr >= end)
+    return NULL;
+  diridx = read_uleb128 (hdrptr, &bytes_read, end);
+  if (diridx == 0)
+    return file_name;
+  for (; dirtable < end && *dirtable != '\0' && diridx > 1; diridx--)
+    dirtable += strnlen ((char *) dirtable, end - dirtable) + 1;
+  if (dirtable >= end || *dirtable == '\0')
+    return NULL;
+  *dir_name = dirtable;
+  return file_name;
 }
 
 static int
-display_debug_loc (struct dwarf_section *section, void *file)
+display_debug_macro (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;
-  unsigned long last_offset = 0;
-  unsigned int first = 0;
-  unsigned int i;
-  unsigned int j;
-  int seen_first_offset = 0;
-  int use_debug_info = 1;
-  unsigned char *next;
-
-  bytes = section->size;
-  section_end = start + bytes;
+  unsigned char *end = start + section->size;
+  unsigned char *curr = start;
+  unsigned char *extended_op_buf[256];
+  unsigned int bytes_read;
 
-  if (bytes == 0)
-    {
-      printf (_("\nThe %s section is empty.\n"), section->name);
-      return 0;
-    }
+  load_debug_section_with_follow (str, file);
+  load_debug_section_with_follow (line, file);
 
-  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;
-    }
+  introduce (section, FALSE);
 
-  /* Check the order of location list in .debug_info section. If
-     offsets of location lists are in the ascending order, we can
-     use `debug_information' directly.  */
-  for (i = 0; i < num_debug_info_entries; i++)
+  while (curr < end)
     {
-      unsigned int num;
-
-      num = debug_information [i].num_loc_offsets;
-      num_loc_list += num;
+      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 && version != 5)
+       {
+         error (_("Only GNU extension to DWARF 4 or 5 of %s is currently supported.\n"),
+                section->name);
+         return 0;
+       }
 
-      /* Check if we can use `debug_information' directly.  */
-      if (use_debug_info && num != 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)
        {
-         if (!seen_first_offset)
-           {
-             /* This is the first location list.  */
-             last_offset = debug_information [i].loc_offsets [0];
-             first = i;
-             seen_first_offset = 1;
-             j = 1;
-           }
-         else
-           j = 0;
+         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;
 
-         for (; j < num; j++)
+         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)
            {
-             if (last_offset >
-                 debug_information [i].loc_offsets [j])
+             printf (_("  Extension opcode arguments:\n"));
+             for (i = 0; i < count; i++)
                {
-                 use_debug_info = 0;
-                 break;
+                 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_%02x has no arguments\n"), op);
+                 else
+                   {
+                     printf (_("    DW_MACRO_%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;
+                           }
+                       }
+                   }
                }
-             last_offset = debug_information [i].loc_offsets [j];
            }
        }
-    }
-
-  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]);
-
-  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;
+      printf ("\n");
 
-      for (j = 0; j < debug_information [i].num_loc_offsets; j++)
+      while (1)
        {
-         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;
-         next = section_begin + offset;
-         base_address = debug_information [i].base_address;
+         unsigned int op;
 
-         if (!seen_first_offset)
-           seen_first_offset = 1;
-         else
+         if (curr >= end)
            {
-             if (start < next)
-               warn (_("There is a hole [0x%lx - 0x%lx] in .debug_loc section.\n"),
-                     (unsigned long) (start - section_begin),
-                     (unsigned long) (next - section_begin));
-             else if (start > next)
-               warn (_("There is an overlap [0x%lx - 0x%lx] in .debug_loc section.\n"),
-                     (unsigned long) (start - section_begin),
-                     (unsigned long) (next - section_begin));
+             error (_(".debug_macro section not zero terminated\n"));
+             return 0;
            }
-         start = next;
 
-         if (offset >= bytes)
-           {
-             warn (_("Offset 0x%lx is bigger than .debug_loc section size.\n"),
-                   offset);
-             continue;
-           }
+         SAFE_BYTE_GET_AND_INC (op, curr, 1, end);
+         if (op == 0)
+           break;
 
-         while (1)
+         switch (op)
            {
-             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;
-               }
+           case DW_MACRO_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_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_start_file - lineno: %d filenum: %d\n"),
+                         lineno, filenum);
+               else
+                 printf (_(" DW_MACRO_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;
 
-             /* 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;
-               }
+           case DW_MACRO_end_file:
+             printf (_(" DW_MACRO_end_file\n"));
+             break;
 
-             if (start + 2 > section_end)
-               {
-                 warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
-                       offset);
-                 break;
-               }
+           case DW_MACRO_define:
+             lineno = read_uleb128 (curr, &bytes_read, end);
+             curr += bytes_read;
+             string = curr;
+             curr += strnlen ((char *) string, end - string) + 1;
+             printf (_(" DW_MACRO_define - lineno : %d macro : %s\n"),
+                     lineno, string);
+             break;
 
-             length = byte_get (start, 2);
-             start += 2;
+           case DW_MACRO_undef:
+             lineno = read_uleb128 (curr, &bytes_read, end);
+             curr += bytes_read;
+             string = curr;
+             curr += strnlen ((char *) string, end - string) + 1;
+             printf (_(" DW_MACRO_undef - lineno : %d macro : %s\n"),
+                     lineno, string);
+             break;
 
-             if (start + length > section_end)
-               {
-                 warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
-                       offset);
-                 break;
-               }
+           case DW_MACRO_define_strp:
+             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_define_strp - lineno : %d macro : %s\n"),
+                     lineno, string);
+             break;
 
-             print_dwarf_vma (begin + base_address, pointer_size);
-             print_dwarf_vma (end + base_address, pointer_size);
+           case DW_MACRO_undef_strp:
+             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_undef_strp - lineno : %d macro : %s\n"),
+                     lineno, string);
+             break;
 
-             putchar ('(');
-             need_frame_base = decode_location_expression (start,
-                                                           pointer_size,
-                                                           offset_size,
-                                                           dwarf_version,
-                                                           length,
-                                                           cu_offset, section);
-             putchar (')');
+           case DW_MACRO_import:
+             SAFE_BYTE_GET_AND_INC (offset, curr, offset_size, end);
+             printf (_(" DW_MACRO_import - offset : 0x%lx\n"),
+                     (unsigned long) offset);
+             break;
 
-             if (need_frame_base && !has_frame_base)
-               printf (_(" [without DW_AT_frame_base]"));
+           case DW_MACRO_define_sup:
+             lineno = read_uleb128 (curr, &bytes_read, end);
+             curr += bytes_read;
+             SAFE_BYTE_GET_AND_INC (offset, curr, offset_size, end);
+             printf (_(" DW_MACRO_define_sup - lineno : %d macro offset : 0x%lx\n"),
+                     lineno, (unsigned long) offset);
+             break;
 
-             if (begin == end)
-               fputs (_(" (start == end)"), stdout);
-             else if (begin > end)
-               fputs (_(" (start > end)"), stdout);
+           case DW_MACRO_undef_sup:
+             lineno = read_uleb128 (curr, &bytes_read, end);
+             curr += bytes_read;
+             SAFE_BYTE_GET_AND_INC (offset, curr, offset_size, end);
+             printf (_(" DW_MACRO_undef_sup - lineno : %d macro offset : 0x%lx\n"),
+                     lineno, (unsigned long) offset);
+             break;
 
-             putchar ('\n');
+           case DW_MACRO_import_sup:
+             SAFE_BYTE_GET_AND_INC (offset, curr, offset_size, end);
+             printf (_(" DW_MACRO_import_sup - offset : 0x%lx\n"),
+                     (unsigned long) offset);
+             break;
 
-             start += length;
+           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_%02x\n"), op);
+                     break;
+                   }
+                 printf (_(" DW_MACRO_%02x -"), op);
+                 for (n = 0; n < nargs; n++)
+                   {
+                     int val;
+
+                     /* DW_FORM_implicit_const is not expected here.  */
+                     SAFE_BYTE_GET_AND_INC (val, desc, 1, end);
+                     curr
+                       = read_and_display_attr_value (0, val, 0,
+                                                      curr, end, 0, 0, offset_size,
+                                                      version, NULL, 0, NULL,
+                                                      NULL, ' ');
+                     if (n != nargs - 1)
+                       printf (",");
+                   }
+                 printf ("\n");
+               }
+             break;
            }
        }
+
+      printf ("\n");
     }
 
-  if (start < section_end)
-    warn (_("There are %ld unused bytes at the end of section %s\n"),
-         (long) (section_end - start), section->name);
-  putchar ('\n');
   return 1;
 }
 
 static int
-display_debug_str (struct dwarf_section *section,
-                  void *file ATTRIBUTE_UNUSED)
+display_debug_abbrev (struct dwarf_section *section,
+                     void *file ATTRIBUTE_UNUSED)
 {
+  abbrev_entry *entry;
   unsigned char *start = section->start;
-  unsigned long bytes = section->size;
-  dwarf_vma addr = section->address;
+  unsigned char *end = start + section->size;
 
-  if (bytes == 0)
+  introduce (section, FALSE);
+
+  do
     {
-      printf (_("\nThe %s section is empty.\n"), section->name);
-      return 0;
-    }
+      unsigned char *last;
 
-  printf (_("Contents of the %s section:\n\n"), section->name);
+      free_abbrevs ();
 
-  while (bytes)
-    {
-      int j;
-      int k;
-      int lbytes;
+      last = start;
+      start = process_abbrev_section (start, end);
 
-      lbytes = (bytes > 16 ? 16 : bytes);
+      if (first_abbrev == NULL)
+       continue;
 
-      printf ("  0x%8.8lx ", (unsigned long) addr);
+      printf (_("  Number TAG (0x%lx)\n"), (long) (last - section->start));
 
-      for (j = 0; j < 16; j++)
+      for (entry = first_abbrev; entry; entry = entry->next)
        {
-         if (j < lbytes)
-           printf ("%2.2x", start[j]);
-         else
-           printf ("  ");
+         abbrev_attr *attr;
 
-         if ((j & 3) == 3)
-           printf (" ");
-       }
+         printf ("   %ld      %s    [%s]\n",
+                 entry->entry,
+                 get_TAG_name (entry->tag),
+                 entry->children ? _("has children") : _("no children"));
 
-      for (j = 0; j < lbytes; j++)
-       {
-         k = start[j];
-         if (k >= ' ' && k < 0x80)
-           printf ("%c", k);
-         else
-           printf (".");
+         for (attr = entry->first_attr; attr; attr = attr->next)
+           {
+             printf ("    %-18s %s",
+                     get_AT_name (attr->attribute),
+                     get_FORM_name (attr->form));
+             if (attr->form == DW_FORM_implicit_const)
+               printf (": %" BFD_VMA_FMT "d", attr->implicit_const);
+             putchar ('\n');
+           }
        }
+    }
+  while (start);
 
-      putchar ('\n');
-
-      start += lbytes;
-      addr  += lbytes;
-      bytes -= lbytes;
-    }
-
-  putchar ('\n');
+  printf ("\n");
 
   return 1;
 }
 
-static int
-display_debug_info (struct dwarf_section *section, void *file)
-{
-  return process_debug_info (section, file, abbrev, 0, 0);
-}
+/* Return true when ADDR is the maximum address, when addresses are
+   POINTER_SIZE bytes long.  */
 
-static int
-display_debug_types (struct dwarf_section *section, void *file)
+static bfd_boolean
+is_max_address (dwarf_vma addr, unsigned int pointer_size)
 {
-  return process_debug_info (section, file, abbrev, 0, 1);
+  dwarf_vma mask = ~(~(dwarf_vma) 1 << (pointer_size * 8 - 1));
+  return ((addr & mask) == mask);
 }
 
-static int
-display_trace_info (struct dwarf_section *section, void *file)
-{
-  return process_debug_info (section, file, trace_abbrev, 0, 0);
-}
+/* Display a view pair list starting at *VSTART_PTR and ending at
+   VLISTEND within SECTION.  */
 
-static int
-display_debug_aranges (struct dwarf_section *section,
-                      void *file ATTRIBUTE_UNUSED)
+static void
+display_view_pair_list (struct dwarf_section *section,
+                       unsigned char **vstart_ptr,
+                       unsigned int debug_info_entry,
+                       unsigned char *vlistend)
 {
-  unsigned char *start = section->start;
-  unsigned char *end = start + section->size;
+  unsigned char *vstart = *vstart_ptr;
+  unsigned char *section_end = section->start + section->size;
+  unsigned int pointer_size = debug_information [debug_info_entry].pointer_size;
 
-  printf (_("Contents of the %s section:\n\n"), section->name);
+  if (vlistend < section_end)
+    section_end = vlistend;
 
-  /* It does not matter if this load fails,
-     we test for that later on.  */
-  load_debug_info (file);
+  putchar ('\n');
 
-  while (start < end)
+  while (vstart < section_end)
     {
-      unsigned char *hdrptr;
-      DWARF2_Internal_ARange arange;
-      unsigned char *addr_ranges;
-      dwarf_vma length;
-      dwarf_vma address;
-      unsigned char address_size;
-      int excess;
-      int offset_size;
-      int initial_length_size;
-
-      hdrptr = start;
-
-      arange.ar_length = byte_get (hdrptr, 4);
-      hdrptr += 4;
+      dwarf_vma off = vstart - section->start;
+      dwarf_vma vbegin, vend;
 
-      if (arange.ar_length == 0xffffffff)
-       {
-         arange.ar_length = byte_get (hdrptr, 8);
-         hdrptr += 8;
-         offset_size = 8;
-         initial_length_size = 12;
-       }
-      else
+      unsigned int bytes_read;
+      vbegin = read_uleb128 (vstart, &bytes_read, section_end);
+      vstart += bytes_read;
+      if (vstart == section_end)
        {
-         offset_size = 4;
-         initial_length_size = 4;
+         vstart -= bytes_read;
+         break;
        }
 
-      arange.ar_version = byte_get (hdrptr, 2);
-      hdrptr += 2;
+      vend = read_uleb128 (vstart, &bytes_read, section_end);
+      vstart += bytes_read;
 
-      arange.ar_info_offset = byte_get (hdrptr, offset_size);
-      hdrptr += offset_size;
+      printf ("    %8.8lx ", (unsigned long) off);
 
-      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);
+      print_dwarf_view (vbegin, pointer_size, 1);
+      print_dwarf_view (vend, pointer_size, 1);
+      printf (_("location view pair\n"));
+    }
 
-      arange.ar_pointer_size = byte_get (hdrptr, 1);
-      hdrptr += 1;
+  putchar ('\n');
+  *vstart_ptr = vstart;
+}
 
-      arange.ar_segment_size = byte_get (hdrptr, 1);
-      hdrptr += 1;
+/* Display a location list from a normal (ie, non-dwo) .debug_loc section.  */
 
-      if (arange.ar_version != 2 && arange.ar_version != 3)
-       {
-         warn (_("Only DWARF 2 and 3 aranges are currently supported.\n"));
-         break;
-       }
+static void
+display_loc_list (struct dwarf_section *section,
+                 unsigned char **start_ptr,
+                 unsigned int debug_info_entry,
+                 dwarf_vma offset,
+                 dwarf_vma base_address,
+                 unsigned char **vstart_ptr,
+                 int has_frame_base)
+{
+  unsigned char *start = *start_ptr, *vstart = *vstart_ptr;
+  unsigned char *section_end = section->start + section->size;
+  unsigned long cu_offset;
+  unsigned int pointer_size;
+  unsigned int offset_size;
+  int dwarf_version;
+
+  dwarf_vma begin;
+  dwarf_vma end;
+  unsigned short length;
+  int need_frame_base;
+
+  if (debug_info_entry >= num_debug_info_entries)
+    {
+      warn (_("No debug information available for loc lists of entry: %u\n"),
+           debug_info_entry);
+      return;
+    }
 
-      printf (_("  Length:                   %ld\n"), arange.ar_length);
-      printf (_("  Version:                  %d\n"), arange.ar_version);
-      printf (_("  Offset into .debug_info:  0x%lx\n"), arange.ar_info_offset);
-      printf (_("  Pointer Size:             %d\n"), arange.ar_pointer_size);
-      printf (_("  Segment Size:             %d\n"), arange.ar_segment_size);
+  cu_offset = debug_information [debug_info_entry].cu_offset;
+  pointer_size = debug_information [debug_info_entry].pointer_size;
+  offset_size = debug_information [debug_info_entry].offset_size;
+  dwarf_version = debug_information [debug_info_entry].dwarf_version;
 
-      address_size = arange.ar_pointer_size + arange.ar_segment_size;
+  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;
+    }
 
-      /* 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.  */
-      if ((address_size & (address_size - 1)) != 0)
+  while (1)
+    {
+      dwarf_vma off = offset + (start - *start_ptr);
+      dwarf_vma vbegin = vm1, vend = vm1;
+
+      if (start + 2 * pointer_size > section_end)
        {
-         warn (_("Pointer size + Segment size is not a power of two.\n"));
+         warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
+               (unsigned long) offset);
          break;
        }
 
-      if (address_size > 4)
-       printf (_("\n    Address            Length\n"));
-      else
-       printf (_("\n    Address    Length\n"));
+      printf ("    %8.8lx ", (unsigned long) off);
 
-      addr_ranges = hdrptr;
+      SAFE_BYTE_GET_AND_INC (begin, start, pointer_size, section_end);
+      SAFE_BYTE_GET_AND_INC (end, start, pointer_size, section_end);
 
-      /* Must pad to an alignment boundary that is twice the address size.  */
-      excess = (hdrptr - start) % (2 * address_size);
-      if (excess)
-       addr_ranges += (2 * address_size) - excess;
+      if (begin == 0 && end == 0)
+       {
+         /* PR 18374: In a object file we can have a location list that
+            starts with a begin and end of 0 because there are relocations
+            that need to be applied to the addresses.  Actually applying
+            the relocations now does not help as they will probably resolve
+            to 0, since the object file has not been fully linked.  Real
+            end of list markers will not have any relocations against them.  */
+         if (! reloc_at (section, off)
+             && ! reloc_at (section, off + pointer_size))
+           {
+             printf (_("<End of list>\n"));
+             break;
+           }
+       }
 
-      start += arange.ar_length + initial_length_size;
+      /* Check base address specifiers.  */
+      if (is_max_address (begin, pointer_size)
+          && !is_max_address (end, pointer_size))
+       {
+         base_address = end;
+         print_dwarf_vma (begin, pointer_size);
+         print_dwarf_vma (end, pointer_size);
+         printf (_("(base address)\n"));
+         continue;
+       }
 
-      while (addr_ranges + 2 * address_size <= start)
+      if (vstart)
        {
-         address = byte_get (addr_ranges, address_size);
+         unsigned int bytes_read;
 
-         addr_ranges += address_size;
+         off = offset + (vstart - *start_ptr);
 
-         length  = byte_get (addr_ranges, address_size);
+         vbegin = read_uleb128 (vstart, &bytes_read, section_end);
+         vstart += bytes_read;
+         print_dwarf_view (vbegin, pointer_size, 1);
 
-         addr_ranges += address_size;
+         vend = read_uleb128 (vstart, &bytes_read, section_end);
+         vstart += bytes_read;
+         print_dwarf_view (vend, pointer_size, 1);
 
-         printf ("    ");
-         print_dwarf_vma (address, address_size);
-         print_dwarf_vma (length, address_size);
-         putchar ('\n');
+         printf (_("views at %8.8lx for:\n    %*s "),
+                 (unsigned long) off, 8, "");
        }
-    }
 
-  printf ("\n");
+      if (start + 2 > section_end)
+       {
+         warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
+               (unsigned long) offset);
+         break;
+       }
 
-  return 1;
-}
+      SAFE_BYTE_GET_AND_INC (length, start, 2, section_end);
 
-/* Each debug_information[x].range_lists[y] gets this representation for
-   sorting purposes.  */
+      if (start + length > section_end)
+       {
+         warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
+               (unsigned long) offset);
+         break;
+       }
 
-struct range_entry
-  {
-    /* The debug_information[x].range_lists[y] value.  */
-    unsigned long ranges_offset;
+      print_dwarf_vma (begin + base_address, pointer_size);
+      print_dwarf_vma (end + base_address, pointer_size);
 
-    /* Original debug_information to find parameters of the data.  */
-    debug_info *debug_info_p;
-  };
+      putchar ('(');
+      need_frame_base = decode_location_expression (start,
+                                                   pointer_size,
+                                                   offset_size,
+                                                   dwarf_version,
+                                                   length,
+                                                   cu_offset, section);
+      putchar (')');
 
-/* Sort struct range_entry in ascending order of its RANGES_OFFSET.  */
+      if (need_frame_base && !has_frame_base)
+       printf (_(" [without DW_AT_frame_base]"));
 
-static int
-range_entry_compar (const void *ap, const void *bp)
-{
-  const struct range_entry *a_re = (const struct range_entry *) ap;
-  const struct range_entry *b_re = (const struct range_entry *) bp;
-  const unsigned long a = a_re->ranges_offset;
-  const unsigned long b = b_re->ranges_offset;
+      if (begin == end && vbegin == vend)
+       fputs (_(" (start == end)"), stdout);
+      else if (begin > end || (begin == end && vbegin > vend))
+       fputs (_(" (start > end)"), stdout);
 
-  return (a > b) - (b > a);
+      putchar ('\n');
+
+      start += length;
+    }
+
+  *start_ptr = start;
+  *vstart_ptr = vstart;
 }
 
-static int
-display_debug_ranges (struct dwarf_section *section,
-                     void *file ATTRIBUTE_UNUSED)
+/* Display a location list from a normal (ie, non-dwo) .debug_loclists section.  */
+
+static void
+display_loclists_list (struct dwarf_section *section,
+                      unsigned char **start_ptr,
+                      unsigned int debug_info_entry,
+                      dwarf_vma offset,
+                      dwarf_vma base_address,
+                      unsigned char **vstart_ptr,
+                      int has_frame_base)
 {
-  unsigned char *start = section->start;
-  unsigned long bytes;
-  unsigned char *section_begin = start;
-  unsigned int num_range_list, i;
-  struct range_entry *range_entries, *range_entry_fill;
+  unsigned char *start = *start_ptr, *vstart = *vstart_ptr;
+  unsigned char *section_end = section->start + section->size;
+  unsigned long cu_offset;
+  unsigned int pointer_size;
+  unsigned int offset_size;
+  int dwarf_version;
+  unsigned int bytes_read;
 
-  bytes = section->size;
+  /* Initialize it due to a false compiler warning.  */
+  dwarf_vma begin = -1, vbegin = -1;
+  dwarf_vma end = -1, vend = -1;
+  dwarf_vma length;
+  int need_frame_base;
 
-  if (bytes == 0)
+  if (debug_info_entry >= num_debug_info_entries)
     {
-      printf (_("\nThe %s section is empty.\n"), section->name);
-      return 0;
+      warn (_("No debug information available for "
+             "loclists lists of entry: %u\n"),
+           debug_info_entry);
+      return;
     }
 
-  if (load_debug_info (file) == 0)
+  cu_offset = debug_information [debug_info_entry].cu_offset;
+  pointer_size = debug_information [debug_info_entry].pointer_size;
+  offset_size = debug_information [debug_info_entry].offset_size;
+  dwarf_version = debug_information [debug_info_entry].dwarf_version;
+
+  if (pointer_size < 2 || pointer_size > 8)
     {
-      warn (_("Unable to load/parse the .debug_info section, so cannot interpret the %s section.\n"),
-           section->name);
-      return 0;
+      warn (_("Invalid pointer size (%d) in debug info for entry %d\n"),
+           pointer_size, debug_info_entry);
+      return;
     }
 
-  num_range_list = 0;
-  for (i = 0; i < num_debug_info_entries; i++)
-    num_range_list += debug_information [i].num_range_lists;
-
-  if (num_range_list == 0)
-    error (_("No range lists in .debug_info section!\n"));
-
-  range_entries = (struct range_entry *)
-      xmalloc (sizeof (*range_entries) * num_range_list);
-  range_entry_fill = range_entries;
-
-  for (i = 0; i < num_debug_info_entries; i++)
+  while (1)
     {
-      debug_info *debug_info_p = &debug_information[i];
-      unsigned int j;
+      dwarf_vma off = offset + (start - *start_ptr);
+      enum dwarf_location_list_entry_type llet;
 
-      for (j = 0; j < debug_info_p->num_range_lists; j++)
+      if (start + 1 > section_end)
        {
-         range_entry_fill->ranges_offset = debug_info_p->range_lists[j];
-         range_entry_fill->debug_info_p = debug_info_p;
-         range_entry_fill++;
+         warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
+               (unsigned long) offset);
+         break;
        }
-    }
 
-  qsort (range_entries, num_range_list, sizeof (*range_entries),
-        range_entry_compar);
+      printf ("    %8.8lx ", (unsigned long) off);
 
-  /* DWARF sections under Mach-O have non-zero addresses.  */
-  if (range_entries[0].ranges_offset != section->address)
-    warn (_("Range lists in %s section start at 0x%lx\n"),
-         section->name, range_entries[0].ranges_offset);
+      SAFE_BYTE_GET_AND_INC (llet, start, 1, section_end);
 
-  printf (_("Contents of the %s section:\n\n"), section->name);
-  printf (_("    Offset   Begin    End\n"));
+      if (vstart && llet == DW_LLE_offset_pair)
+       {
+         off = offset + (vstart - *start_ptr);
 
-  for (i = 0; i < num_range_list; i++)
-    {
-      struct range_entry *range_entry = &range_entries[i];
-      debug_info *debug_info_p = range_entry->debug_info_p;
-      unsigned int pointer_size;
-      unsigned long offset;
-      unsigned char *next;
-      unsigned long base_address;
+         vbegin = read_uleb128 (vstart, &bytes_read, section_end);
+         vstart += bytes_read;
+         print_dwarf_view (vbegin, pointer_size, 1);
 
-      pointer_size = debug_info_p->pointer_size;
+         vend = read_uleb128 (vstart, &bytes_read, section_end);
+         vstart += bytes_read;
+         print_dwarf_view (vend, pointer_size, 1);
 
-      /* DWARF sections under Mach-O have non-zero addresses.  */
-      offset = range_entry->ranges_offset - section->address;
-      next = section_begin + offset;
-      base_address = debug_info_p->base_address;
+         printf (_("views at %8.8lx for:\n    %*s "),
+                 (unsigned long) off, 8, "");
+       }
 
-      if (i > 0)
+      switch (llet)
        {
-         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);
+       case DW_LLE_end_of_list:
+         printf (_("<End of list>\n"));
+         break;
+       case DW_LLE_offset_pair:
+         begin = read_uleb128 (start, &bytes_read, section_end);
+         start += bytes_read;
+         end = read_uleb128 (start, &bytes_read, section_end);
+         start += bytes_read;
+         break;
+       case DW_LLE_base_address:
+         SAFE_BYTE_GET_AND_INC (base_address, start, pointer_size,
+                                section_end);
+         print_dwarf_vma (base_address, pointer_size);
+         printf (_("(base address)\n"));
+         break;
+#ifdef DW_LLE_view_pair
+       case DW_LLE_view_pair:
+         if (vstart)
+           printf (_("View pair entry in loclist with locviews attribute\n"));
+         vbegin = read_uleb128 (start, &bytes_read, section_end);
+         start += bytes_read;
+         print_dwarf_view (vbegin, pointer_size, 1);
+
+         vend = read_uleb128 (start, &bytes_read, section_end);
+         start += bytes_read;
+         print_dwarf_view (vend, pointer_size, 1);
+
+         printf (_("views for:\n"));
+         continue;
+#endif
+       default:
+         error (_("Invalid location list entry type %d\n"), llet);
+         return;
        }
-      start = next;
+      if (llet == DW_LLE_end_of_list)
+       break;
+      if (llet != DW_LLE_offset_pair)
+       continue;
 
-      while (1)
+      if (start + 2 > section_end)
        {
-         dwarf_vma begin;
-         dwarf_vma end;
+         warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
+               (unsigned long) 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;
+      length = read_uleb128 (start, &bytes_read, section_end);
+      start += bytes_read;
 
-         printf ("    %8.8lx ", offset);
+      print_dwarf_vma (begin + base_address, pointer_size);
+      print_dwarf_vma (end + base_address, pointer_size);
 
-         if (begin == 0 && end == 0)
-           {
-             printf (_("<End of list>\n"));
-             break;
-           }
+      putchar ('(');
+      need_frame_base = decode_location_expression (start,
+                                                   pointer_size,
+                                                   offset_size,
+                                                   dwarf_version,
+                                                   length,
+                                                   cu_offset, section);
+      putchar (')');
 
-         /* 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 (need_frame_base && !has_frame_base)
+       printf (_(" [without DW_AT_frame_base]"));
 
-         print_dwarf_vma (begin + base_address, pointer_size);
-         print_dwarf_vma (end + base_address, pointer_size);
+      if (begin == end && vbegin == vend)
+       fputs (_(" (start == end)"), stdout);
+      else if (begin > end || (begin == end && vbegin > vend))
+       fputs (_(" (start > end)"), stdout);
 
-         if (begin == end)
-           fputs (_("(start == end)"), stdout);
-         else if (begin > end)
-           fputs (_("(start > end)"), stdout);
+      putchar ('\n');
 
-         putchar ('\n');
-       }
+      start += length;
+      vbegin = vend = -1;
     }
-  putchar ('\n');
 
-  free (range_entries);
+  if (vbegin != vm1 || vend != vm1)
+    printf (_("Trailing view pair not used in a range"));
 
-  return 1;
+  *start_ptr = start;
+  *vstart_ptr = vstart;
 }
 
-typedef struct Frame_Chunk
+/* 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)
 {
-  struct Frame_Chunk *next;
-  unsigned char *chunk_start;
-  int ncols;
-  /* DW_CFA_{undefined,same_value,offset,register,unreferenced}  */
-  short int *col_type;
-  int *col_offset;
-  char *augmentation;
-  unsigned int code_factor;
-  int data_factor;
-  unsigned long pc_begin;
-  unsigned long pc_range;
-  int cfa_reg;
-  int cfa_offset;
-  int ra;
-  unsigned char fde_encoding;
-  unsigned char cfa_exp;
-  unsigned char ptr_size;
-  unsigned char segment_size;
+  static char buf[15];
+  snprintf (buf, sizeof (buf), "[%d]", idx);
+  printf ("%*s ", len, buf);
 }
-Frame_Chunk;
-
-static const char *const *dwarf_regnames;
-static unsigned int dwarf_regnames_count;
-
-/* A marker for a col_type that means this column was never referenced
-   in the frame info.  */
-#define DW_CFA_unreferenced (-1)
 
-/* Return 0 if not more space is needed, 1 if more space is needed,
-   -1 for invalid reg.  */
+/* 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 int
-frame_need_space (Frame_Chunk *fc, unsigned int reg)
+static void
+display_loc_list_dwo (struct dwarf_section *section,
+                     unsigned char **start_ptr,
+                     unsigned int debug_info_entry,
+                     dwarf_vma offset,
+                     unsigned char **vstart_ptr,
+                     int has_frame_base)
 {
-  int prev = fc->ncols;
+  unsigned char *start = *start_ptr, *vstart = *vstart_ptr;
+  unsigned char *section_end = section->start + section->size;
+  unsigned long cu_offset;
+  unsigned int pointer_size;
+  unsigned int offset_size;
+  int dwarf_version;
+  int entry_type;
+  unsigned short length;
+  int need_frame_base;
+  unsigned int idx;
+  unsigned int bytes_read;
 
-  if (reg < (unsigned int) fc->ncols)
-    return 0;
+  if (debug_info_entry >= num_debug_info_entries)
+    {
+      warn (_("No debug information for loc lists of entry: %u\n"),
+           debug_info_entry);
+      return;
+    }
 
-  if (dwarf_regnames_count
-      && reg > dwarf_regnames_count)
-    return -1;
+  cu_offset = debug_information [debug_info_entry].cu_offset;
+  pointer_size = debug_information [debug_info_entry].pointer_size;
+  offset_size = debug_information [debug_info_entry].offset_size;
+  dwarf_version = debug_information [debug_info_entry].dwarf_version;
 
-  fc->ncols = reg + 1;
-  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));
-
-  while (prev < fc->ncols)
+  if (pointer_size < 2 || pointer_size > 8)
     {
-      fc->col_type[prev] = DW_CFA_unreferenced;
-      fc->col_offset[prev] = 0;
-      prev++;
+      warn (_("Invalid pointer size (%d) in debug info for entry %d\n"),
+           pointer_size, debug_info_entry);
+      return;
     }
-  return 1;
-}
-
-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"
-};
-
-void
-init_dwarf_regnames_i386 (void)
-{
-  dwarf_regnames = dwarf_regnames_i386;
-  dwarf_regnames_count = ARRAY_SIZE (dwarf_regnames_i386);
-}
-
-static const char *const dwarf_regnames_x86_64[] =
-{
-  "rax", "rdx", "rcx", "rbx",
-  "rsi", "rdi", "rbp", "rsp",
-  "r8",  "r9",  "r10", "r11",
-  "r12", "r13", "r14", "r15",
-  "rip",
-  "xmm0",  "xmm1",  "xmm2",  "xmm3",
-  "xmm4",  "xmm5",  "xmm6",  "xmm7",
-  "xmm8",  "xmm9",  "xmm10", "xmm11",
-  "xmm12", "xmm13", "xmm14", "xmm15",
-  "st0", "st1", "st2", "st3",
-  "st4", "st5", "st6", "st7",
-  "mm0", "mm1", "mm2", "mm3",
-  "mm4", "mm5", "mm6", "mm7",
-  "rflags",
-  "es", "cs", "ss", "ds", "fs", "gs", NULL, NULL,
-  "fs.base", "gs.base", NULL, NULL,
-  "tr", "ldtr",
-  "mxcsr", "fcw", "fsw"
-};
-
-void
-init_dwarf_regnames_x86_64 (void)
-{
-  dwarf_regnames = dwarf_regnames_x86_64;
-  dwarf_regnames_count = ARRAY_SIZE (dwarf_regnames_x86_64);
-}
 
-void
-init_dwarf_regnames (unsigned int e_machine)
-{
-  switch (e_machine)
+  while (1)
     {
-    case EM_386:
-    case EM_486:
-      init_dwarf_regnames_i386 ();
-      break;
-
-    case EM_X86_64:
-    case EM_L1OM:
-      init_dwarf_regnames_x86_64 ();
-      break;
+      printf ("    %8.8lx ", (unsigned long) (offset + (start - *start_ptr)));
 
-    default:
-      break;
-    }
-}
+      if (start >= section_end)
+       {
+         warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
+               (unsigned long) offset);
+         break;
+       }
 
-static const char *
-regname (unsigned int regno, int row)
-{
-  static char reg[64];
-  if (dwarf_regnames
-      && regno < dwarf_regnames_count
-      && dwarf_regnames [regno] != NULL)
-    {
-      if (row)
-       return dwarf_regnames [regno];
-      snprintf (reg, sizeof (reg), "r%d (%s)", regno,
-               dwarf_regnames [regno]);
-    }
-  else
-    snprintf (reg, sizeof (reg), "r%d", regno);
-  return reg;
-}
+      SAFE_BYTE_GET_AND_INC (entry_type, start, 1, section_end);
 
-static void
-frame_display_row (Frame_Chunk *fc, int *need_col_headers, int *max_regs)
-{
-  int r;
-  char tmp[100];
+      if (vstart)
+       switch (entry_type)
+         {
+         default:
+           break;
 
-  if (*max_regs < fc->ncols)
-    *max_regs = fc->ncols;
+         case 2:
+         case 3:
+         case 4:
+           {
+             dwarf_vma view;
+             dwarf_vma off = offset + (vstart - *start_ptr);
 
-  if (*need_col_headers)
-    {
-      static const char *sloc = "   LOC";
+             view = read_uleb128 (vstart, &bytes_read, section_end);
+             vstart += bytes_read;
+             print_dwarf_view (view, 8, 1);
 
-      *need_col_headers = 0;
+             view = read_uleb128 (vstart, &bytes_read, section_end);
+             vstart += bytes_read;
+             print_dwarf_view (view, 8, 1);
 
-      printf ("%-*s CFA      ", eh_addr_size * 2, sloc);
+             printf (_("views at %8.8lx for:\n    %*s "),
+                     (unsigned long) off, 8, "");
 
-      for (r = 0; r < *max_regs; r++)
-       if (fc->col_type[r] != DW_CFA_unreferenced)
-         {
-           if (r == fc->ra)
-             printf ("ra      ");
-           else
-             printf ("%-5s ", regname (r, 1));
+           }
+           break;
          }
 
-      printf ("\n");
-    }
+      switch (entry_type)
+       {
+       case 0: /* A terminating entry.  */
+         *start_ptr = start;
+         *vstart_ptr = vstart;
+         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 ("%*s", 9 + (vstart ? 2 * 6 : 0), "");
+         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;
+         *vstart_ptr = vstart;
+         return;
+       }
 
-  printf ("%0*lx ", eh_addr_size * 2, fc->pc_begin);
-  if (fc->cfa_exp)
-    strcpy (tmp, "exp");
-  else
-    sprintf (tmp, "%s%+d", regname (fc->cfa_reg, 1), fc->cfa_offset);
-  printf ("%-8s ", tmp);
+      if (start + 2 > section_end)
+       {
+         warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
+               (unsigned long) offset);
+         break;
+       }
 
-  for (r = 0; r < fc->ncols; r++)
-    {
-      if (fc->col_type[r] != DW_CFA_unreferenced)
+      SAFE_BYTE_GET_AND_INC (length, start, 2, section_end);
+      if (start + length > section_end)
        {
-         switch (fc->col_type[r])
-           {
-           case DW_CFA_undefined:
-             strcpy (tmp, "u");
-             break;
-           case DW_CFA_same_value:
-             strcpy (tmp, "s");
-             break;
-           case DW_CFA_offset:
-             sprintf (tmp, "c%+d", fc->col_offset[r]);
-             break;
-           case DW_CFA_val_offset:
-             sprintf (tmp, "v%+d", fc->col_offset[r]);
-             break;
-           case DW_CFA_register:
-             sprintf (tmp, "%s", regname (fc->col_offset[r], 0));
-             break;
-           case DW_CFA_expression:
-             strcpy (tmp, "exp");
-             break;
-           case DW_CFA_val_expression:
-             strcpy (tmp, "vexp");
-             break;
-           default:
-             strcpy (tmp, "n/a");
-             break;
-           }
-         printf ("%-5s ", tmp);
+         warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
+               (unsigned long) offset);
+         break;
        }
+
+      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]"));
+
+      putchar ('\n');
+
+      start += length;
     }
-  printf ("\n");
+
+  *start_ptr = start;
+  *vstart_ptr = vstart;
 }
 
-#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
+/* Sort array of indexes in ascending order of loc_offsets[idx] and
+   loc_views.  */
+
+static dwarf_vma *loc_offsets, *loc_views;
 
 static int
-display_debug_frames (struct dwarf_section *section,
-                     void *file ATTRIBUTE_UNUSED)
+loc_offsets_compar (const void *ap, const void *bp)
 {
-  unsigned char *start = section->start;
-  unsigned char *end = start + section->size;
-  unsigned char *section_start = start;
-  Frame_Chunk *chunks = 0;
-  Frame_Chunk *remembered_state = 0;
-  Frame_Chunk *rs;
-  int is_eh = strcmp (section->name, ".eh_frame") == 0;
-  unsigned int length_return;
-  int max_regs = 0;
-  const char *bad_reg = _("bad register: ");
-  int saved_eh_addr_size = eh_addr_size;
+  dwarf_vma a = loc_offsets[*(const unsigned int *) ap];
+  dwarf_vma b = loc_offsets[*(const unsigned int *) bp];
 
-  printf (_("Contents of the %s section:\n"), section->name);
+  int ret = (a > b) - (b > a);
+  if (ret)
+    return ret;
 
-  while (start < end)
-    {
-      unsigned char *saved_start;
-      unsigned char *block_end;
-      unsigned long length;
-      unsigned long cie_id;
-      Frame_Chunk *fc;
-      Frame_Chunk *cie;
-      int need_col_headers = 1;
-      unsigned char *augmentation_data = NULL;
-      unsigned long augmentation_data_len = 0;
-      int encoded_ptr_size = saved_eh_addr_size;
-      int offset_size;
-      int initial_length_size;
+  a = loc_views[*(const unsigned int *) ap];
+  b = loc_views[*(const unsigned int *) bp];
 
-      saved_start = start;
-      length = byte_get (start, 4); start += 4;
+  ret = (a > b) - (b > a);
 
-      if (length == 0)
-       {
-         printf ("\n%08lx ZERO terminator\n\n",
-                   (unsigned long)(saved_start - section_start));
-         continue;
-       }
+  return ret;
+}
 
-      if (length == 0xffffffff)
-       {
-         length = byte_get (start, 8);
-         start += 8;
-         offset_size = 8;
-         initial_length_size = 12;
-       }
-      else
+static int
+display_debug_loc (struct dwarf_section *section, void *file)
+{
+  unsigned char *start = section->start, *vstart = NULL;
+  unsigned long bytes;
+  unsigned char *section_begin = start;
+  unsigned int num_loc_list = 0;
+  unsigned long last_offset = 0;
+  unsigned long last_view = 0;
+  unsigned int first = 0;
+  unsigned int i;
+  unsigned int j;
+  int seen_first_offset = 0;
+  int locs_sorted = 1;
+  unsigned char *next = start, *vnext = vstart;
+  unsigned int *array = NULL;
+  const char *suffix = strrchr (section->name, '.');
+  bfd_boolean is_dwo = FALSE;
+  int is_loclists = strstr (section->name, "debug_loclists") != NULL;
+  dwarf_vma expected_start = 0;
+
+  if (suffix && strcmp (suffix, ".dwo") == 0)
+    is_dwo = TRUE;
+
+  bytes = section->size;
+
+  if (bytes == 0)
+    {
+      printf (_("\nThe %s section is empty.\n"), section->name);
+      return 0;
+    }
+
+  if (is_loclists)
+    {
+      unsigned char *hdrptr = section_begin;
+      dwarf_vma ll_length;
+      unsigned short ll_version;
+      unsigned char *end = section_begin + section->size;
+      unsigned char address_size, segment_selector_size;
+      uint32_t offset_entry_count;
+
+      SAFE_BYTE_GET_AND_INC (ll_length, hdrptr, 4, end);
+      if (ll_length == 0xffffffff)
+       SAFE_BYTE_GET_AND_INC (ll_length, hdrptr, 8, end);
+
+      SAFE_BYTE_GET_AND_INC (ll_version, hdrptr, 2, end);
+      if (ll_version != 5)
        {
-         offset_size = 4;
-         initial_length_size = 4;
+         warn (_("The %s section contains corrupt or "
+                 "unsupported version number: %d.\n"),
+               section->name, ll_version);
+         return 0;
        }
 
-      block_end = saved_start + length + initial_length_size;
-      if (block_end > end)
+      SAFE_BYTE_GET_AND_INC (address_size, hdrptr, 1, end);
+
+      SAFE_BYTE_GET_AND_INC (segment_selector_size, hdrptr, 1, end);
+      if (segment_selector_size != 0)
        {
-         warn ("Invalid length %#08lx in FDE at %#08lx\n",
-               length, (unsigned long)(saved_start - section_start));
-         block_end = end;
+         warn (_("The %s section contains "
+                 "unsupported segment selector size: %d.\n"),
+               section->name, segment_selector_size);
+         return 0;
        }
-      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 (offset_entry_count, hdrptr, 4, end);
+      if (offset_entry_count != 0)
        {
-         int version;
-
-         fc = (Frame_Chunk *) xmalloc (sizeof (Frame_Chunk));
-         memset (fc, 0, sizeof (Frame_Chunk));
+         warn (_("The %s section contains "
+                 "unsupported offset entry count: %d.\n"),
+               section->name, offset_entry_count);
+         return 0;
+       }
 
-         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);
+      expected_start = hdrptr - section_begin;
+    }
 
-         version = *start++;
+  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;
+    }
 
-         fc->augmentation = (char *) start;
-         start = (unsigned char *) strchr ((char *) start, '\0') + 1;
+  /* Check the order of location list in .debug_info section. If
+     offsets of location lists are in the ascending order, we can
+     use `debug_information' directly.  */
+  for (i = 0; i < num_debug_info_entries; i++)
+    {
+      unsigned int num;
 
-         if (strcmp (fc->augmentation, "eh") == 0)
-           start += eh_addr_size;
+      num = debug_information [i].num_loc_offsets;
+      if (num > num_loc_list)
+       num_loc_list = num;
 
-         if (version >= 4)
+      /* Check if we can use `debug_information' directly.  */
+      if (locs_sorted && num != 0)
+       {
+         if (!seen_first_offset)
            {
-             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);
+             /* This is the first location list.  */
+             last_offset = debug_information [i].loc_offsets [0];
+             last_view = debug_information [i].loc_views [0];
+             first = i;
+             seen_first_offset = 1;
+             j = 1;
            }
          else
-           {
-             fc->ra = LEB ();
-           }
-
-         if (fc->augmentation[0] == 'z')
-           {
-             augmentation_data_len = LEB ();
-             augmentation_data = start;
-             start += augmentation_data_len;
-           }
-         cie = fc;
+           j = 0;
 
-         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
+         for (; j < num; j++)
            {
-             printf ("\n%08lx %08lx %08lx CIE\n",
-                     (unsigned long)(saved_start - section_start), length, cie_id);
-             printf ("  Version:               %d\n", version);
-             printf ("  Augmentation:          \"%s\"\n", fc->augmentation);
-             if (version >= 4)
-               {
-                 printf ("  Pointer Size:          %u\n", fc->ptr_size);
-                 printf ("  Segment Size:          %u\n", fc->segment_size);
-               }
-             printf ("  Code alignment factor: %u\n", fc->code_factor);
-             printf ("  Data alignment factor: %d\n", fc->data_factor);
-             printf ("  Return address column: %d\n", fc->ra);
-
-             if (augmentation_data_len)
+             if (last_offset >
+                 debug_information [i].loc_offsets [j]
+                 || (last_offset == debug_information [i].loc_offsets [j]
+                     && last_view > debug_information [i].loc_views [j]))
                {
-                 unsigned long i;
-                 printf ("  Augmentation data:    ");
-                 for (i = 0; i < augmentation_data_len; ++i)
-                   printf (" %02x", augmentation_data[i]);
-                 putchar ('\n');
+                 locs_sorted = 0;
+                 break;
                }
-             putchar ('\n');
+             last_offset = debug_information [i].loc_offsets [j];
+             last_view = debug_information [i].loc_views [j];
            }
+       }
+    }
 
-         if (augmentation_data_len)
-           {
-             unsigned char *p, *q;
-             p = (unsigned char *) fc->augmentation + 1;
-             q = augmentation_data;
+  if (!seen_first_offset)
+    error (_("No location lists in .debug_info section!\n"));
 
-             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++;
-               }
+  if (debug_information [first].num_loc_offsets > 0
+      && debug_information [first].loc_offsets [0] != expected_start
+      && debug_information [first].loc_views [0] != expected_start)
+    warn (_("Location lists in %s section start at 0x%s\n"),
+         section->name,
+         dwarf_vmatoa ("x", debug_information [first].loc_offsets [0]));
 
-             if (fc->fde_encoding)
-               encoded_ptr_size = size_of_encoded_value (fc->fde_encoding);
-           }
+  if (!locs_sorted)
+    array = (unsigned int *) xcmalloc (num_loc_list, sizeof (unsigned int));
 
-         frame_need_space (fc, fc->ra);
-       }
-      else
-       {
-         unsigned char *look_for;
-         static Frame_Chunk fde_fc;
-         unsigned long segment_selector;
+  introduce (section, FALSE);
 
-         fc = & fde_fc;
-         memset (fc, 0, sizeof (Frame_Chunk));
+  if (reloc_at (section, 0))
+    printf (_(" Warning: This section has relocations - addresses seen here may not be accurate.\n\n"));
 
-         look_for = is_eh ? start - 4 - cie_id : section_start + cie_id;
+  printf (_("    Offset   Begin            End              Expression\n"));
 
-         for (cie = chunks; cie ; cie = cie->next)
-           if (cie->chunk_start == look_for)
-             break;
+  seen_first_offset = 0;
+  for (i = first; i < num_debug_info_entries; i++)
+    {
+      dwarf_vma offset, voffset;
+      dwarf_vma base_address;
+      unsigned int k;
+      int has_frame_base;
 
-         if (!cie)
+      if (!locs_sorted)
+       {
+         for (k = 0; k < debug_information [i].num_loc_offsets; k++)
+           array[k] = k;
+         loc_offsets = debug_information [i].loc_offsets;
+         loc_views = debug_information [i].loc_views;
+         qsort (array, debug_information [i].num_loc_offsets,
+                sizeof (*array), loc_offsets_compar);
+       }
+
+      int adjacent_view_loclists = 1;
+      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])
+             && (debug_information [i].loc_views [locs_sorted
+                                                  ? k - 1 : array [k - 1]]
+                 == debug_information [i].loc_views [j]))
+           continue;
+         has_frame_base = debug_information [i].have_frame_base [j];
+         offset = debug_information [i].loc_offsets [j];
+         next = section_begin + offset;
+         voffset = debug_information [i].loc_views [j];
+         if (voffset != vm1)
+           vnext = section_begin + voffset;
+         else
+           vnext = NULL;
+         base_address = debug_information [i].base_address;
+
+         if (vnext && vnext < next)
            {
-             warn ("Invalid CIE pointer %#08lx in FDE at %#08lx\n",
-                   cie_id, (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));
-             frame_need_space (fc, max_regs - 1);
-             cie = fc;
-             fc->augmentation = "";
-             fc->fde_encoding = 0;
-             fc->ptr_size = eh_addr_size;
-             fc->segment_size = 0;
+             vstart = vnext;
+             display_view_pair_list (section, &vstart, i, next);
+             if (start == vnext)
+               start = vstart;
            }
+
+         if (!seen_first_offset || !adjacent_view_loclists)
+           seen_first_offset = 1;
          else
            {
-             fc->ncols = cie->ncols;
-             fc->col_type = (short int *) xcmalloc (fc->ncols, sizeof (short int));
-             fc->col_offset =  (int *) xcmalloc (fc->ncols, sizeof (int));
-             memcpy (fc->col_type, cie->col_type, fc->ncols * sizeof (short int));
-             memcpy (fc->col_offset, cie->col_offset, fc->ncols * sizeof (int));
-             fc->augmentation = cie->augmentation;
-             fc->ptr_size = cie->ptr_size;
-             eh_addr_size = cie->ptr_size;
-             fc->segment_size = cie->segment_size;
-             fc->code_factor = cie->code_factor;
-             fc->data_factor = cie->data_factor;
-             fc->cfa_reg = cie->cfa_reg;
-             fc->cfa_offset = cie->cfa_offset;
-             fc->ra = cie->ra;
-             frame_need_space (fc, max_regs - 1);
-             fc->fde_encoding = cie->fde_encoding;
+             if (start < next)
+               warn (_("There is a hole [0x%lx - 0x%lx] in .debug_loc section.\n"),
+                     (unsigned long) (start - section_begin),
+                     (unsigned long) offset);
+             else if (start > next)
+               warn (_("There is an overlap [0x%lx - 0x%lx] in .debug_loc section.\n"),
+                     (unsigned long) (start - section_begin),
+                     (unsigned long) offset);
            }
+         start = next;
+         vstart = vnext;
 
-         if (fc->fde_encoding)
-           encoded_ptr_size = size_of_encoded_value (fc->fde_encoding);
-
-         segment_selector = 0;
-         if (fc->segment_size)
+         if (offset >= bytes)
            {
-             segment_selector = byte_get (start, fc->segment_size);
-             start += fc->segment_size;
+             warn (_("Offset 0x%lx is bigger than .debug_loc section size.\n"),
+                   (unsigned long) offset);
+             continue;
            }
-         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;
 
-         if (cie->augmentation[0] == 'z')
+         if (vnext && voffset >= bytes)
            {
-             augmentation_data_len = LEB ();
-             augmentation_data = start;
-             start += augmentation_data_len;
+             warn (_("View Offset 0x%lx is bigger than .debug_loc section size.\n"),
+                   (unsigned long) voffset);
+             continue;
            }
 
-         printf ("\n%08lx %08lx %08lx FDE cie=%08lx pc=",
-                 (unsigned long)(saved_start - section_start), length, cie_id,
-                 (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);
-         if (! do_debug_frames_interp && augmentation_data_len)
+         if (!is_loclists)
            {
-             unsigned long i;
+             if (is_dwo)
+               display_loc_list_dwo (section, &start, i, offset,
+                                     &vstart, has_frame_base);
+             else
+               display_loc_list (section, &start, i, offset, base_address,
+                                 &vstart, has_frame_base);
+           }
+         else
+           {
+             if (is_dwo)
+               warn (_("DWO is not yet supported.\n"));
+             else
+               display_loclists_list (section, &start, i, offset, base_address,
+                                      &vstart, has_frame_base);
+           }
 
-             printf ("  Augmentation data:    ");
-             for (i = 0; i < augmentation_data_len; ++i)
-               printf (" %02x", augmentation_data[i]);
-             putchar ('\n');
-             putchar ('\n');
+         /* FIXME: this arrangement is quite simplistic.  Nothing
+            requires locview lists to be adjacent to corresponding
+            loclists, and a single loclist could be augmented by
+            different locview lists, and vice-versa, unlikely as it
+            is that it would make sense to do so.  Hopefully we'll
+            have view pair support built into loclists before we ever
+            need to address all these possibilities.  */
+         if (adjacent_view_loclists && vnext
+             && vnext != start && vstart != next)
+           {
+             adjacent_view_loclists = 0;
+             warn (_("Hole and overlap detection requires adjacent view lists and loclists.\n"));
            }
+
+         if (vnext && vnext == start)
+           display_view_pair_list (section, &start, i, vstart);
        }
+    }
 
-      /* At this point, fc is the current chunk, cie (if any) is set, and
-        we're about to interpret instructions for the chunk.  */
-      /* ??? At present we need to do this always, since this sizes the
-        fc->col_type and fc->col_offset arrays, which we write into always.
-        We should probably split the interpreted and non-interpreted bits
-        into two different routines, since there's so much that doesn't
-        really overlap between them.  */
-      if (1 || do_debug_frames_interp)
-       {
-         /* Start by making a pass over the chunk, allocating storage
-            and taking note of what registers are used.  */
-         unsigned char *tmp = start;
+  if (start < section->start + section->size)
+    warn (ngettext ("There is %ld unused byte at the end of section %s\n",
+                   "There are %ld unused bytes at the end of section %s\n",
+                   (long) (section->start + section->size - start)),
+         (long) (section->start + section->size - start), section->name);
+  putchar ('\n');
+  free (array);
+  return 1;
+}
 
-         while (start < block_end)
-           {
-             unsigned op, opa;
-             unsigned long reg, temp;
+static int
+display_debug_str (struct dwarf_section *section,
+                  void *file ATTRIBUTE_UNUSED)
+{
+  unsigned char *start = section->start;
+  unsigned long bytes = section->size;
+  dwarf_vma addr = section->address;
 
-             op = *start++;
-             opa = op & 0x3f;
-             if (op & 0xc0)
-               op &= 0xc0;
+  if (bytes == 0)
+    {
+      printf (_("\nThe %s section is empty.\n"), section->name);
+      return 0;
+    }
 
-             /* Warning: if you add any more cases to this switch, be
-                sure to add them to the corresponding switch below.  */
-             switch (op)
-               {
-               case DW_CFA_advance_loc:
-                 break;
-               case DW_CFA_offset:
-                 LEB ();
-                 if (frame_need_space (fc, opa) >= 0)
-                   fc->col_type[opa] = DW_CFA_undefined;
-                 break;
-               case DW_CFA_restore:
-                 if (frame_need_space (fc, opa) >= 0)
-                   fc->col_type[opa] = DW_CFA_undefined;
-                 break;
-               case DW_CFA_set_loc:
-                 start += encoded_ptr_size;
-                 break;
-               case DW_CFA_advance_loc1:
-                 start += 1;
-                 break;
-               case DW_CFA_advance_loc2:
-                 start += 2;
-                 break;
-               case DW_CFA_advance_loc4:
-                 start += 4;
-                 break;
-               case DW_CFA_offset_extended:
-               case DW_CFA_val_offset:
-                 reg = LEB (); LEB ();
-                 if (frame_need_space (fc, reg) >= 0)
-                   fc->col_type[reg] = DW_CFA_undefined;
-                 break;
-               case DW_CFA_restore_extended:
-                 reg = LEB ();
-                 frame_need_space (fc, reg);
-                 if (frame_need_space (fc, reg) >= 0)
-                   fc->col_type[reg] = DW_CFA_undefined;
-                 break;
-               case DW_CFA_undefined:
-                 reg = LEB ();
-                 if (frame_need_space (fc, reg) >= 0)
-                   fc->col_type[reg] = DW_CFA_undefined;
-                 break;
-               case DW_CFA_same_value:
-                 reg = LEB ();
-                 if (frame_need_space (fc, reg) >= 0)
-                   fc->col_type[reg] = DW_CFA_undefined;
-                 break;
-               case DW_CFA_register:
-                 reg = LEB (); LEB ();
-                 if (frame_need_space (fc, reg) >= 0)
-                   fc->col_type[reg] = DW_CFA_undefined;
-                 break;
-               case DW_CFA_def_cfa:
-                 LEB (); LEB ();
-                 break;
-               case DW_CFA_def_cfa_register:
-                 LEB ();
-                 break;
-               case DW_CFA_def_cfa_offset:
-                 LEB ();
-                 break;
-               case DW_CFA_def_cfa_expression:
-                 temp = LEB ();
-                 start += temp;
-                 break;
-               case DW_CFA_expression:
-               case DW_CFA_val_expression:
-                 reg = LEB ();
-                 temp = LEB ();
-                 start += temp;
-                 if (frame_need_space (fc, reg) >= 0)
-                   fc->col_type[reg] = DW_CFA_undefined;
-                 break;
-               case DW_CFA_offset_extended_sf:
-               case DW_CFA_val_offset_sf:
-                 reg = LEB (); SLEB ();
-                 if (frame_need_space (fc, reg) >= 0)
-                   fc->col_type[reg] = DW_CFA_undefined;
-                 break;
-               case DW_CFA_def_cfa_sf:
-                 LEB (); SLEB ();
-                 break;
-               case DW_CFA_def_cfa_offset_sf:
-                 SLEB ();
-                 break;
-               case DW_CFA_MIPS_advance_loc8:
-                 start += 8;
-                 break;
-               case DW_CFA_GNU_args_size:
-                 LEB ();
-                 break;
-               case DW_CFA_GNU_negative_offset_extended:
-                 reg = LEB (); LEB ();
-                 if (frame_need_space (fc, reg) >= 0)
-                   fc->col_type[reg] = DW_CFA_undefined;
-                 break;
-               default:
-                 break;
-               }
-           }
-         start = tmp;
-       }
+  introduce (section, FALSE);
 
-      /* Now we know what registers are used, make a second pass over
-        the chunk, this time actually printing out the info.  */
+  while (bytes)
+    {
+      int j;
+      int k;
+      int lbytes;
 
-      while (start < block_end)
+      lbytes = (bytes > 16 ? 16 : bytes);
+
+      printf ("  0x%8.8lx ", (unsigned long) addr);
+
+      for (j = 0; j < 16; j++)
+       {
+         if (j < lbytes)
+           printf ("%2.2x", start[j]);
+         else
+           printf ("  ");
+
+         if ((j & 3) == 3)
+           printf (" ");
+       }
+
+      for (j = 0; j < lbytes; j++)
+       {
+         k = start[j];
+         if (k >= ' ' && k < 0x80)
+           printf ("%c", k);
+         else
+           printf (".");
+       }
+
+      putchar ('\n');
+
+      start += lbytes;
+      addr  += lbytes;
+      bytes -= lbytes;
+    }
+
+  putchar ('\n');
+
+  return 1;
+}
+
+static int
+display_debug_info (struct dwarf_section *section, void *file)
+{
+  return process_debug_info (section, file, section->abbrev_sec, FALSE, FALSE);
+}
+
+static int
+display_debug_types (struct dwarf_section *section, void *file)
+{
+  return process_debug_info (section, file, section->abbrev_sec, FALSE, TRUE);
+}
+
+static int
+display_trace_info (struct dwarf_section *section, void *file)
+{
+  return process_debug_info (section, file, section->abbrev_sec, FALSE, TRUE);
+}
+
+static int
+display_debug_aranges (struct dwarf_section *section,
+                      void *file ATTRIBUTE_UNUSED)
+{
+  unsigned char *start = section->start;
+  unsigned char *end = start + section->size;
+
+  introduce (section, FALSE);
+
+  /* It does not matter if this load fails,
+     we test for that later on.  */
+  load_debug_info (file);
+
+  while (start < end)
+    {
+      unsigned char *hdrptr;
+      DWARF2_Internal_ARange arange;
+      unsigned char *addr_ranges;
+      dwarf_vma length;
+      dwarf_vma address;
+      unsigned long sec_off;
+      unsigned char address_size;
+      int excess;
+      unsigned int offset_size;
+      unsigned int initial_length_size;
+
+      hdrptr = start;
+
+      SAFE_BYTE_GET_AND_INC (arange.ar_length, hdrptr, 4, end);
+      if (arange.ar_length == 0xffffffff)
+       {
+         SAFE_BYTE_GET_AND_INC (arange.ar_length, hdrptr, 8, end);
+         offset_size = 8;
+         initial_length_size = 12;
+       }
+      else
+       {
+         offset_size = 4;
+         initial_length_size = 4;
+       }
+
+      sec_off = hdrptr - section->start;
+      if (sec_off + arange.ar_length < sec_off
+         || sec_off + arange.ar_length > section->size)
+       {
+         warn (_("Debug info is corrupted, %s header at %#lx has length %s\n"),
+               section->name,
+               sec_off - initial_length_size,
+               dwarf_vmatoa ("x", arange.ar_length));
+         break;
+       }
+
+      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"),
+             (unsigned long) arange.ar_info_offset, section->name);
+
+      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)
+       {
+         /* PR 19872: A version number of 0 probably means that there is
+            padding at the end of the .debug_aranges section.  Gold puts
+            it there when performing an incremental link, for example.
+            So do not generate a warning in this case.  */
+         if (arange.ar_version)
+           warn (_("Only DWARF 2 and 3 aranges are currently supported.\n"));
+         break;
+       }
+
+      printf (_("  Length:                   %ld\n"),
+             (long) arange.ar_length);
+      printf (_("  Version:                  %d\n"), arange.ar_version);
+      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.  */
+      if ((address_size & (address_size - 1)) != 0)
+       {
+         warn (_("Pointer size + Segment size is not a power of two.\n"));
+         break;
+       }
+
+      if (address_size > 4)
+       printf (_("\n    Address            Length\n"));
+      else
+       printf (_("\n    Address    Length\n"));
+
+      addr_ranges = hdrptr;
+
+      /* Must pad to an alignment boundary that is twice the address size.  */
+      excess = (hdrptr - start) % (2 * address_size);
+      if (excess)
+       addr_ranges += (2 * address_size) - excess;
+
+      start += arange.ar_length + initial_length_size;
+
+      while (addr_ranges + 2 * address_size <= start)
+       {
+         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);
+         print_dwarf_vma (length, address_size);
+         putchar ('\n');
+       }
+    }
+
+  printf ("\n");
+
+  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;
+    }
+
+  introduce (section, FALSE);
+
+  /* PR  17531: file: cf38d01b.
+     We use xcalloc because a corrupt file may not have initialised all of the
+     fields in the debug_info structure, which means that the sort below might
+     try to move uninitialised data.  */
+  debug_addr_info = (debug_info **) xcalloc ((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)
+      {
+       /* PR 17531: file: cf38d01b.  */
+       if (debug_information[i].addr_base >= section->size)
+         warn (_("Corrupt address base (%lx) found in debug section %u\n"),
+               (unsigned long) debug_information[i].addr_base, i);
+       else
+         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.  */
+  dwarf_vma ranges_offset;
+
+  /* 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.  */
+
+static int
+range_entry_compar (const void *ap, const void *bp)
+{
+  const struct range_entry *a_re = (const struct range_entry *) ap;
+  const struct range_entry *b_re = (const struct range_entry *) bp;
+  const dwarf_vma a = a_re->ranges_offset;
+  const dwarf_vma b = b_re->ranges_offset;
+
+  return (a > b) - (b > a);
+}
+
+static void
+display_debug_ranges_list (unsigned char *start, unsigned char *finish,
+                          unsigned int pointer_size, unsigned long offset,
+                          unsigned long base_address)
+{
+  while (start < finish)
+    {
+      dwarf_vma begin;
+      dwarf_vma end;
+
+      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);
+
+      if (begin == 0 && end == 0)
+       {
+         printf (_("<End of list>\n"));
+         break;
+       }
+
+      /* Check base address specifiers.  */
+      if (is_max_address (begin, pointer_size)
+         && !is_max_address (end, pointer_size))
+       {
+         base_address = end;
+         print_dwarf_vma (begin, pointer_size);
+         print_dwarf_vma (end, pointer_size);
+         printf ("(base address)\n");
+         continue;
+       }
+
+      print_dwarf_vma (begin + base_address, pointer_size);
+      print_dwarf_vma (end + base_address, pointer_size);
+
+      if (begin == end)
+       fputs (_("(start == end)"), stdout);
+      else if (begin > end)
+       fputs (_("(start > end)"), stdout);
+
+      putchar ('\n');
+    }
+}
+
+static void
+display_debug_rnglists_list (unsigned char *start, unsigned char *finish,
+                            unsigned int pointer_size, unsigned long offset,
+                            unsigned long base_address)
+{
+  unsigned char *next = start;
+
+  while (1)
+    {
+      unsigned long off = offset + (start - next);
+      enum dwarf_range_list_entry rlet;
+      /* Initialize it due to a false compiler warning.  */
+      dwarf_vma begin = -1, length, end = -1;
+      unsigned int bytes_read;
+
+      if (start + 1 > finish)
+       {
+         warn (_("Range list starting at offset 0x%lx is not terminated.\n"),
+               offset);
+         break;
+       }
+
+      printf ("    %8.8lx ", off);
+
+      SAFE_BYTE_GET_AND_INC (rlet, start, 1, finish);
+
+      switch (rlet)
+       {
+       case DW_RLE_end_of_list:
+         printf (_("<End of list>\n"));
+         break;
+       case DW_RLE_base_address:
+         SAFE_BYTE_GET_AND_INC (base_address, start, pointer_size, finish);
+         print_dwarf_vma (base_address, pointer_size);
+         printf (_("(base address)\n"));
+         break;
+       case DW_RLE_start_length:
+         SAFE_BYTE_GET_AND_INC (begin, start, pointer_size, finish);
+         length = read_uleb128 (start, &bytes_read, finish);
+         start += bytes_read;
+         end = begin + length;
+         break;
+       case DW_RLE_offset_pair:
+         begin = read_uleb128 (start, &bytes_read, finish);
+         start += bytes_read;
+         end = read_uleb128 (start, &bytes_read, finish);
+         start += bytes_read;
+         break;
+       case DW_RLE_start_end:
+         SAFE_BYTE_GET_AND_INC (begin, start, pointer_size, finish);
+         SAFE_BYTE_GET_AND_INC (end, start, pointer_size, finish);
+         break;
+       default:
+         error (_("Invalid range list entry type %d\n"), rlet);
+         rlet = DW_RLE_end_of_list;
+         break;
+       }
+      if (rlet == DW_RLE_end_of_list)
+       break;
+      if (rlet == DW_RLE_base_address)
+       continue;
+
+      print_dwarf_vma (begin + base_address, pointer_size);
+      print_dwarf_vma (end + base_address, pointer_size);
+
+      if (begin == end)
+       fputs (_("(start == end)"), stdout);
+      else if (begin > end)
+       fputs (_("(start > end)"), stdout);
+
+      putchar ('\n');
+    }
+}
+
+static int
+display_debug_ranges (struct dwarf_section *section,
+                     void *file ATTRIBUTE_UNUSED)
+{
+  unsigned char *start = section->start;
+  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;
+  int is_rnglists = strstr (section->name, "debug_rnglists") != NULL;
+  /* Initialize it due to a false compiler warning.  */
+  unsigned char address_size = 0;
+
+  if (bytes == 0)
+    {
+      printf (_("\nThe %s section is empty.\n"), section->name);
+      return 0;
+    }
+
+  if (is_rnglists)
+    {
+      dwarf_vma initial_length;
+      unsigned int initial_length_size;
+      unsigned char segment_selector_size;
+      unsigned int offset_size, offset_entry_count;
+      unsigned short version;
+
+      /* Get and check the length of the block.  */
+      SAFE_BYTE_GET_AND_INC (initial_length, start, 4, finish);
+
+      if (initial_length == 0xffffffff)
+       {
+         /* This section is 64-bit DWARF 3.  */
+         SAFE_BYTE_GET_AND_INC (initial_length, start, 8, finish);
+         offset_size = 8;
+         initial_length_size = 12;
+       }
+      else
+       {
+         offset_size = 4;
+         initial_length_size = 4;
+       }
+
+      if (initial_length + initial_length_size > section->size)
+       {
+         /* If the length field has a relocation against it, then we should
+            not complain if it is inaccurate (and probably negative).
+            It is copied from .debug_line handling code.  */
+         if (reloc_at (section, (start - section->start) - offset_size))
+           {
+             initial_length = (finish - start) - initial_length_size;
+           }
+         else
+           {
+             warn (_("The length field (0x%lx) in the debug_rnglists header is wrong - the section is too small\n"),
+                   (long) initial_length);
+             return 0;
+           }
+       }
+
+      /* Get and check the version number.  */
+      SAFE_BYTE_GET_AND_INC (version, start, 2, finish);
+
+      if (version != 5)
+       {
+         warn (_("Only DWARF version 5 debug_rnglists info "
+                 "is currently supported.\n"));
+         return 0;
+       }
+
+      SAFE_BYTE_GET_AND_INC (address_size, start, 1, finish);
+
+      SAFE_BYTE_GET_AND_INC (segment_selector_size, start, 1, finish);
+      if (segment_selector_size != 0)
+       {
+         warn (_("The %s section contains "
+                 "unsupported segment selector size: %d.\n"),
+               section->name, segment_selector_size);
+         return 0;
+       }
+
+      SAFE_BYTE_GET_AND_INC (offset_entry_count, start, 4, finish);
+      if (offset_entry_count != 0)
+       {
+         warn (_("The %s section contains "
+                 "unsupported offset entry count: %u.\n"),
+               section->name, offset_entry_count);
+         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;
+    }
+
+  num_range_list = 0;
+  for (i = 0; i < num_debug_info_entries; i++)
+    num_range_list += debug_information [i].num_range_lists;
+
+  if (num_range_list == 0)
+    {
+      /* 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);
+  range_entry_fill = range_entries;
+
+  for (i = 0; i < num_debug_info_entries; i++)
+    {
+      debug_info *debug_info_p = &debug_information[i];
+      unsigned int j;
+
+      for (j = 0; j < debug_info_p->num_range_lists; j++)
+       {
+         range_entry_fill->ranges_offset = debug_info_p->range_lists[j];
+         range_entry_fill->debug_info_p = debug_info_p;
+         range_entry_fill++;
+       }
+    }
+
+  qsort (range_entries, num_range_list, sizeof (*range_entries),
+        range_entry_compar);
+
+  if (dwarf_check != 0 && range_entries[0].ranges_offset != 0)
+    warn (_("Range lists in %s section start at 0x%lx\n"),
+         section->name, (unsigned long) range_entries[0].ranges_offset);
+
+  introduce (section, FALSE);
+
+  printf (_("    Offset   Begin    End\n"));
+
+  for (i = 0; i < num_range_list; i++)
+    {
+      struct range_entry *range_entry = &range_entries[i];
+      debug_info *debug_info_p = range_entry->debug_info_p;
+      unsigned int pointer_size;
+      dwarf_vma offset;
+      unsigned char *next;
+      dwarf_vma base_address;
+
+      pointer_size = (is_rnglists ? address_size : debug_info_p->pointer_size);
+      offset = range_entry->ranges_offset;
+      next = section_begin + offset;
+      base_address = debug_info_p->base_address;
+
+      /* 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, (unsigned long) offset);
+         continue;
+       }
+
+      if (next < section_begin || next >= finish)
+       {
+         warn (_("Corrupt offset (%#8.8lx) in range entry %u\n"),
+               (unsigned long) offset, i);
+         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)
+           {
+             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;
+
+      (is_rnglists ? display_debug_rnglists_list : display_debug_ranges_list)
+       (start, finish, pointer_size, offset, base_address);
+    }
+  putchar ('\n');
+
+  free (range_entries);
+
+  return 1;
+}
+
+typedef struct Frame_Chunk
+{
+  struct Frame_Chunk *next;
+  unsigned char *chunk_start;
+  unsigned int ncols;
+  /* DW_CFA_{undefined,same_value,offset,register,unreferenced}  */
+  short int *col_type;
+  int *col_offset;
+  char *augmentation;
+  unsigned int code_factor;
+  int data_factor;
+  dwarf_vma pc_begin;
+  dwarf_vma pc_range;
+  unsigned int cfa_reg;
+  dwarf_vma cfa_offset;
+  unsigned int ra;
+  unsigned char fde_encoding;
+  unsigned char cfa_exp;
+  unsigned char ptr_size;
+  unsigned char segment_size;
+}
+Frame_Chunk;
+
+static const char *const *dwarf_regnames;
+static unsigned int dwarf_regnames_count;
+
+/* A marker for a col_type that means this column was never referenced
+   in the frame info.  */
+#define DW_CFA_unreferenced (-1)
+
+/* Return 0 if no more space is needed, 1 if more space is needed,
+   -1 for invalid reg.  */
+
+static int
+frame_need_space (Frame_Chunk *fc, unsigned int reg)
+{
+  unsigned int prev = fc->ncols;
+
+  if (reg < (unsigned int) fc->ncols)
+    return 0;
+
+  if (dwarf_regnames_count
+      && reg > dwarf_regnames_count)
+    return -1;
+
+  fc->ncols = reg + 1;
+  /* PR 17512: file: 10450-2643-0.004.
+     If reg == -1 then this can happen...  */
+  if (fc->ncols == 0)
+    return -1;
+
+  /* PR 17512: file: 2844a11d.  */
+  if (fc->ncols > 1024)
+    {
+      error (_("Unfeasibly large register number: %u\n"), reg);
+      fc->ncols = 0;
+      /* FIXME: 1024 is an arbitrary limit.  Increase it if
+        we ever encounter a valid binary that exceeds it.  */
+      return -1;
+    }
+
+  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)
+    {
+      fc->col_type[prev] = DW_CFA_unreferenced;
+      fc->col_offset[prev] = 0;
+      prev++;
+    }
+  return 1;
+}
+
+static const char *const dwarf_regnames_i386[] =
+{
+  "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  */
+};
+
+static const char *const dwarf_regnames_iamcu[] =
+{
+  "eax", "ecx", "edx", "ebx",                    /* 0 - 3  */
+  "esp", "ebp", "esi", "edi",                    /* 4 - 7  */
+  "eip", "eflags", NULL,                         /* 8 - 10  */
+  NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* 11 - 18  */
+  NULL, NULL,                                    /* 19 - 20  */
+  NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* 21 - 28  */
+  NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* 29 - 36  */
+  NULL, NULL, NULL,                              /* 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  */
+  NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL  /* 93 - 100  */
+};
+
+void
+init_dwarf_regnames_i386 (void)
+{
+  dwarf_regnames = dwarf_regnames_i386;
+  dwarf_regnames_count = ARRAY_SIZE (dwarf_regnames_i386);
+}
+
+void
+init_dwarf_regnames_iamcu (void)
+{
+  dwarf_regnames = dwarf_regnames_iamcu;
+  dwarf_regnames_count = ARRAY_SIZE (dwarf_regnames_iamcu);
+}
+
+static const char *const dwarf_regnames_x86_64[] =
+{
+  "rax", "rdx", "rcx", "rbx",
+  "rsi", "rdi", "rbp", "rsp",
+  "r8",  "r9",  "r10", "r11",
+  "r12", "r13", "r14", "r15",
+  "rip",
+  "xmm0",  "xmm1",  "xmm2",  "xmm3",
+  "xmm4",  "xmm5",  "xmm6",  "xmm7",
+  "xmm8",  "xmm9",  "xmm10", "xmm11",
+  "xmm12", "xmm13", "xmm14", "xmm15",
+  "st0", "st1", "st2", "st3",
+  "st4", "st5", "st6", "st7",
+  "mm0", "mm1", "mm2", "mm3",
+  "mm4", "mm5", "mm6", "mm7",
+  "rflags",
+  "es", "cs", "ss", "ds", "fs", "gs", NULL, NULL,
+  "fs.base", "gs.base", NULL, NULL,
+  "tr", "ldtr",
+  "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
+init_dwarf_regnames_x86_64 (void)
+{
+  dwarf_regnames = dwarf_regnames_x86_64;
+  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,  "vg", "ffr",
+   "p0",  "p1",  "p2",  "p3",  "p4",  "p5",  "p6",  "p7",
+   "p8",  "p9", "p10", "p11", "p12", "p13", "p14", "p15",
+   "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",
+   "z0",  "z1",  "z2",  "z3",  "z4",  "z5",  "z6",  "z7",
+   "z8",  "z9", "z10", "z11", "z12", "z13", "z14", "z15",
+  "z16", "z17", "z18", "z19", "z20", "z21", "z22", "z23",
+  "z24", "z25", "z26", "z27", "z28", "z29", "z30", "z31",
+};
+
+void
+init_dwarf_regnames_aarch64 (void)
+{
+  dwarf_regnames = dwarf_regnames_aarch64;
+  dwarf_regnames_count = ARRAY_SIZE (dwarf_regnames_aarch64);
+}
+
+static const char *const dwarf_regnames_s390[] =
+{
+  /* Avoid saying "r5 (r5)", so omit the names of r0-r15.  */
+  NULL,  NULL,  NULL,  NULL,  NULL,  NULL,  NULL,  NULL,
+  NULL,  NULL,  NULL,  NULL,  NULL,  NULL,  NULL,  NULL,
+  "f0",  "f2",  "f4",  "f6",  "f1",  "f3",  "f5",  "f7",
+  "f8",  "f10", "f12", "f14", "f9",  "f11", "f13", "f15",
+  "cr0", "cr1", "cr2", "cr3", "cr4", "cr5", "cr6", "cr7",
+  "cr8", "cr9", "cr10", "cr11", "cr12", "cr13", "cr14", "cr15",
+  "a0",  "a1",  "a2",  "a3",  "a4",  "a5",  "a6",  "a7",
+  "a8",  "a9",  "a10", "a11", "a12", "a13", "a14", "a15",
+  "pswm", "pswa",
+  NULL, NULL,
+  "v16", "v18", "v20", "v22", "v17", "v19", "v21", "v23",
+  "v24", "v26", "v28", "v30", "v25", "v27", "v29", "v31",
+};
+
+void
+init_dwarf_regnames_s390 (void)
+{
+  dwarf_regnames = dwarf_regnames_s390;
+  dwarf_regnames_count = ARRAY_SIZE (dwarf_regnames_s390);
+}
+
+static const char *const dwarf_regnames_riscv[] =
+{
+ "zero", "ra",   "sp",   "gp",  "tp",  "t0",  "t1",  "t2",  /* 0  - 7 */
+ "s0",   "s1",   "a0",   "a1",  "a2",  "a3",  "a4",  "a5",  /* 8  - 15 */
+ "a6",   "a7",   "s2",   "s3",  "s4",  "s5",  "s6",  "s7",  /* 16 - 23 */
+ "s8",   "s9",   "s10",  "s11", "t3",  "t4",  "t5",  "t6",  /* 24 - 31 */
+ "ft0",  "ft1",  "ft2",  "ft3", "ft4", "ft5", "ft6", "ft7", /* 32 - 39 */
+ "fs0",  "fs1",                                             /* 40 - 41 */
+ "fa0",  "fa1",  "fa2",  "fa3", "fa4", "fa5", "fa6", "fa7", /* 42 - 49 */
+ "fs2",  "fs3",  "fs4",  "fs5", "fs6", "fs7", "fs8", "fs9", /* 50 - 57 */
+ "fs10", "fs11",                                            /* 58 - 59 */
+ "ft8",  "ft9",  "ft10", "ft11"                             /* 60 - 63 */
+};
+
+void
+init_dwarf_regnames_riscv (void)
+{
+  dwarf_regnames = dwarf_regnames_riscv;
+  dwarf_regnames_count = ARRAY_SIZE (dwarf_regnames_riscv);
+}
+
+void
+init_dwarf_regnames (unsigned int e_machine)
+{
+  switch (e_machine)
+    {
+    case EM_386:
+      init_dwarf_regnames_i386 ();
+      break;
+
+    case EM_IAMCU:
+      init_dwarf_regnames_iamcu ();
+      break;
+
+    case EM_X86_64:
+    case EM_L1OM:
+    case EM_K1OM:
+      init_dwarf_regnames_x86_64 ();
+      break;
+
+    case EM_AARCH64:
+      init_dwarf_regnames_aarch64 ();
+      break;
+
+    case EM_S390:
+      init_dwarf_regnames_s390 ();
+      break;
+
+    case EM_RISCV:
+      init_dwarf_regnames_riscv ();
+      break;
+
+    default:
+      break;
+    }
+}
+
+static const char *
+regname (unsigned int regno, int row)
+{
+  static char reg[64];
+
+  if (dwarf_regnames
+      && regno < dwarf_regnames_count
+      && dwarf_regnames [regno] != NULL)
+    {
+      if (row)
+       return dwarf_regnames [regno];
+      snprintf (reg, sizeof (reg), "r%d (%s)", regno,
+               dwarf_regnames [regno]);
+    }
+  else
+    snprintf (reg, sizeof (reg), "r%d", regno);
+  return reg;
+}
+
+static void
+frame_display_row (Frame_Chunk *fc, int *need_col_headers, unsigned int *max_regs)
+{
+  unsigned int r;
+  char tmp[100];
+
+  if (*max_regs != fc->ncols)
+    *max_regs = fc->ncols;
+
+  if (*need_col_headers)
+    {
+      static const char *sloc = "   LOC";
+
+      *need_col_headers = 0;
+
+      printf ("%-*s CFA      ", eh_addr_size * 2, sloc);
+
+      for (r = 0; r < *max_regs; r++)
+       if (fc->col_type[r] != DW_CFA_unreferenced)
+         {
+           if (r == fc->ra)
+             printf ("ra    ");
+           else
+             printf ("%-5s ", regname (r, 1));
+         }
+
+      printf ("\n");
+    }
+
+  print_dwarf_vma (fc->pc_begin, eh_addr_size);
+  if (fc->cfa_exp)
+    strcpy (tmp, "exp");
+  else
+    sprintf (tmp, "%s%+d", regname (fc->cfa_reg, 1), (int) fc->cfa_offset);
+  printf ("%-8s ", tmp);
+
+  for (r = 0; r < fc->ncols; r++)
+    {
+      if (fc->col_type[r] != DW_CFA_unreferenced)
+       {
+         switch (fc->col_type[r])
+           {
+           case DW_CFA_undefined:
+             strcpy (tmp, "u");
+             break;
+           case DW_CFA_same_value:
+             strcpy (tmp, "s");
+             break;
+           case DW_CFA_offset:
+             sprintf (tmp, "c%+d", fc->col_offset[r]);
+             break;
+           case DW_CFA_val_offset:
+             sprintf (tmp, "v%+d", fc->col_offset[r]);
+             break;
+           case DW_CFA_register:
+             sprintf (tmp, "%s", regname (fc->col_offset[r], 0));
+             break;
+           case DW_CFA_expression:
+             strcpy (tmp, "exp");
+             break;
+           case DW_CFA_val_expression:
+             strcpy (tmp, "vexp");
+             break;
+           default:
+             strcpy (tmp, "n/a");
+             break;
+           }
+         printf ("%-5s ", tmp);
+       }
+    }
+  printf ("\n");
+}
+
+#define GET(VAR, N)    SAFE_BYTE_GET_AND_INC (VAR, start, N, end)
+
+static unsigned char *
+read_cie (unsigned char *start, unsigned char *end,
+         Frame_Chunk **p_cie, int *p_version,
+         bfd_size_type *p_aug_len, unsigned char **p_aug)
+{
+  int version;
+  Frame_Chunk *fc;
+  unsigned int length_return;
+  unsigned char *augmentation_data = NULL;
+  bfd_size_type 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"));
+      goto fail;
+    }
+
+  if (strcmp (fc->augmentation, "eh") == 0)
+    start += eh_addr_size;
+
+  if (version >= 4)
+    {
+      GET (fc->ptr_size, 1);
+      if (fc->ptr_size < 1 || fc->ptr_size > 8)
+       {
+         warn (_("Invalid pointer size (%d) in CIE data\n"), fc->ptr_size);
+         goto fail;
+       }
+
+      GET (fc->segment_size, 1);
+      /* PR 17512: file: e99d2804.  */
+      if (fc->segment_size > 8 || fc->segment_size + fc->ptr_size > 8)
+       {
+         warn (_("Invalid segment size (%d) in CIE data\n"), fc->segment_size);
+         goto fail;
+       }
+
+      eh_addr_size = fc->ptr_size;
+    }
+  else
+    {
+      fc->ptr_size = eh_addr_size;
+      fc->segment_size = 0;
+    }
+
+  READ_ULEB (fc->code_factor);
+  READ_SLEB (fc->data_factor);
+
+  if (version == 1)
+    {
+      GET (fc->ra, 1);
+    }
+  else
+    {
+      READ_ULEB (fc->ra);
+    }
+
+  if (fc->augmentation[0] == 'z')
+    {
+      READ_ULEB (augmentation_data_len);
+      augmentation_data = start;
+      /* PR 17512: file: 11042-2589-0.004.  */
+      if (augmentation_data_len > (bfd_size_type) (end - start))
+       {
+         warn (_("Augmentation data too long: 0x%s, expected at most %#lx\n"),
+               dwarf_vmatoa ("x", augmentation_data_len),
+               (unsigned long) (end - start));
+         goto fail;
+       }
+      start += augmentation_data_len;
+    }
+
+  if (augmentation_data_len)
+    {
+      unsigned char *p;
+      unsigned char *q;
+      unsigned char *qend;
+
+      p = (unsigned char *) fc->augmentation + 1;
+      q = augmentation_data;
+      qend = q + augmentation_data_len;
+
+      while (p < end && q < qend)
+       {
+         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 if (*p == 'B')
+           ;
+         else
+           break;
+         p++;
+       }
+      /* Note - it is OK if this loop terminates with q < qend.
+        Padding may have been inserted to align the end of the CIE.  */
+    }
+
+  *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;
+
+ fail:
+  free (fc->col_offset);
+  free (fc->col_type);
+  free (fc);
+  return end;
+}
+
+/* Prints out the contents on the DATA array formatted as unsigned bytes.
+   If do_wide is not enabled, then formats the output to fit into 80 columns.
+   PRINTED contains the number of characters already written to the current
+   output line.  */
+
+static void
+display_data (bfd_size_type          printed,
+             const unsigned char *  data,
+             const bfd_size_type    len)
+{
+  if (do_wide || len < ((80 - printed) / 3))
+    for (printed = 0; printed < len; ++printed)
+      printf (" %02x", data[printed]);
+  else
+    {
+      for (printed = 0; printed < len; ++printed)
+       {
+         if (printed % (80 / 3) == 0)
+           putchar ('\n');
+         printf (" %02x", data[printed]);
+       }
+    }
+}
+
+/* Prints out the contents on the augmentation data array.
+   If do_wide is not enabled, then formats the output to fit into 80 columns.  */
+
+static void
+display_augmentation_data (const unsigned char * data, const bfd_size_type len)
+{
+  bfd_size_type i;
+
+  i = printf (_("  Augmentation data:    "));
+  display_data (i, data, len);
+}
+
+static int
+display_debug_frames (struct dwarf_section *section,
+                     void *file ATTRIBUTE_UNUSED)
+{
+  unsigned char *start = section->start;
+  unsigned char *end = start + section->size;
+  unsigned char *section_start = start;
+  Frame_Chunk *chunks = NULL, *forward_refs = NULL;
+  Frame_Chunk *remembered_state = NULL;
+  Frame_Chunk *rs;
+  bfd_boolean is_eh = strcmp (section->name, ".eh_frame") == 0;
+  unsigned int length_return;
+  unsigned int max_regs = 0;
+  const char *bad_reg = _("bad register: ");
+  unsigned int saved_eh_addr_size = eh_addr_size;
+
+  introduce (section, FALSE);
+
+  while (start < end)
+    {
+      unsigned char *saved_start;
+      unsigned char *block_end;
+      dwarf_vma length;
+      dwarf_vma cie_id;
+      Frame_Chunk *fc;
+      Frame_Chunk *cie;
+      int need_col_headers = 1;
+      unsigned char *augmentation_data = NULL;
+      bfd_size_type augmentation_data_len = 0;
+      unsigned int encoded_ptr_size = saved_eh_addr_size;
+      unsigned int offset_size;
+      unsigned int initial_length_size;
+      bfd_boolean all_nops;
+
+      saved_start = start;
+
+      SAFE_BYTE_GET_AND_INC (length, start, 4, end);
+
+      if (length == 0)
+       {
+         printf ("\n%08lx ZERO terminator\n\n",
+                   (unsigned long)(saved_start - section_start));
+         /* Skip any zero terminators that directly follow.
+            A corrupt section size could have loaded a whole
+            slew of zero filled memory bytes.  eg
+            PR 17512: file: 070-19381-0.004.  */
+         while (start < end && * start == 0)
+           ++ start;
+         continue;
+       }
+
+      if (length == 0xffffffff)
+       {
+         SAFE_BYTE_GET_AND_INC (length, start, 8, end);
+         offset_size = 8;
+         initial_length_size = 12;
+       }
+      else
+       {
+         offset_size = 4;
+         initial_length_size = 4;
+       }
+
+      block_end = saved_start + length + initial_length_size;
+      if (block_end > end || block_end < 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;
+       }
+
+      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;
+         unsigned int mreg;
+
+         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;
+         mreg = max_regs > 0 ? max_regs - 1 : 0;
+         if (mreg < fc->ra)
+           mreg = fc->ra;
+         if (frame_need_space (fc, mreg) < 0)
+           break;
+         if (fc->fde_encoding)
+           encoded_ptr_size = size_of_encoded_value (fc->fde_encoding);
+
+         printf ("\n%08lx ", (unsigned long) (saved_start - section_start));
+         print_dwarf_vma (length, fc->ptr_size);
+         print_dwarf_vma (cie_id, offset_size);
+
+         if (do_debug_frames_interp)
+           {
+             printf ("CIE \"%s\" cf=%d df=%d ra=%d\n", fc->augmentation,
+                     fc->code_factor, fc->data_factor, fc->ra);
+           }
+         else
+           {
+             printf ("CIE\n");
+             printf ("  Version:               %d\n", version);
+             printf ("  Augmentation:          \"%s\"\n", fc->augmentation);
+             if (version >= 4)
+               {
+                 printf ("  Pointer Size:          %u\n", fc->ptr_size);
+                 printf ("  Segment Size:          %u\n", fc->segment_size);
+               }
+             printf ("  Code alignment factor: %u\n", fc->code_factor);
+             printf ("  Data alignment factor: %d\n", fc->data_factor);
+             printf ("  Return address column: %d\n", fc->ra);
+
+             if (augmentation_data_len)
+               display_augmentation_data (augmentation_data, augmentation_data_len);
+
+             putchar ('\n');
+           }
+       }
+      else
+       {
+         unsigned char *look_for;
+         static Frame_Chunk fde_fc;
+         unsigned long segment_selector;
+
+         if (is_eh)
+           {
+             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;
+
+         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)
+               {
+                 unsigned int off_size;
+                 unsigned char *cie_scan;
+
+                 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;
+                         unsigned int mreg;
+
+                         read_cie (cie_scan, end, &cie, &version,
+                                   &augmentation_data_len, &augmentation_data);
+                         /* PR 17512: file: 3450-2098-0.004.  */
+                         if (cie == NULL)
+                           {
+                             warn (_("Failed to read CIE information\n"));
+                             break;
+                           }
+                         cie->next = forward_refs;
+                         forward_refs = cie;
+                         cie->chunk_start = look_for;
+                         mreg = max_regs > 0 ? max_regs - 1 : 0;
+                         if (mreg < cie->ra)
+                           mreg = cie->ra;
+                         if (frame_need_space (cie, mreg) < 0)
+                           {
+                             warn (_("Invalid max register\n"));
+                             break;
+                           }
+                         if (cie->fde_encoding)
+                           encoded_ptr_size
+                             = size_of_encoded_value (cie->fde_encoding);
+                       }
+                   }
+               }
+           }
+
+         fc = &fde_fc;
+         memset (fc, 0, sizeof (Frame_Chunk));
+
+         if (!cie)
+           {
+             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));
+             if (frame_need_space (fc, max_regs > 0 ? max_regs - 1 : 0) < 0)
+               {
+                 warn (_("Invalid max register\n"));
+                 break;
+               }
+             cie = fc;
+             fc->augmentation = "";
+             fc->fde_encoding = 0;
+             fc->ptr_size = eh_addr_size;
+             fc->segment_size = 0;
+           }
+         else
+           {
+             fc->ncols = cie->ncols;
+             fc->col_type = (short int *) xcmalloc (fc->ncols, sizeof (short int));
+             fc->col_offset =  (int *) xcmalloc (fc->ncols, sizeof (int));
+             memcpy (fc->col_type, cie->col_type, fc->ncols * sizeof (short int));
+             memcpy (fc->col_offset, cie->col_offset, fc->ncols * sizeof (int));
+             fc->augmentation = cie->augmentation;
+             fc->ptr_size = cie->ptr_size;
+             eh_addr_size = cie->ptr_size;
+             fc->segment_size = cie->segment_size;
+             fc->code_factor = cie->code_factor;
+             fc->data_factor = cie->data_factor;
+             fc->cfa_reg = cie->cfa_reg;
+             fc->cfa_offset = cie->cfa_offset;
+             fc->ra = cie->ra;
+             if (frame_need_space (fc, max_regs > 0 ? max_regs - 1: 0) < 0)
+               {
+                 warn (_("Invalid max register\n"));
+                 break;
+               }
+             fc->fde_encoding = cie->fde_encoding;
+           }
+
+         if (fc->fde_encoding)
+           encoded_ptr_size = size_of_encoded_value (fc->fde_encoding);
+
+         segment_selector = 0;
+         if (fc->segment_size)
+           {
+             if (fc->segment_size > sizeof (segment_selector))
+               {
+                 /* PR 17512: file: 9e196b3e.  */
+                 warn (_("Probably corrupt segment size: %d - using 4 instead\n"), fc->segment_size);
+                 fc->segment_size = 4;
+               }
+             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')
+           {
+             READ_ULEB (augmentation_data_len);
+             augmentation_data = start;
+             /* PR 17512 file: 722-8446-0.004 and PR 22386.  */
+             if (augmentation_data_len > (bfd_size_type) (end - start))
+               {
+                 warn (_("Augmentation data too long: 0x%s, "
+                         "expected at most %#lx\n"),
+                       dwarf_vmatoa ("x", augmentation_data_len),
+                       (unsigned long) (end - start));
+                 start = end;
+                 augmentation_data = NULL;
+                 augmentation_data_len = 0;
+               }
+             start += augmentation_data_len;
+           }
+
+         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 ("%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)
+           {
+             display_augmentation_data (augmentation_data, augmentation_data_len);
+             putchar ('\n');
+           }
+       }
+
+      /* At this point, fc is the current chunk, cie (if any) is set, and
+        we're about to interpret instructions for the chunk.  */
+      /* ??? At present we need to do this always, since this sizes the
+        fc->col_type and fc->col_offset arrays, which we write into always.
+        We should probably split the interpreted and non-interpreted bits
+        into two different routines, since there's so much that doesn't
+        really overlap between them.  */
+      if (1 || do_debug_frames_interp)
+       {
+         /* Start by making a pass over the chunk, allocating storage
+            and taking note of what registers are used.  */
+         unsigned char *tmp = start;
+
+         while (start < block_end)
+           {
+             unsigned int reg, op, opa;
+             unsigned long temp;
+             unsigned char * new_start;
+
+             op = *start++;
+             opa = op & 0x3f;
+             if (op & 0xc0)
+               op &= 0xc0;
+
+             /* Warning: if you add any more cases to this switch, be
+                sure to add them to the corresponding switch below.  */
+             switch (op)
+               {
+               case DW_CFA_advance_loc:
+                 break;
+               case DW_CFA_offset:
+                 SKIP_ULEB ();
+                 if (frame_need_space (fc, opa) >= 0)
+                   fc->col_type[opa] = DW_CFA_undefined;
+                 break;
+               case DW_CFA_restore:
+                 if (frame_need_space (fc, opa) >= 0)
+                   fc->col_type[opa] = DW_CFA_undefined;
+                 break;
+               case DW_CFA_set_loc:
+                 start += encoded_ptr_size;
+                 break;
+               case DW_CFA_advance_loc1:
+                 start += 1;
+                 break;
+               case DW_CFA_advance_loc2:
+                 start += 2;
+                 break;
+               case DW_CFA_advance_loc4:
+                 start += 4;
+                 break;
+               case DW_CFA_offset_extended:
+               case DW_CFA_val_offset:
+                 READ_ULEB (reg);
+                 SKIP_ULEB ();
+                 if (frame_need_space (fc, reg) >= 0)
+                   fc->col_type[reg] = DW_CFA_undefined;
+                 break;
+               case DW_CFA_restore_extended:
+                 READ_ULEB (reg);
+                 if (frame_need_space (fc, reg) >= 0)
+                   fc->col_type[reg] = DW_CFA_undefined;
+                 break;
+               case DW_CFA_undefined:
+                 READ_ULEB (reg);
+                 if (frame_need_space (fc, reg) >= 0)
+                   fc->col_type[reg] = DW_CFA_undefined;
+                 break;
+               case DW_CFA_same_value:
+                 READ_ULEB (reg);
+                 if (frame_need_space (fc, reg) >= 0)
+                   fc->col_type[reg] = DW_CFA_undefined;
+                 break;
+               case DW_CFA_register:
+                 READ_ULEB (reg);
+                 SKIP_ULEB ();
+                 if (frame_need_space (fc, reg) >= 0)
+                   fc->col_type[reg] = DW_CFA_undefined;
+                 break;
+               case DW_CFA_def_cfa:
+                 SKIP_ULEB ();
+                 SKIP_ULEB ();
+                 break;
+               case DW_CFA_def_cfa_register:
+                 SKIP_ULEB ();
+                 break;
+               case DW_CFA_def_cfa_offset:
+                 SKIP_ULEB ();
+                 break;
+               case DW_CFA_def_cfa_expression:
+                 READ_ULEB (temp);
+                 new_start = start + temp;
+                 if (new_start < start)
+                   {
+                     warn (_("Corrupt CFA_def expression value: %lu\n"), temp);
+                     start = block_end;
+                   }
+                 else
+                   start = new_start;
+                 break;
+               case DW_CFA_expression:
+               case DW_CFA_val_expression:
+                 READ_ULEB (reg);
+                 READ_ULEB (temp);
+                 new_start = start + temp;
+                 if (new_start < start)
+                   {
+                     /* PR 17512: file:306-192417-0.005.  */
+                     warn (_("Corrupt CFA expression value: %lu\n"), temp);
+                     start = block_end;
+                   }
+                 else
+                   start = new_start;
+                 if (frame_need_space (fc, reg) >= 0)
+                   fc->col_type[reg] = DW_CFA_undefined;
+                 break;
+               case DW_CFA_offset_extended_sf:
+               case DW_CFA_val_offset_sf:
+                 READ_ULEB (reg);
+                 SKIP_SLEB ();
+                 if (frame_need_space (fc, reg) >= 0)
+                   fc->col_type[reg] = DW_CFA_undefined;
+                 break;
+               case DW_CFA_def_cfa_sf:
+                 SKIP_ULEB ();
+                 SKIP_SLEB ();
+                 break;
+               case DW_CFA_def_cfa_offset_sf:
+                 SKIP_SLEB ();
+                 break;
+               case DW_CFA_MIPS_advance_loc8:
+                 start += 8;
+                 break;
+               case DW_CFA_GNU_args_size:
+                 SKIP_ULEB ();
+                 break;
+               case DW_CFA_GNU_negative_offset_extended:
+                 READ_ULEB (reg);
+                 SKIP_ULEB ();
+                 if (frame_need_space (fc, reg) >= 0)
+                   fc->col_type[reg] = DW_CFA_undefined;
+                 break;
+               default:
+                 break;
+               }
+           }
+         start = tmp;
+       }
+
+      all_nops = TRUE;
+
+      /* Now we know what registers are used, make a second pass over
+        the chunk, this time actually printing out the info.  */
+
+      while (start < block_end)
+       {
+         unsigned char * tmp;
+         unsigned op, opa;
+         unsigned long ul, roffs;
+         /* Note: It is tempting to use an unsigned long for 'reg' but there
+            are various functions, notably frame_space_needed() that assume that
+            reg is an unsigned int.  */
+         unsigned int reg;
+         dwarf_signed_vma l;
+         dwarf_vma ofs;
+         dwarf_vma vma;
+         const char *reg_prefix = "";
+
+         op = *start++;
+         opa = op & 0x3f;
+         if (op & 0xc0)
+           op &= 0xc0;
+
+         /* Make a note if something other than DW_CFA_nop happens.  */
+         if (op != DW_CFA_nop)
+           all_nops = FALSE;
+
+         /* Warning: if you add any more cases to this switch, be
+            sure to add them to the corresponding switch above.  */
+         switch (op)
+           {
+           case DW_CFA_advance_loc:
+             if (do_debug_frames_interp)
+               frame_display_row (fc, &need_col_headers, &max_regs);
+             else
+               printf ("  DW_CFA_advance_loc: %d to %s\n",
+                       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;
+
+           case DW_CFA_offset:
+             READ_ULEB (roffs);
+             if (opa >= (unsigned int) fc->ncols)
+               reg_prefix = bad_reg;
+             if (! do_debug_frames_interp || *reg_prefix != '\0')
+               printf ("  DW_CFA_offset: %s%s at cfa%+ld\n",
+                       reg_prefix, regname (opa, 0),
+                       roffs * fc->data_factor);
+             if (*reg_prefix == '\0')
+               {
+                 fc->col_type[opa] = DW_CFA_offset;
+                 fc->col_offset[opa] = roffs * fc->data_factor;
+               }
+             break;
+
+           case DW_CFA_restore:
+             if (opa >= (unsigned int) fc->ncols)
+               reg_prefix = bad_reg;
+             if (! do_debug_frames_interp || *reg_prefix != '\0')
+               printf ("  DW_CFA_restore: %s%s\n",
+                       reg_prefix, regname (opa, 0));
+             if (*reg_prefix != '\0')
+               break;
+
+             if (opa >= (unsigned int) cie->ncols
+                 || (do_debug_frames_interp
+                     && cie->col_type[opa] == DW_CFA_unreferenced))
+               {
+                 fc->col_type[opa] = DW_CFA_undefined;
+                 fc->col_offset[opa] = 0;
+               }
+             else
+               {
+                 fc->col_type[opa] = cie->col_type[opa];
+                 fc->col_offset[opa] = cie->col_offset[opa];
+               }
+             break;
+
+           case DW_CFA_set_loc:
+             vma = get_encoded_value (&start, fc->fde_encoding, section, block_end);
+             if (do_debug_frames_interp)
+               frame_display_row (fc, &need_col_headers, &max_regs);
+             else
+               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:
+             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 %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:
+             SAFE_BYTE_GET_AND_INC (ofs, start, 2, block_end);
+             if (do_debug_frames_interp)
+               frame_display_row (fc, &need_col_headers, &max_regs);
+             else
+               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:
+             SAFE_BYTE_GET_AND_INC (ofs, start, 4, block_end);
+             if (do_debug_frames_interp)
+               frame_display_row (fc, &need_col_headers, &max_regs);
+             else
+               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;
+
+           case DW_CFA_offset_extended:
+             READ_ULEB (reg);
+             READ_ULEB (roffs);
+             if (reg >= (unsigned int) fc->ncols)
+               reg_prefix = bad_reg;
+             if (! do_debug_frames_interp || *reg_prefix != '\0')
+               printf ("  DW_CFA_offset_extended: %s%s at cfa%+ld\n",
+                       reg_prefix, regname (reg, 0),
+                       roffs * fc->data_factor);
+             if (*reg_prefix == '\0')
+               {
+                 fc->col_type[reg] = DW_CFA_offset;
+                 fc->col_offset[reg] = roffs * fc->data_factor;
+               }
+             break;
+
+           case DW_CFA_val_offset:
+             READ_ULEB (reg);
+             READ_ULEB (roffs);
+             if (reg >= (unsigned int) fc->ncols)
+               reg_prefix = bad_reg;
+             if (! do_debug_frames_interp || *reg_prefix != '\0')
+               printf ("  DW_CFA_val_offset: %s%s is cfa%+ld\n",
+                       reg_prefix, regname (reg, 0),
+                       roffs * fc->data_factor);
+             if (*reg_prefix == '\0')
+               {
+                 fc->col_type[reg] = DW_CFA_val_offset;
+                 fc->col_offset[reg] = roffs * fc->data_factor;
+               }
+             break;
+
+           case DW_CFA_restore_extended:
+             READ_ULEB (reg);
+             if (reg >= (unsigned int) fc->ncols)
+               reg_prefix = bad_reg;
+             if (! do_debug_frames_interp || *reg_prefix != '\0')
+               printf ("  DW_CFA_restore_extended: %s%s\n",
+                       reg_prefix, regname (reg, 0));
+             if (*reg_prefix != '\0')
+               break;
+
+             if (reg >= (unsigned int) cie->ncols)
+               {
+                 fc->col_type[reg] = DW_CFA_undefined;
+                 fc->col_offset[reg] = 0;
+               }
+             else
+               {
+                 fc->col_type[reg] = cie->col_type[reg];
+                 fc->col_offset[reg] = cie->col_offset[reg];
+               }
+             break;
+
+           case DW_CFA_undefined:
+             READ_ULEB (reg);
+             if (reg >= (unsigned int) fc->ncols)
+               reg_prefix = bad_reg;
+             if (! do_debug_frames_interp || *reg_prefix != '\0')
+               printf ("  DW_CFA_undefined: %s%s\n",
+                       reg_prefix, regname (reg, 0));
+             if (*reg_prefix == '\0')
+               {
+                 fc->col_type[reg] = DW_CFA_undefined;
+                 fc->col_offset[reg] = 0;
+               }
+             break;
+
+           case DW_CFA_same_value:
+             READ_ULEB (reg);
+             if (reg >= (unsigned int) fc->ncols)
+               reg_prefix = bad_reg;
+             if (! do_debug_frames_interp || *reg_prefix != '\0')
+               printf ("  DW_CFA_same_value: %s%s\n",
+                       reg_prefix, regname (reg, 0));
+             if (*reg_prefix == '\0')
+               {
+                 fc->col_type[reg] = DW_CFA_same_value;
+                 fc->col_offset[reg] = 0;
+               }
+             break;
+
+           case DW_CFA_register:
+             READ_ULEB (reg);
+             READ_ULEB (roffs);
+             if (reg >= (unsigned int) fc->ncols)
+               reg_prefix = bad_reg;
+             if (! do_debug_frames_interp || *reg_prefix != '\0')
+               {
+                 printf ("  DW_CFA_register: %s%s in ",
+                         reg_prefix, regname (reg, 0));
+                 puts (regname (roffs, 0));
+               }
+             if (*reg_prefix == '\0')
+               {
+                 fc->col_type[reg] = DW_CFA_register;
+                 fc->col_offset[reg] = roffs;
+               }
+             break;
+
+           case DW_CFA_remember_state:
+             if (! do_debug_frames_interp)
+               printf ("  DW_CFA_remember_state\n");
+             rs = (Frame_Chunk *) xmalloc (sizeof (Frame_Chunk));
+             rs->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 (* 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;
+
+           case DW_CFA_restore_state:
+             if (! do_debug_frames_interp)
+               printf ("  DW_CFA_restore_state\n");
+             rs = remembered_state;
+             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;
+                 if (frame_need_space (fc, rs->ncols - 1) < 0)
+                   {
+                     warn (_("Invalid column number in saved frame state\n"));
+                     fc->ncols = 0;
+                     break;
+                   }
+                 memcpy (fc->col_type, rs->col_type, rs->ncols * sizeof (* rs->col_type));
+                 memcpy (fc->col_offset, rs->col_offset,
+                         rs->ncols * sizeof (* rs->col_offset));
+                 free (rs->col_type);
+                 free (rs->col_offset);
+                 free (rs);
+               }
+             else if (do_debug_frames_interp)
+               printf ("Mismatched DW_CFA_restore_state\n");
+             break;
+
+           case DW_CFA_def_cfa:
+             READ_ULEB (fc->cfa_reg);
+             READ_ULEB (fc->cfa_offset);
+             fc->cfa_exp = 0;
+             if (! do_debug_frames_interp)
+               printf ("  DW_CFA_def_cfa: %s ofs %d\n",
+                       regname (fc->cfa_reg, 0), (int) fc->cfa_offset);
+             break;
+
+           case DW_CFA_def_cfa_register:
+             READ_ULEB (fc->cfa_reg);
+             fc->cfa_exp = 0;
+             if (! do_debug_frames_interp)
+               printf ("  DW_CFA_def_cfa_register: %s\n",
+                       regname (fc->cfa_reg, 0));
+             break;
+
+           case DW_CFA_def_cfa_offset:
+             READ_ULEB (fc->cfa_offset);
+             if (! do_debug_frames_interp)
+               printf ("  DW_CFA_def_cfa_offset: %d\n", (int) fc->cfa_offset);
+             break;
+
+           case DW_CFA_nop:
+             if (! do_debug_frames_interp)
+               printf ("  DW_CFA_nop\n");
+             break;
+
+           case DW_CFA_def_cfa_expression:
+             READ_ULEB (ul);
+             if (start >= block_end || ul > (unsigned long) (block_end - start))
+               {
+                 printf (_("  DW_CFA_def_cfa_expression: <corrupt len %lu>\n"), ul);
+                 break;
+               }
+             if (! do_debug_frames_interp)
+               {
+                 printf ("  DW_CFA_def_cfa_expression (");
+                 decode_location_expression (start, eh_addr_size, 0, -1,
+                                             ul, 0, section);
+                 printf (")\n");
+               }
+             fc->cfa_exp = 1;
+             start += ul;
+             break;
+
+           case DW_CFA_expression:
+             READ_ULEB (reg);
+             READ_ULEB (ul);
+             if (reg >= (unsigned int) fc->ncols)
+               reg_prefix = bad_reg;
+             /* PR 17512: file: 069-133014-0.006.  */
+             /* PR 17512: file: 98c02eb4.  */
+             tmp = start + ul;
+             if (start >= block_end || tmp > block_end || tmp < start)
+               {
+                 printf (_("  DW_CFA_expression: <corrupt len %lu>\n"), ul);
+                 break;
+               }
+             if (! do_debug_frames_interp || *reg_prefix != '\0')
+               {
+                 printf ("  DW_CFA_expression: %s%s (",
+                         reg_prefix, regname (reg, 0));
+                 decode_location_expression (start, eh_addr_size, 0, -1,
+                                             ul, 0, section);
+                 printf (")\n");
+               }
+             if (*reg_prefix == '\0')
+               fc->col_type[reg] = DW_CFA_expression;
+             start = tmp;
+             break;
+
+           case DW_CFA_val_expression:
+             READ_ULEB (reg);
+             READ_ULEB (ul);
+             if (reg >= (unsigned int) fc->ncols)
+               reg_prefix = bad_reg;
+             tmp = start + ul;
+             if (start >= block_end || tmp > block_end || tmp < start)
+               {
+                 printf ("  DW_CFA_val_expression: <corrupt len %lu>\n", ul);
+                 break;
+               }
+             if (! do_debug_frames_interp || *reg_prefix != '\0')
+               {
+                 printf ("  DW_CFA_val_expression: %s%s (",
+                         reg_prefix, regname (reg, 0));
+                 decode_location_expression (start, eh_addr_size, 0, -1,
+                                             ul, 0, section);
+                 printf (")\n");
+               }
+             if (*reg_prefix == '\0')
+               fc->col_type[reg] = DW_CFA_val_expression;
+             start = tmp;
+             break;
+
+           case DW_CFA_offset_extended_sf:
+             READ_ULEB (reg);
+             READ_SLEB (l);
+             if (frame_need_space (fc, reg) < 0)
+               reg_prefix = bad_reg;
+             if (! do_debug_frames_interp || *reg_prefix != '\0')
+               printf ("  DW_CFA_offset_extended_sf: %s%s at cfa%+ld\n",
+                       reg_prefix, regname (reg, 0),
+                       (long)(l * fc->data_factor));
+             if (*reg_prefix == '\0')
+               {
+                 fc->col_type[reg] = DW_CFA_offset;
+                 fc->col_offset[reg] = l * fc->data_factor;
+               }
+             break;
+
+           case DW_CFA_val_offset_sf:
+             READ_ULEB (reg);
+             READ_SLEB (l);
+             if (frame_need_space (fc, reg) < 0)
+               reg_prefix = bad_reg;
+             if (! do_debug_frames_interp || *reg_prefix != '\0')
+               printf ("  DW_CFA_val_offset_sf: %s%s is cfa%+ld\n",
+                       reg_prefix, regname (reg, 0),
+                       (long)(l * fc->data_factor));
+             if (*reg_prefix == '\0')
+               {
+                 fc->col_type[reg] = DW_CFA_val_offset;
+                 fc->col_offset[reg] = l * fc->data_factor;
+               }
+             break;
+
+           case DW_CFA_def_cfa_sf:
+             READ_ULEB (fc->cfa_reg);
+             READ_ULEB (fc->cfa_offset);
+             fc->cfa_offset = fc->cfa_offset * fc->data_factor;
+             fc->cfa_exp = 0;
+             if (! do_debug_frames_interp)
+               printf ("  DW_CFA_def_cfa_sf: %s ofs %d\n",
+                       regname (fc->cfa_reg, 0), (int) fc->cfa_offset);
+             break;
+
+           case DW_CFA_def_cfa_offset_sf:
+             READ_ULEB (fc->cfa_offset);
+             fc->cfa_offset *= fc->data_factor;
+             if (! do_debug_frames_interp)
+               printf ("  DW_CFA_def_cfa_offset_sf: %d\n", (int) fc->cfa_offset);
+             break;
+
+           case DW_CFA_MIPS_advance_loc8:
+             SAFE_BYTE_GET_AND_INC (ofs, start, 8, block_end);
+             if (do_debug_frames_interp)
+               frame_display_row (fc, &need_col_headers, &max_regs);
+             else
+               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;
+
+           case DW_CFA_GNU_window_save:
+             if (! do_debug_frames_interp)
+               printf ("  DW_CFA_GNU_window_save\n");
+             break;
+
+           case DW_CFA_GNU_args_size:
+             READ_ULEB (ul);
+             if (! do_debug_frames_interp)
+               printf ("  DW_CFA_GNU_args_size: %ld\n", ul);
+             break;
+
+           case DW_CFA_GNU_negative_offset_extended:
+             READ_ULEB (reg);
+             READ_SLEB (l);
+             l = - l;
+             if (frame_need_space (fc, reg) < 0)
+               reg_prefix = bad_reg;
+             if (! do_debug_frames_interp || *reg_prefix != '\0')
+               printf ("  DW_CFA_GNU_negative_offset_extended: %s%s at cfa%+ld\n",
+                       reg_prefix, regname (reg, 0),
+                       (long)(l * fc->data_factor));
+             if (*reg_prefix == '\0')
+               {
+                 fc->col_type[reg] = DW_CFA_offset;
+                 fc->col_offset[reg] = l * fc->data_factor;
+               }
+             break;
+
+           default:
+             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);
+             start = block_end;
+           }
+       }
+
+      /* Interpret the CFA - as long as it is not completely full of NOPs.  */
+      if (do_debug_frames_interp && ! all_nops)
+       frame_display_row (fc, &need_col_headers, &max_regs);
+
+      start = block_end;
+      eh_addr_size = saved_eh_addr_size;
+    }
+
+  printf ("\n");
+
+  while (remembered_state != NULL)
+    {
+      rs = remembered_state;
+      remembered_state = rs->next;
+      free (rs->col_type);
+      free (rs->col_offset);
+      rs->next = NULL; /* Paranoia.  */
+      free (rs);
+    }
+
+  while (chunks != NULL)
+    {
+      rs = chunks;
+      chunks = rs->next;
+      free (rs->col_type);
+      free (rs->col_offset);
+      rs->next = NULL; /* Paranoia.  */
+      free (rs);
+    }
+
+  while (forward_refs != NULL)
+    {
+      rs = forward_refs;
+      forward_refs = rs->next;
+      free (rs->col_type);
+      free (rs->col_offset);
+      rs->next = NULL; /* Paranoia.  */
+      free (rs);
+    }
+
+  return 1;
+}
+
+#undef GET
+
+static int
+display_debug_names (struct dwarf_section *section, void *file)
+{
+  unsigned char *hdrptr = section->start;
+  dwarf_vma unit_length;
+  unsigned char *unit_start;
+  const unsigned char *const section_end = section->start + section->size;
+  unsigned char *unit_end;
+
+  introduce (section, FALSE);
+
+  load_debug_section_with_follow (str, file);
+
+  for (; hdrptr < section_end; hdrptr = unit_end)
+    {
+      unsigned int offset_size;
+      uint16_t dwarf_version, padding;
+      uint32_t comp_unit_count, local_type_unit_count, foreign_type_unit_count;
+      uint32_t bucket_count, name_count, abbrev_table_size;
+      uint32_t augmentation_string_size;
+      unsigned int i;
+      unsigned long sec_off;
+      bfd_boolean augmentation_printable;
+      const char *augmentation_string;
+
+      unit_start = hdrptr;
+
+      /* Get and check the length of the block.  */
+      SAFE_BYTE_GET_AND_INC (unit_length, hdrptr, 4, section_end);
+
+      if (unit_length == 0xffffffff)
        {
-         unsigned op, opa;
-         unsigned long ul, reg, roffs;
-         long l, ofs;
-         dwarf_vma vma;
-         const char *reg_prefix = "";
+         /* This section is 64-bit DWARF.  */
+         SAFE_BYTE_GET_AND_INC (unit_length, hdrptr, 8, section_end);
+         offset_size = 8;
+       }
+      else
+       offset_size = 4;
+      unit_end = hdrptr + unit_length;
 
-         op = *start++;
-         opa = op & 0x3f;
-         if (op & 0xc0)
-           op &= 0xc0;
+      sec_off = hdrptr - section->start;
+      if (sec_off + unit_length < sec_off
+         || sec_off + unit_length > section->size)
+       {
+         warn (_("Debug info is corrupted, %s header at %#lx has length %s\n"),
+               section->name,
+               (unsigned long) (unit_start - section->start),
+               dwarf_vmatoa ("x", unit_length));
+         return 0;
+       }
 
-         /* Warning: if you add any more cases to this switch, be
-            sure to add them to the corresponding switch above.  */
-         switch (op)
+      /* Get and check the version number.  */
+      SAFE_BYTE_GET_AND_INC (dwarf_version, hdrptr, 2, unit_end);
+      printf (_("Version %ld\n"), (long) dwarf_version);
+
+      /* Prior versions did not exist, and future versions may not be
+        backwards compatible.  */
+      if (dwarf_version != 5)
+       {
+         warn (_("Only DWARF version 5 .debug_names "
+                 "is currently supported.\n"));
+         return 0;
+       }
+
+      SAFE_BYTE_GET_AND_INC (padding, hdrptr, 2, unit_end);
+      if (padding != 0)
+       warn (_("Padding field of .debug_names must be 0 (found 0x%x)\n"),
+             padding);
+
+      SAFE_BYTE_GET_AND_INC (comp_unit_count, hdrptr, 4, unit_end);
+      if (comp_unit_count == 0)
+       warn (_("Compilation unit count must be >= 1 in .debug_names\n"));
+
+      SAFE_BYTE_GET_AND_INC (local_type_unit_count, hdrptr, 4, unit_end);
+      SAFE_BYTE_GET_AND_INC (foreign_type_unit_count, hdrptr, 4, unit_end);
+      SAFE_BYTE_GET_AND_INC (bucket_count, hdrptr, 4, unit_end);
+      SAFE_BYTE_GET_AND_INC (name_count, hdrptr, 4, unit_end);
+      SAFE_BYTE_GET_AND_INC (abbrev_table_size, hdrptr, 4, unit_end);
+
+      SAFE_BYTE_GET_AND_INC (augmentation_string_size, hdrptr, 4, unit_end);
+      if (augmentation_string_size % 4 != 0)
+       {
+         warn (_("Augmentation string length %u must be rounded up "
+                 "to a multiple of 4 in .debug_names.\n"),
+               augmentation_string_size);
+         augmentation_string_size += (-augmentation_string_size) & 3;
+       }
+
+      printf (_("Augmentation string:"));
+
+      augmentation_printable = TRUE;
+      augmentation_string = (const char *) hdrptr;
+
+      for (i = 0; i < augmentation_string_size; i++)
+       {
+         unsigned char uc;
+
+         SAFE_BYTE_GET_AND_INC (uc, hdrptr, 1, unit_end);
+         printf (" %02x", uc);
+
+         if (uc != 0 && !ISPRINT (uc))
+           augmentation_printable = FALSE;
+       }
+
+      if (augmentation_printable)
+       {
+         printf ("  (\"");
+         for (i = 0;
+              i < augmentation_string_size && augmentation_string[i];
+              ++i)
+           putchar (augmentation_string[i]);
+         printf ("\")");
+       }
+      putchar ('\n');
+
+      printf (_("CU table:\n"));
+      for (i = 0; i < comp_unit_count; i++)
+       {
+         uint64_t cu_offset;
+
+         SAFE_BYTE_GET_AND_INC (cu_offset, hdrptr, offset_size, unit_end);
+         printf (_("[%3u] 0x%lx\n"), i, (unsigned long) cu_offset);
+       }
+      putchar ('\n');
+
+      printf (_("TU table:\n"));
+      for (i = 0; i < local_type_unit_count; i++)
+       {
+         uint64_t tu_offset;
+
+         SAFE_BYTE_GET_AND_INC (tu_offset, hdrptr, offset_size, unit_end);
+         printf (_("[%3u] 0x%lx\n"), i, (unsigned long) tu_offset);
+       }
+      putchar ('\n');
+
+      printf (_("Foreign TU table:\n"));
+      for (i = 0; i < foreign_type_unit_count; i++)
+       {
+         uint64_t signature;
+
+         SAFE_BYTE_GET_AND_INC (signature, hdrptr, 8, unit_end);
+         printf (_("[%3u] "), i);
+         print_dwarf_vma (signature, 8);
+         putchar ('\n');
+       }
+      putchar ('\n');
+
+      const uint32_t *const hash_table_buckets = (uint32_t *) hdrptr;
+      hdrptr += bucket_count * sizeof (uint32_t);
+      const uint32_t *const hash_table_hashes = (uint32_t *) hdrptr;
+      hdrptr += name_count * sizeof (uint32_t);
+      unsigned char *const name_table_string_offsets = hdrptr;
+      hdrptr += name_count * offset_size;
+      unsigned char *const name_table_entry_offsets = hdrptr;
+      hdrptr += name_count * offset_size;
+      unsigned char *const abbrev_table = hdrptr;
+      hdrptr += abbrev_table_size;
+      const unsigned char *const abbrev_table_end = hdrptr;
+      unsigned char *const entry_pool = hdrptr;
+      if (hdrptr > unit_end)
+       {
+         warn (_("Entry pool offset (0x%lx) exceeds unit size 0x%lx "
+                 "for unit 0x%lx in the debug_names\n"),
+               (long) (hdrptr - section->start),
+               (long) (unit_end - section->start),
+               (long) (unit_start - section->start));
+         return 0;
+       }
+
+      size_t buckets_filled = 0;
+      size_t bucketi;
+      for (bucketi = 0; bucketi < bucket_count; bucketi++)
+       {
+         const uint32_t bucket = hash_table_buckets[bucketi];
+
+         if (bucket != 0)
+           ++buckets_filled;
+       }
+      printf (ngettext ("Used %zu of %lu bucket.\n",
+                       "Used %zu of %lu buckets.\n",
+                       bucket_count),
+             buckets_filled, (unsigned long) bucket_count);
+
+      uint32_t hash_prev = 0;
+      size_t hash_clash_count = 0;
+      size_t longest_clash = 0;
+      size_t this_length = 0;
+      size_t hashi;
+      for (hashi = 0; hashi < name_count; hashi++)
+       {
+         const uint32_t hash_this = hash_table_hashes[hashi];
+
+         if (hashi > 0)
            {
-           case DW_CFA_advance_loc:
-             if (do_debug_frames_interp)
-               frame_display_row (fc, &need_col_headers, &max_regs);
+             if (hash_prev % bucket_count == hash_this % bucket_count)
+               {
+                 ++hash_clash_count;
+                 ++this_length;
+                 longest_clash = MAX (longest_clash, this_length);
+               }
              else
-               printf ("  DW_CFA_advance_loc: %d to %08lx\n",
-                       opa * fc->code_factor,
-                       fc->pc_begin + opa * fc->code_factor);
-             fc->pc_begin += opa * fc->code_factor;
-             break;
+               this_length = 0;
+           }
+         hash_prev = hash_this;
+       }
+      printf (_("Out of %lu items there are %zu bucket clashes"
+               " (longest of %zu entries).\n"),
+             (unsigned long) name_count, hash_clash_count, longest_clash);
+      assert (name_count == buckets_filled + hash_clash_count);
 
-           case DW_CFA_offset:
-             roffs = LEB ();
-             if (opa >= (unsigned int) fc->ncols)
-               reg_prefix = bad_reg;
-             if (! do_debug_frames_interp || *reg_prefix != '\0')
-               printf ("  DW_CFA_offset: %s%s at cfa%+ld\n",
-                       reg_prefix, regname (opa, 0),
-                       roffs * fc->data_factor);
-             if (*reg_prefix == '\0')
+      struct abbrev_lookup_entry
+      {
+       dwarf_vma abbrev_tag;
+       unsigned char *abbrev_lookup_ptr;
+      };
+      struct abbrev_lookup_entry *abbrev_lookup = NULL;
+      size_t abbrev_lookup_used = 0;
+      size_t abbrev_lookup_allocated = 0;
+
+      unsigned char *abbrevptr = abbrev_table;
+      for (;;)
+       {
+         unsigned int bytes_read;
+         const dwarf_vma abbrev_tag = read_uleb128 (abbrevptr, &bytes_read,
+                                                    abbrev_table_end);
+         abbrevptr += bytes_read;
+         if (abbrev_tag == 0)
+           break;
+         if (abbrev_lookup_used == abbrev_lookup_allocated)
+           {
+             abbrev_lookup_allocated = MAX (0x100,
+                                            abbrev_lookup_allocated * 2);
+             abbrev_lookup = xrealloc (abbrev_lookup,
+                                       (abbrev_lookup_allocated
+                                        * sizeof (*abbrev_lookup)));
+           }
+         assert (abbrev_lookup_used < abbrev_lookup_allocated);
+         struct abbrev_lookup_entry *entry;
+         for (entry = abbrev_lookup;
+              entry < abbrev_lookup + abbrev_lookup_used;
+              entry++)
+           if (entry->abbrev_tag == abbrev_tag)
+             {
+               warn (_("Duplicate abbreviation tag %lu "
+                       "in unit 0x%lx in the debug_names\n"),
+                     (long) abbrev_tag, (long) (unit_start - section->start));
+               break;
+             }
+         entry = &abbrev_lookup[abbrev_lookup_used++];
+         entry->abbrev_tag = abbrev_tag;
+         entry->abbrev_lookup_ptr = abbrevptr;
+
+         /* Skip DWARF tag.  */
+         read_uleb128 (abbrevptr, &bytes_read, abbrev_table_end);
+         abbrevptr += bytes_read;
+         for (;;)
+           {
+             const dwarf_vma xindex = read_uleb128 (abbrevptr,
+                                                    &bytes_read,
+                                                    abbrev_table_end);
+             abbrevptr += bytes_read;
+             const dwarf_vma form = read_uleb128 (abbrevptr, &bytes_read,
+                                                  abbrev_table_end);
+             abbrevptr += bytes_read;
+             if (xindex == 0 && form == 0)
+               break;
+           }
+       }
+
+      printf (_("\nSymbol table:\n"));
+      uint32_t namei;
+      for (namei = 0; namei < name_count; ++namei)
+       {
+         uint64_t string_offset, entry_offset;
+
+         SAFE_BYTE_GET (string_offset,
+                        name_table_string_offsets + namei * offset_size,
+                        offset_size, unit_end);
+         SAFE_BYTE_GET (entry_offset,
+                        name_table_entry_offsets + namei * offset_size,
+                        offset_size, unit_end);
+
+         printf ("[%3u] #%08x %s:", namei, hash_table_hashes[namei],
+                 fetch_indirect_string (string_offset));
+
+         unsigned char *entryptr = entry_pool + entry_offset;
+
+         // We need to scan first whether there is a single or multiple
+         // entries.  TAGNO is -2 for the first entry, it is -1 for the
+         // initial tag read of the second entry, then it becomes 0 for the
+         // first entry for real printing etc.
+         int tagno = -2;
+         /* Initialize it due to a false compiler warning.  */
+         dwarf_vma second_abbrev_tag = -1;
+         for (;;)
+           {
+             unsigned int bytes_read;
+             const dwarf_vma abbrev_tag = read_uleb128 (entryptr, &bytes_read,
+                                                        unit_end);
+             entryptr += bytes_read;
+             if (tagno == -1)
                {
-                 fc->col_type[opa] = DW_CFA_offset;
-                 fc->col_offset[opa] = roffs * fc->data_factor;
+                 second_abbrev_tag = abbrev_tag;
+                 tagno = 0;
+                 entryptr = entry_pool + entry_offset;
+                 continue;
                }
-             break;
-
-           case DW_CFA_restore:
-             if (opa >= (unsigned int) cie->ncols
-                 || opa >= (unsigned int) fc->ncols)
-               reg_prefix = bad_reg;
-             if (! do_debug_frames_interp || *reg_prefix != '\0')
-               printf ("  DW_CFA_restore: %s%s\n",
-                       reg_prefix, regname (opa, 0));
-             if (*reg_prefix == '\0')
+             if (abbrev_tag == 0)
+               break;
+             if (tagno >= 0)
+               printf ("%s<%lu>",
+                       (tagno == 0 && second_abbrev_tag == 0 ? " " : "\n\t"),
+                       (unsigned long) abbrev_tag);
+
+             const struct abbrev_lookup_entry *entry;
+             for (entry = abbrev_lookup;
+                  entry < abbrev_lookup + abbrev_lookup_used;
+                  entry++)
+               if (entry->abbrev_tag == abbrev_tag)
+                 break;
+             if (entry >= abbrev_lookup + abbrev_lookup_used)
                {
-                 fc->col_type[opa] = cie->col_type[opa];
-                 fc->col_offset[opa] = cie->col_offset[opa];
+                 warn (_("Undefined abbreviation tag %lu "
+                         "in unit 0x%lx in the debug_names\n"),
+                       (long) abbrev_tag,
+                       (long) (unit_start - section->start));
+                 break;
                }
-             break;
+             abbrevptr = entry->abbrev_lookup_ptr;
+             const dwarf_vma dwarf_tag = read_uleb128 (abbrevptr, &bytes_read,
+                                                       abbrev_table_end);
+             abbrevptr += bytes_read;
+             if (tagno >= 0)
+               printf (" %s", get_TAG_name (dwarf_tag));
+             for (;;)
+               {
+                 const dwarf_vma xindex = read_uleb128 (abbrevptr,
+                                                        &bytes_read,
+                                                        abbrev_table_end);
+                 abbrevptr += bytes_read;
+                 const dwarf_vma form = read_uleb128 (abbrevptr, &bytes_read,
+                                                      abbrev_table_end);
+                 abbrevptr += bytes_read;
+                 if (xindex == 0 && form == 0)
+                   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;
-             if (do_debug_frames_interp)
-               frame_display_row (fc, &need_col_headers, &max_regs);
-             else
-               printf ("  DW_CFA_set_loc: %08lx\n", (unsigned long)vma);
-             fc->pc_begin = vma;
-             break;
+                 if (tagno >= 0)
+                   printf (" %s", get_IDX_name (xindex));
+                 entryptr = read_and_display_attr_value (0, form, 0, entryptr,
+                                                         unit_end, 0, 0,
+                                                         offset_size,
+                                                         dwarf_version, NULL,
+                                                         (tagno < 0), NULL,
+                                                         NULL, '=');
+               }
+             ++tagno;
+           }
+         if (tagno <= 0)
+           printf (_(" <no entries>"));
+         putchar ('\n');
+       }
 
-           case DW_CFA_advance_loc1:
-             ofs = byte_get (start, 1); start += 1;
-             if (do_debug_frames_interp)
-               frame_display_row (fc, &need_col_headers, &max_regs);
-             else
-               printf ("  DW_CFA_advance_loc1: %ld to %08lx\n",
-                       ofs * fc->code_factor,
-                       fc->pc_begin + ofs * fc->code_factor);
-             fc->pc_begin += ofs * fc->code_factor;
-             break;
+      free (abbrev_lookup);
+    }
 
-           case DW_CFA_advance_loc2:
-             ofs = byte_get (start, 2); start += 2;
-             if (do_debug_frames_interp)
-               frame_display_row (fc, &need_col_headers, &max_regs);
-             else
-               printf ("  DW_CFA_advance_loc2: %ld to %08lx\n",
-                       ofs * fc->code_factor,
-                       fc->pc_begin + ofs * fc->code_factor);
-             fc->pc_begin += ofs * fc->code_factor;
-             break;
+  return 1;
+}
 
-           case DW_CFA_advance_loc4:
-             ofs = byte_get (start, 4); start += 4;
-             if (do_debug_frames_interp)
-               frame_display_row (fc, &need_col_headers, &max_regs);
+static int
+display_debug_links (struct dwarf_section *  section,
+                    void *                  file ATTRIBUTE_UNUSED)
+{
+  const unsigned char * filename;
+  unsigned int          filelen;
+
+  introduce (section, FALSE);
+
+  /* The .gnu_debuglink section is formatted as:
+      (c-string)  Filename.
+      (padding)   If needed to reach a 4 byte boundary.
+      (uint32_t)  CRC32 value.
+
+    The .gun_debugaltlink section is formatted as:
+      (c-string)  Filename.
+      (binary)    Build-ID.  */
+  
+  filename =  section->start;
+  filelen = strnlen ((const char *) filename, section->size);
+  if (filelen == section->size)
+    {
+      warn (_("The debuglink filename is corrupt/missing\n"));
+      return 0;
+    }
+
+  printf (_("  Separate debug info file: %s\n"), filename);
+
+  if (const_strneq (section->name, ".gnu_debuglink"))
+    {
+      unsigned int          crc32;
+      unsigned int          crc_offset;
+
+      crc_offset = filelen + 1;
+      crc_offset = (crc_offset + 3) & ~3;
+      if (crc_offset + 4 > section->size)
+       {
+         warn (_("CRC offset missing/truncated\n"));
+         return 0;
+       }
+
+      crc32 = byte_get (filename + crc_offset, 4);
+
+      printf (_("  CRC value: %#x\n"), crc32);
+
+      if (crc_offset + 4 < section->size)
+       {
+         warn (_("There are %#lx extraneous bytes at the end of the section\n"),
+               (long)(section->size - (crc_offset + 4)));
+         return 0;
+       }
+    }
+  else /* const_strneq (section->name, ".gnu_debugaltlink") */
+    {
+      const unsigned char * build_id = section->start + filelen + 1;
+      bfd_size_type         build_id_len = section->size - (filelen + 1);
+      bfd_size_type         printed;
+
+      /* FIXME: Should we support smaller build-id notes ?  */
+      if (build_id_len < 0x14)
+       {
+         warn (_("Build-ID is too short (%#lx bytes)\n"), (long) build_id_len);
+         return 0;
+       }
+
+      printed = printf (_("  Build-ID (%#lx bytes):"), (long) build_id_len);
+      display_data (printed, build_id, build_id_len);
+      putchar ('\n');
+    }
+
+  putchar ('\n');
+  return 1;
+}
+
+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.  */
+
+  introduce (section, FALSE);
+
+  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;
+    }
+
+  /* PR 17531: file: 418d0a8a.  */
+  if (tu_list_offset < cu_list_offset)
+    {
+      warn (_("TU offset (%x) is less than CU offset (%x)\n"),
+           tu_list_offset, cu_list_offset);
+      return 0;
+    }
+
+  cu_list_elements = (tu_list_offset - cu_list_offset) / 8;
+
+  if (address_table_offset < tu_list_offset)
+    {
+      warn (_("Address table offset (%x) is less than TU offset (%x)\n"),
+           address_table_offset, tu_list_offset);
+      return 0;
+    }
+
+  tu_list_elements = (address_table_offset - tu_list_offset) / 8;
+
+  /* PR 17531: file: 18a47d3d.  */
+  if (symbol_table_offset < address_table_offset)
+    {
+      warn (_("Symbol table offset (%x) is less then Address table offset (%x)\n"),
+           symbol_table_offset, address_table_offset);
+      return 0;
+    }
+
+  address_table_size = symbol_table_offset - address_table_offset;
+
+  if (constant_pool_offset < symbol_table_offset)
+    {
+      warn (_("Constant pool offset (%x) is less than symbol table offset (%x)\n"),
+           constant_pool_offset, symbol_table_offset);
+      return 0;
+    }
+
+  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;
+
+  if (address_table + address_table_size > section->start + section->size)
+    {
+      warn (_("Address table extends beyond end of section.\n"));
+      return 0;
+    }
+
+  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 <= address_table_size - (2 * 8 + 4);
+       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;
+         unsigned char * adr;
+
+         adr = constant_pool + name_offset;
+         /* PR 17531: file: 5b7b07ad.  */
+         if (adr < constant_pool || adr >= section->start + section->size)
+           {
+             printf (_("[%3u] <corrupt offset: %x>"), i, name_offset);
+             warn (_("Corrupt name offset of 0x%x found for symbol table slot %d\n"),
+                   name_offset, i);
+           }
+         else
+           printf ("[%3u] %.*s:", i,
+                   (int) (section->size - (constant_pool_offset + name_offset)),
+                   constant_pool + name_offset);
+
+         adr = constant_pool + cu_vector_offset;
+         if (adr < constant_pool || adr >= section->start + section->size - 3)
+           {
+             printf (_("<invalid CU vector offset: %x>\n"), cu_vector_offset);
+             warn (_("Corrupt CU vector offset of 0x%x found for symbol table slot %d\n"),
+                   cu_vector_offset, i);
+             continue;
+           }
+
+         num_cus = byte_get_little_endian (adr, 4);
+
+         adr = constant_pool + cu_vector_offset + 4 + num_cus * 4;
+         if (num_cus * 4 < num_cus
+             || adr >= section->start + section->size
+             || adr < constant_pool)
+           {
+             printf ("<invalid number of CUs: %d>\n", num_cus);
+             warn (_("Invalid number of CUs (0x%x) for symbol table slot %d\n"),
+                   num_cus, i);
+             continue;
+           }
+
+         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 ("  DW_CFA_advance_loc4: %ld to %08lx\n",
-                       ofs * fc->code_factor,
-                       fc->pc_begin + ofs * fc->code_factor);
-             fc->pc_begin += ofs * fc->code_factor;
-             break;
+               printf ("%c%lu", num_cus > 1 ? '\t' : ' ', (unsigned long) cu);
 
-           case DW_CFA_offset_extended:
-             reg = LEB ();
-             roffs = LEB ();
-             if (reg >= (unsigned int) fc->ncols)
-               reg_prefix = bad_reg;
-             if (! do_debug_frames_interp || *reg_prefix != '\0')
-               printf ("  DW_CFA_offset_extended: %s%s at cfa%+ld\n",
-                       reg_prefix, regname (reg, 0),
-                       roffs * fc->data_factor);
-             if (*reg_prefix == '\0')
-               {
-                 fc->col_type[reg] = DW_CFA_offset;
-                 fc->col_offset[reg] = roffs * fc->data_factor;
-               }
-             break;
+             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];
 
-           case DW_CFA_val_offset:
-             reg = LEB ();
-             roffs = LEB ();
-             if (reg >= (unsigned int) fc->ncols)
-               reg_prefix = bad_reg;
-             if (! do_debug_frames_interp || *reg_prefix != '\0')
-               printf ("  DW_CFA_val_offset: %s%s at cfa%+ld\n",
-                       reg_prefix, regname (reg, 0),
-                       roffs * fc->data_factor);
-             if (*reg_prefix == '\0')
-               {
-                 fc->col_type[reg] = DW_CFA_val_offset;
-                 fc->col_offset[reg] = roffs * fc->data_factor;
-               }
-             break;
+  /* PR 17512: file: 002-168123-0.004.  */
+  if (phdr == NULL)
+    {
+      warn (_("Section %s is empty\n"), section->name);
+      return 0;
+    }
+  /* PR 17512: file: 002-376-0.004.  */
+  if (section->size < 24)
+    {
+      warn (_("Section %s is too small to contain a CU/TU header\n"),
+           section->name);
+      return 0;
+    }
 
-           case DW_CFA_restore_extended:
-             reg = LEB ();
-             if (reg >= (unsigned int) cie->ncols
-                 || reg >= (unsigned int) fc->ncols)
-               reg_prefix = bad_reg;
-             if (! do_debug_frames_interp || *reg_prefix != '\0')
-               printf ("  DW_CFA_restore_extended: %s%s\n",
-                       reg_prefix, regname (reg, 0));
-             if (*reg_prefix == '\0')
-               {
-                 fc->col_type[reg] = cie->col_type[reg];
-                 fc->col_offset[reg] = cie->col_offset[reg];
-               }
-             break;
+  SAFE_BYTE_GET (version, phdr, 4, limit);
+  if (version >= 2)
+    SAFE_BYTE_GET (ncols, phdr + 4, 4, limit);
+  SAFE_BYTE_GET (nused, phdr + 8, 4, limit);
+  SAFE_BYTE_GET (nslots, phdr + 12, 4, limit);
 
-           case DW_CFA_undefined:
-             reg = LEB ();
-             if (reg >= (unsigned int) fc->ncols)
-               reg_prefix = bad_reg;
-             if (! do_debug_frames_interp || *reg_prefix != '\0')
-               printf ("  DW_CFA_undefined: %s%s\n",
-                       reg_prefix, regname (reg, 0));
-             if (*reg_prefix == '\0')
-               {
-                 fc->col_type[reg] = DW_CFA_undefined;
-                 fc->col_offset[reg] = 0;
-               }
-             break;
+  phash = phdr + 16;
+  pindex = phash + (size_t) nslots * 8;
+  ppool = pindex + (size_t) nslots * 4;
 
-           case DW_CFA_same_value:
-             reg = LEB ();
-             if (reg >= (unsigned int) fc->ncols)
-               reg_prefix = bad_reg;
-             if (! do_debug_frames_interp || *reg_prefix != '\0')
-               printf ("  DW_CFA_same_value: %s%s\n",
-                       reg_prefix, regname (reg, 0));
-             if (*reg_prefix == '\0')
-               {
-                 fc->col_type[reg] = DW_CFA_same_value;
-                 fc->col_offset[reg] = 0;
-               }
-             break;
+  if (do_display)
+    {
+      introduce (section, FALSE);
 
-           case DW_CFA_register:
-             reg = LEB ();
-             roffs = LEB ();
-             if (reg >= (unsigned int) fc->ncols)
-               reg_prefix = bad_reg;
-             if (! do_debug_frames_interp || *reg_prefix != '\0')
-               {
-                 printf ("  DW_CFA_register: %s%s in ",
-                         reg_prefix, regname (reg, 0));
-                 puts (regname (roffs, 0));
-               }
-             if (*reg_prefix == '\0')
-               {
-                 fc->col_type[reg] = DW_CFA_register;
-                 fc->col_offset[reg] = roffs;
-               }
-             break;
+      printf (_("  Version:                 %u\n"), version);
+      if (version >= 2)
+       printf (_("  Number of columns:       %u\n"), ncols);
+      printf (_("  Number of used entries:  %u\n"), nused);
+      printf (_("  Number of slots:         %u\n\n"), nslots);
+    }
 
-           case DW_CFA_remember_state:
-             if (! do_debug_frames_interp)
-               printf ("  DW_CFA_remember_state\n");
-             rs = (Frame_Chunk *) xmalloc (sizeof (Frame_Chunk));
-             rs->ncols = fc->ncols;
-             rs->col_type = (short int *) 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));
-             rs->next = remembered_state;
-             remembered_state = rs;
-             break;
+  /* PR 17531: file: 45d69832.  */
+  if ((size_t) nslots * 8 / 8 != nslots
+      || phash < phdr || phash > limit
+      || pindex < phash || pindex > limit
+      || ppool < pindex || ppool > limit)
+    {
+      warn (ngettext ("Section %s is too small for %u slot\n",
+                     "Section %s is too small for %u slots\n",
+                     nslots),
+           section->name, nslots);
+      return 0;
+    }
 
-           case DW_CFA_restore_state:
-             if (! do_debug_frames_interp)
-               printf ("  DW_CFA_restore_state\n");
-             rs = remembered_state;
-             if (rs)
+  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;
+
+         SAFE_BYTE_GET64 (phash, &signature_high, &signature_low, limit);
+         if (signature_high != 0 || signature_low != 0)
+           {
+             SAFE_BYTE_GET (j, pindex, 4, limit);
+             shndx_list = ppool + j * 4;
+             /* PR 17531: file: 705e010d.  */
+             if (shndx_list < ppool)
                {
-                 remembered_state = rs->next;
-                 frame_need_space (fc, rs->ncols - 1);
-                 memcpy (fc->col_type, rs->col_type, rs->ncols);
-                 memcpy (fc->col_offset, rs->col_offset,
-                         rs->ncols * sizeof (int));
-                 free (rs->col_type);
-                 free (rs->col_offset);
-                 free (rs);
+                 warn (_("Section index pool located before start of section\n"));
+                 return 0;
                }
-             else if (do_debug_frames_interp)
-               printf ("Mismatched DW_CFA_restore_state\n");
-             break;
 
-           case DW_CFA_def_cfa:
-             fc->cfa_reg = LEB ();
-             fc->cfa_offset = LEB ();
-             fc->cfa_exp = 0;
-             if (! do_debug_frames_interp)
-               printf ("  DW_CFA_def_cfa: %s ofs %d\n",
-                       regname (fc->cfa_reg, 0), fc->cfa_offset);
-             break;
+             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;
+                   }
+                 SAFE_BYTE_GET (shndx, shndx_list, 4, limit);
+                 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 + (size_t) ncols * 4;
+      unsigned char *psizes = poffsets + (size_t) nused * ncols * 4;
+      unsigned char *pend = psizes + (size_t) 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;
+
+      /* PR 17531: file: 0dd159bf.
+        Check for integer overflow (can occur when size_t is 32-bit)
+        with overlarge ncols or nused values.  */
+      if ((size_t) ncols * 4 / 4 != ncols
+         || (size_t) nused * ncols * 4 / ((size_t) ncols * 4) != nused
+         || poffsets < ppool || poffsets > limit
+         || psizes < poffsets || psizes > limit
+         || pend < psizes || pend > limit)
+       {
+         warn (_("Section %s too small for offset and size tables\n"),
+               section->name);
+         return 0;
+       }
 
-           case DW_CFA_def_cfa_register:
-             fc->cfa_reg = LEB ();
-             fc->cfa_exp = 0;
-             if (! do_debug_frames_interp)
-               printf ("  DW_CFA_def_cfa_register: %s\n",
-                       regname (fc->cfa_reg, 0));
-             break;
+      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 = xcalloc2 (nused, sizeof (struct cu_tu_set));
+             this_set = tu_sets;
+           }
+         else
+           {
+             cu_count = nused;
+             cu_sets = xcalloc2 (nused, sizeof (struct cu_tu_set));
+             this_set = cu_sets;
+           }
+       }
 
-           case DW_CFA_def_cfa_offset:
-             fc->cfa_offset = LEB ();
-             if (! do_debug_frames_interp)
-               printf ("  DW_CFA_def_cfa_offset: %d\n", fc->cfa_offset);
-             break;
+      if (do_display)
+       {
+         for (j = 0; j < ncols; j++)
+           {
+             SAFE_BYTE_GET (dw_sect, ppool + j * 4, 4, limit);
+             printf (" %8s", get_DW_SECT_short_name (dw_sect));
+           }
+         printf ("\n");
+       }
 
-           case DW_CFA_nop:
-             if (! do_debug_frames_interp)
-               printf ("  DW_CFA_nop\n");
-             break;
+      for (i = 0; i < nslots; i++)
+       {
+         SAFE_BYTE_GET64 (ph, &signature_high, &signature_low, limit);
 
-           case DW_CFA_def_cfa_expression:
-             ul = LEB ();
-             if (! do_debug_frames_interp)
+         SAFE_BYTE_GET (row, pi, 4, limit);
+         if (row != 0)
+           {
+             /* PR 17531: file: a05f6ab3.  */
+             if (row > nused)
                {
-                 printf ("  DW_CFA_def_cfa_expression (");
-                 decode_location_expression (start, eh_addr_size, 0, -1,
-                                             ul, 0, section);
-                 printf (")\n");
+                 warn (_("Row index (%u) is larger than number of used entries (%u)\n"),
+                       row, nused);
+                 return 0;
                }
-             fc->cfa_exp = 1;
-             start += ul;
-             break;
 
-           case DW_CFA_expression:
-             reg = LEB ();
-             ul = LEB ();
-             if (reg >= (unsigned int) fc->ncols)
-               reg_prefix = bad_reg;
-             if (! do_debug_frames_interp || *reg_prefix != '\0')
+             if (!do_display)
                {
-                 printf ("  DW_CFA_expression: %s%s (",
-                         reg_prefix, regname (reg, 0));
-                 decode_location_expression (start, eh_addr_size, 0, -1,
-                                             ul, 0, section);
-                 printf (")\n");
-               }
-             if (*reg_prefix == '\0')
-               fc->col_type[reg] = DW_CFA_expression;
-             start += ul;
-             break;
+                 size_t num_copy = sizeof (uint64_t);
 
-           case DW_CFA_val_expression:
-             reg = LEB ();
-             ul = LEB ();
-             if (reg >= (unsigned int) fc->ncols)
-               reg_prefix = bad_reg;
-             if (! do_debug_frames_interp || *reg_prefix != '\0')
-               {
-                 printf ("  DW_CFA_val_expression: %s%s (",
-                         reg_prefix, regname (reg, 0));
-                 decode_location_expression (start, eh_addr_size, 0, -1,
-                                             ul, 0, section);
-                 printf (")\n");
+                 /* PR 23064: Beware of buffer overflow.  */
+                 if (ph + num_copy < limit)
+                   memcpy (&this_set[row - 1].signature, ph, num_copy);
+                 else
+                   {
+                     warn (_("Signature (%p) extends beyond end of space in section\n"), ph);
+                     return 0;
+                   }
                }
-             if (*reg_prefix == '\0')
-               fc->col_type[reg] = DW_CFA_val_expression;
-             start += ul;
-             break;
 
-           case DW_CFA_offset_extended_sf:
-             reg = LEB ();
-             l = SLEB ();
-             if (frame_need_space (fc, reg) < 0)
-               reg_prefix = bad_reg;
-             if (! do_debug_frames_interp || *reg_prefix != '\0')
-               printf ("  DW_CFA_offset_extended_sf: %s%s at cfa%+ld\n",
-                       reg_prefix, regname (reg, 0),
-                       l * fc->data_factor);
-             if (*reg_prefix == '\0')
+             prow = poffsets + (row - 1) * ncols * 4;
+             /* PR 17531: file: b8ce60a8.  */
+             if (prow < poffsets || prow > limit)
                {
-                 fc->col_type[reg] = DW_CFA_offset;
-                 fc->col_offset[reg] = l * fc->data_factor;
+                 warn (_("Row index (%u) * num columns (%u) > space remaining in section\n"),
+                       row, ncols);
+                 return 0;
                }
-             break;
 
-           case DW_CFA_val_offset_sf:
-             reg = LEB ();
-             l = SLEB ();
-             if (frame_need_space (fc, reg) < 0)
-               reg_prefix = bad_reg;
-             if (! do_debug_frames_interp || *reg_prefix != '\0')
-               printf ("  DW_CFA_val_offset_sf: %s%s at cfa%+ld\n",
-                       reg_prefix, regname (reg, 0),
-                       l * fc->data_factor);
-             if (*reg_prefix == '\0')
+             if (do_display)
+               printf (_("  [%3d] 0x%s"),
+                       i, dwarf_vmatoa64 (signature_high, signature_low,
+                                          buf, sizeof (buf)));
+             for (j = 0; j < ncols; j++)
                {
-                 fc->col_type[reg] = DW_CFA_val_offset;
-                 fc->col_offset[reg] = l * fc->data_factor;
+                 SAFE_BYTE_GET (val, prow + j * 4, 4, limit);
+                 if (do_display)
+                   printf (" %8d", val);
+                 else
+                   {
+                     SAFE_BYTE_GET (dw_sect, ppool + j * 4, 4, limit);
+
+                     /* PR 17531: file: 10796eb3.  */
+                     if (dw_sect >= DW_SECT_MAX)
+                       warn (_("Overlarge Dwarf section index detected: %u\n"), dw_sect);
+                     else
+                       this_set [row - 1].section_offsets [dw_sect] = val;
+                   }
                }
-             break;
 
-           case DW_CFA_def_cfa_sf:
-             fc->cfa_reg = LEB ();
-             fc->cfa_offset = SLEB ();
-             fc->cfa_offset = fc->cfa_offset * fc->data_factor;
-             fc->cfa_exp = 0;
-             if (! do_debug_frames_interp)
-               printf ("  DW_CFA_def_cfa_sf: %s ofs %d\n",
-                       regname (fc->cfa_reg, 0), fc->cfa_offset);
-             break;
+             if (do_display)
+               printf ("\n");
+           }
+         ph += 8;
+         pi += 4;
+       }
 
-           case DW_CFA_def_cfa_offset_sf:
-             fc->cfa_offset = SLEB ();
-             fc->cfa_offset = fc->cfa_offset * fc->data_factor;
-             if (! do_debug_frames_interp)
-               printf ("  DW_CFA_def_cfa_offset_sf: %d\n", fc->cfa_offset);
-             break;
+      ph = phash;
+      pi = pindex;
+      if (do_display)
+       {
+         printf ("\n");
+         printf (_("  Size table\n"));
+         printf ("  slot  %-16s  ",
+                is_tu_index ? _("signature") : _("dwo_id"));
+       }
 
-           case DW_CFA_MIPS_advance_loc8:
-             ofs = byte_get (start, 8); start += 8;
-             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);
-             fc->pc_begin += ofs * fc->code_factor;
-             break;
+      for (j = 0; j < ncols; j++)
+       {
+         SAFE_BYTE_GET (val, ppool + j * 4, 4, limit);
+         if (do_display)
+           printf (" %8s", get_DW_SECT_short_name (val));
+       }
 
-           case DW_CFA_GNU_window_save:
-             if (! do_debug_frames_interp)
-               printf ("  DW_CFA_GNU_window_save\n");
-             break;
+      if (do_display)
+       printf ("\n");
 
-           case DW_CFA_GNU_args_size:
-             ul = LEB ();
-             if (! do_debug_frames_interp)
-               printf ("  DW_CFA_GNU_args_size: %ld\n", ul);
-             break;
+      for (i = 0; i < nslots; i++)
+       {
+         SAFE_BYTE_GET64 (ph, &signature_high, &signature_low, limit);
 
-           case DW_CFA_GNU_negative_offset_extended:
-             reg = LEB ();
-             l = - LEB ();
-             if (frame_need_space (fc, reg) < 0)
-               reg_prefix = bad_reg;
-             if (! do_debug_frames_interp || *reg_prefix != '\0')
-               printf ("  DW_CFA_GNU_negative_offset_extended: %s%s at cfa%+ld\n",
-                       reg_prefix, regname (reg, 0),
-                       l * fc->data_factor);
-             if (*reg_prefix == '\0')
+         SAFE_BYTE_GET (row, pi, 4, limit);
+         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++)
                {
-                 fc->col_type[reg] = DW_CFA_offset;
-                 fc->col_offset[reg] = l * fc->data_factor;
+                 SAFE_BYTE_GET (val, prow + j * 4, 4, limit);
+                 if (do_display)
+                   printf (" %8d", val);
+                 else
+                   {
+                     SAFE_BYTE_GET (dw_sect, ppool + j * 4, 4, limit);
+                     if (dw_sect >= DW_SECT_MAX)
+                       warn (_("Overlarge Dwarf section index detected: %u\n"), dw_sect);
+                     else
+                     this_set [row - 1].section_sizes [dw_sect] = val;
+                   }
                }
-             break;
 
-           default:
-             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);
-             start = block_end;
+             if (do_display)
+               printf ("\n");
            }
+
+         ph += 8;
+         pi += 4;
        }
+    }
+  else if (do_display)
+    printf (_("  Unsupported version (%d)\n"), version);
 
-      if (do_debug_frames_interp)
-       frame_display_row (fc, &need_col_headers, &max_regs);
+  if (do_display)
+      printf ("\n");
 
-      start = block_end;
-      eh_addr_size = saved_eh_addr_size;
+  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 bfd_boolean
+load_cu_tu_indexes (void *file)
+{
+  static int cu_tu_indexes_read = -1; /* Tri-state variable.  */
+
+  /* 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 == -1)
+    {
+      cu_tu_indexes_read = TRUE;
+  
+      if (load_debug_section_with_follow (dwp_cu_index, file))
+       if (! process_cu_tu_index (&debug_displays [dwp_cu_index].section, 0))
+         cu_tu_indexes_read = FALSE;
+
+      if (load_debug_section_with_follow (dwp_tu_index, file))
+       if (! process_cu_tu_index (&debug_displays [dwp_tu_index].section, 0))
+         cu_tu_indexes_read = FALSE;
     }
 
-  printf ("\n");
+  return (bfd_boolean) cu_tu_indexes_read;
+}
 
-  return 1;
+/* Find the set of sections that includes section SHNDX.  */
+
+unsigned int *
+find_cu_tu_set (void *file, unsigned int shndx)
+{
+  unsigned int i;
+
+  if (! load_cu_tu_indexes (file))
+    return NULL;
+
+  /* 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;
 }
 
-#undef GET
-#undef LEB
-#undef SLEB
+/* 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,
@@ -4992,58 +9656,570 @@ display_debug_not_supported (struct dwarf_section *section,
   return 1;
 }
 
+/* Like malloc, but takes two parameters like calloc.
+   Verifies that the first parameter is not too large.
+   Note: does *not* initialise the allocated memory to zero.  */
+
 void *
 cmalloc (size_t nmemb, size_t size)
 {
   /* Check for overflow.  */
   if (nmemb >= ~(size_t) 0 / size)
     return NULL;
-  else
-    return malloc (nmemb * size);
+
+  return xmalloc (nmemb * size);
 }
 
+/* Like xmalloc, but takes two parameters like calloc.
+   Verifies that the first parameter is not too large.
+   Note: does *not* initialise the allocated memory to zero.  */
+
 void *
 xcmalloc (size_t nmemb, size_t size)
 {
   /* Check for overflow.  */
   if (nmemb >= ~(size_t) 0 / size)
-    return NULL;
-  else
-    return xmalloc (nmemb * size);
+    {
+      fprintf (stderr,
+              _("Attempt to allocate an array with an excessive number of elements: 0x%lx\n"),
+              (long) nmemb);
+      xexit (1);
+    }
+
+  return xmalloc (nmemb * size);
 }
 
+/* Like xrealloc, but takes three parameters.
+   Verifies that the second parameter is not too large.
+   Note: does *not* initialise any new memory to zero.  */
+
 void *
 xcrealloc (void *ptr, size_t nmemb, size_t size)
 {
   /* Check for overflow.  */
   if (nmemb >= ~(size_t) 0 / size)
+    {
+      error (_("Attempt to re-allocate an array with an excessive number of elements: 0x%lx\n"),
+            (long) nmemb);
+      xexit (1);
+    }
+
+  return xrealloc (ptr, nmemb * size);
+}
+
+/* Like xcalloc, but verifies that the first parameter is not too large.  */
+
+void *
+xcalloc2 (size_t nmemb, size_t size)
+{
+  /* Check for overflow.  */
+  if (nmemb >= ~(size_t) 0 / size)
+    {
+      error (_("Attempt to allocate a zero'ed array with an excessive number of elements: 0x%lx\n"),
+            (long) nmemb);
+      xexit (1);
+    }
+
+  return xcalloc (nmemb, size);
+}
+
+static unsigned long
+calc_gnu_debuglink_crc32 (unsigned long          crc,
+                         const unsigned char *  buf,
+                         bfd_size_type          len)
+{
+  static const unsigned long crc32_table[256] =
+    {
+      0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419,
+      0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4,
+      0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07,
+      0x90bf1d91, 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de,
+      0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856,
+      0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
+      0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4,
+      0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
+      0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3,
+      0x45df5c75, 0xdcd60dcf, 0xabd13d59, 0x26d930ac, 0x51de003a,
+      0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599,
+      0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
+      0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190,
+      0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f,
+      0x9fbfe4a5, 0xe8b8d433, 0x7807c9a2, 0x0f00f934, 0x9609a88e,
+      0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
+      0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed,
+      0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
+      0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3,
+      0xfbd44c65, 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2,
+      0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a,
+      0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5,
+      0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, 0xbe0b1010,
+      0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+      0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17,
+      0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6,
+      0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615,
+      0x73dc1683, 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
+      0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, 0xf00f9344,
+      0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
+      0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a,
+      0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
+      0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1,
+      0xa6bc5767, 0x3fb506dd, 0x48b2364b, 0xd80d2bda, 0xaf0a1b4c,
+      0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef,
+      0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
+      0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe,
+      0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31,
+      0x2cd99e8b, 0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c,
+      0x026d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
+      0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b,
+      0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
+      0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1,
+      0x18b74777, 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c,
+      0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45, 0xa00ae278,
+      0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7,
+      0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, 0x40df0b66,
+      0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+      0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605,
+      0xcdd70693, 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8,
+      0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b,
+      0x2d02ef8d
+    };
+  const unsigned char *end;
+
+  crc = ~crc & 0xffffffff;
+  for (end = buf + len; buf < end; ++ buf)
+    crc = crc32_table[(crc ^ *buf) & 0xff] ^ (crc >> 8);
+  return ~crc & 0xffffffff;
+}
+
+typedef bfd_boolean (*   check_func_type) (const char *, void *);
+typedef const char * (*  parse_func_type) (struct dwarf_section *, void *);
+
+static bfd_boolean
+check_gnu_debuglink (const char * pathname, void * crc_pointer)
+{
+  static unsigned char buffer [8 * 1024];
+  FILE *         f;
+  bfd_size_type  count;
+  unsigned long  crc = 0;
+  void *         sep_data;
+
+  sep_data = open_debug_file (pathname);
+  if (sep_data == NULL)
+    return FALSE;
+
+  /* Yes - we are opening the file twice...  */
+  f = fopen (pathname, "rb");
+  if (f == NULL)
+    {
+      /* Paranoia: This should never happen.  */
+      close_debug_file (sep_data);
+      warn (_("Unable to reopen separate debug info file: %s\n"), pathname);
+      return FALSE;
+    }
+
+  while ((count = fread (buffer, 1, sizeof (buffer), f)) > 0)
+    crc = calc_gnu_debuglink_crc32 (crc, buffer, count);
+
+  fclose (f);
+
+  if (crc != * (unsigned long *) crc_pointer)
+    {
+      close_debug_file (sep_data);
+      warn (_("Separate debug info file %s found, but CRC does not match - ignoring\n"),
+           pathname);
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+static const char *
+parse_gnu_debuglink (struct dwarf_section * section, void * data)
+{
+  const char *     name;
+  unsigned int     crc_offset;
+  unsigned long *  crc32 = (unsigned long *) data;
+
+  /* The name is first.
+     The CRC value is stored after the filename, aligned up to 4 bytes.  */
+  name = (const char *) section->start;
+
+  
+  crc_offset = strnlen (name, section->size) + 1;
+  crc_offset = (crc_offset + 3) & ~3;
+  if (crc_offset + 4 > section->size)
     return NULL;
-  else
-    return xrealloc (ptr, nmemb * size);
+
+  * crc32 = byte_get (section->start + crc_offset, 4);
+  return name;
 }
 
-void
-error (const char *message, ...)
+static bfd_boolean
+check_gnu_debugaltlink (const char * filename, void * data ATTRIBUTE_UNUSED)
+{
+  void * sep_data = open_debug_file (filename);
+
+  if (sep_data == NULL)
+    return FALSE;
+
+  /* FIXME: We should now extract the build-id in the separate file
+     and check it...  */
+
+  return TRUE;
+}
+
+typedef struct build_id_data
+{
+  bfd_size_type          len;
+  const unsigned char *  data;
+} Build_id_data;
+
+static const char *
+parse_gnu_debugaltlink (struct dwarf_section * section, void * data)
+{
+  const char *     name;
+  bfd_size_type    namelen;
+  bfd_size_type    id_len;
+  Build_id_data *  build_id_data;
+
+  /* The name is first.
+     The build-id follows immediately, with no padding, up to the section's end.  */
+
+  name = (const char *) section->start;
+  namelen = strnlen (name, section->size) + 1;
+  if (namelen >= section->size)
+    return NULL;
+
+  id_len = section->size - namelen;
+  if (id_len < 0x14)
+    return NULL;
+
+  build_id_data = calloc (1, sizeof * build_id_data);
+  if (build_id_data == NULL)
+    return NULL;
+
+  build_id_data->len = id_len;
+  build_id_data->data = section->start + namelen;
+
+  * (Build_id_data **) data = build_id_data;
+
+  return name;
+}
+
+static void
+add_separate_debug_file (const char * filename, void * handle)
 {
-  va_list args;
+  separate_info * i = xmalloc (sizeof * i);
 
-  va_start (args, message);
-  fprintf (stderr, _("%s: Error: "), program_name);
-  vfprintf (stderr, message, args);
-  va_end (args);
+  i->filename = filename;
+  i->handle   = handle;
+  i->next     = first_separate_info;
+  first_separate_info = i;
 }
 
-void
-warn (const char *message, ...)
+static void *
+load_separate_debug_info (const char *            main_filename,
+                         struct dwarf_section *  xlink,
+                         parse_func_type         parse_func,
+                         check_func_type         check_func,
+                         void *                  func_data)
+{
+  const char *   separate_filename;
+  char *         debug_filename;
+  char *         canon_dir;
+  size_t         canon_dirlen;
+  size_t         dirlen;
+
+  if ((separate_filename = parse_func (xlink, func_data)) == NULL)
+    {
+      warn (_("Corrupt debuglink section: %s\n"),
+           xlink->name ? xlink->name : xlink->uncompressed_name);
+      return FALSE;
+    }
+    
+  /* Attempt to locate the separate file.
+     This should duplicate the logic in bfd/opncls.c:find_separate_debug_file().  */
+
+  canon_dir = lrealpath (main_filename);
+  
+  for (canon_dirlen = strlen (canon_dir); canon_dirlen > 0; canon_dirlen--)
+    if (IS_DIR_SEPARATOR (canon_dir[canon_dirlen - 1]))
+      break;
+  canon_dir[canon_dirlen] = '\0';
+
+#ifndef DEBUGDIR
+#define DEBUGDIR "/lib/debug"
+#endif
+#ifndef EXTRA_DEBUG_ROOT1
+#define EXTRA_DEBUG_ROOT1 "/usr/lib/debug"
+#endif
+#ifndef EXTRA_DEBUG_ROOT2
+#define EXTRA_DEBUG_ROOT2 "/usr/lib/debug/usr"
+#endif
+
+  debug_filename = (char *) malloc (strlen (DEBUGDIR) + 1
+                                   + canon_dirlen
+                                   + strlen (".debug/")
+#ifdef EXTRA_DEBUG_ROOT1
+                                   + strlen (EXTRA_DEBUG_ROOT1)
+#endif
+#ifdef EXTRA_DEBUG_ROOT2
+                                   + strlen (EXTRA_DEBUG_ROOT2)
+#endif
+                                   + strlen (separate_filename)
+                                   + 1);
+  if (debug_filename == NULL)
+    {
+      warn (_("Out of memory"));
+      free (canon_dir);
+      return NULL;
+    }
+
+  /* First try in the current directory.  */
+  sprintf (debug_filename, "%s", separate_filename);
+  if (check_func (debug_filename, func_data))
+    goto found;
+
+  /* Then try in a subdirectory called .debug.  */
+  sprintf (debug_filename, ".debug/%s", separate_filename);
+  if (check_func (debug_filename, func_data))
+    goto found;
+
+  /* Then try in the same directory as the original file.  */
+  sprintf (debug_filename, "%s%s", canon_dir, separate_filename);
+  if (check_func (debug_filename, func_data))
+    goto found;
+
+  /* And the .debug subdirectory of that directory.  */
+  sprintf (debug_filename, "%s.debug/%s", canon_dir, separate_filename);
+  if (check_func (debug_filename, func_data))
+    goto found;
+
+#ifdef EXTRA_DEBUG_ROOT1
+  /* Try the first extra debug file root.  */
+  sprintf (debug_filename, "%s/%s", EXTRA_DEBUG_ROOT1, separate_filename);
+  if (check_func (debug_filename, func_data))
+    goto found;
+
+  /* Try the first extra debug file root.  */
+  sprintf (debug_filename, "%s/%s/%s", EXTRA_DEBUG_ROOT1, canon_dir, separate_filename);
+  if (check_func (debug_filename, func_data))
+    goto found;
+#endif
+
+#ifdef EXTRA_DEBUG_ROOT2
+  /* Try the second extra debug file root.  */
+  sprintf (debug_filename, "%s/%s", EXTRA_DEBUG_ROOT2, separate_filename);
+  if (check_func (debug_filename, func_data))
+    goto found;
+#endif
+
+  /* Then try in the global debug_filename directory.  */
+  strcpy (debug_filename, DEBUGDIR);
+  dirlen = strlen (DEBUGDIR) - 1;
+  if (dirlen > 0 && DEBUGDIR[dirlen] != '/')
+    strcat (debug_filename, "/");
+  strcat (debug_filename, (const char *) separate_filename);
+
+  if (check_func (debug_filename, func_data))
+    goto found;
+
+  /* Failed to find the file.  */
+  warn (_("could not find separate debug file '%s'\n"), separate_filename);
+  warn (_("tried: %s\n"), debug_filename);
+
+#ifdef EXTRA_DEBUG_ROOT2
+  sprintf (debug_filename, "%s/%s", EXTRA_DEBUG_ROOT2, separate_filename);
+  warn (_("tried: %s\n"), debug_filename);
+#endif
+
+#ifdef EXTRA_DEBUG_ROOT1
+  sprintf (debug_filename, "%s/%s/%s", EXTRA_DEBUG_ROOT1, canon_dir, separate_filename);
+  warn (_("tried: %s\n"), debug_filename);
+
+  sprintf (debug_filename, "%s/%s", EXTRA_DEBUG_ROOT1, separate_filename);
+  warn (_("tried: %s\n"), debug_filename);
+#endif
+
+  sprintf (debug_filename, "%s.debug/%s", canon_dir, separate_filename);
+  warn (_("tried: %s\n"), debug_filename);
+
+  sprintf (debug_filename, "%s%s", canon_dir, separate_filename);
+  warn (_("tried: %s\n"), debug_filename);
+
+  sprintf (debug_filename, ".debug/%s", separate_filename);
+  warn (_("tried: %s\n"), debug_filename);
+
+  sprintf (debug_filename, "%s", separate_filename);
+  warn (_("tried: %s\n"), debug_filename);
+
+  free (canon_dir);
+  free (debug_filename);
+  return NULL;
+
+ found:
+  free (canon_dir);
+
+  void * debug_handle;
+
+  /* Now open the file.... */
+  if ((debug_handle = open_debug_file (debug_filename)) == NULL)
+    {
+      warn (_("failed to open separate debug file: %s\n"), debug_filename);
+      free (debug_filename);
+      return FALSE;
+    }
+
+  /* FIXME: We do not check to see if there are any other separate debug info
+     files that would also match.  */
+
+  printf (_("%s: Found separate debug info file: %s\n\n"), main_filename, debug_filename);
+  add_separate_debug_file (debug_filename, debug_handle);
+
+  /* Do not free debug_filename - it might be referenced inside
+     the structure returned by open_debug_file().  */
+  return debug_handle;
+}
+
+/* Attempt to load a separate dwarf object file.  */
+
+static void *
+load_dwo_file (const char * main_filename, const char * name, const char * dir, const char * id ATTRIBUTE_UNUSED)
 {
-  va_list args;
+  char * separate_filename;
+  void * separate_handle;
+
+  /* FIXME: Skip adding / if dwo_dir ends in /.  */
+  separate_filename = concat (dir, "/", name, NULL);
+  if (separate_filename == NULL)
+    {
+      warn (_("Out of memory allocating dwo filename\n"));
+      return NULL;
+    }
+
+  if ((separate_handle = open_debug_file (separate_filename)) == NULL)
+    {
+      warn (_("Unable to load dwo file: %s\n"), separate_filename);
+      free (separate_filename);
+      return NULL;
+    }
 
-  va_start (args, message);
-  fprintf (stderr, _("%s: Warning: "), program_name);
-  vfprintf (stderr, message, args);
-  va_end (args);
+  /* FIXME: We should check the dwo_id.  */
+
+  printf (_("%s: Found separate debug object file: %s\n\n"), main_filename, separate_filename);
+  add_separate_debug_file (separate_filename, separate_handle);
+  /* Note - separate_filename will be freed in free_debug_memory().  */
+  return separate_handle;
 }
 
+/* Load the separate debug info file(s) attached to FILE, if any exist.
+   Returns TRUE if any were found, FALSE otherwise.
+   If TRUE is returned then the linked list starting at first_separate_info
+   will be populated with open file handles.  */
+
+bfd_boolean
+load_separate_debug_files (void * file, const char * filename)
+{
+  /* Skip this operation if we are not interested in debug links.  */
+  if (! do_follow_links && ! do_debug_links)
+    return FALSE;
+
+  /* See if there are any dwo links.  */
+  if (load_debug_section (str, file)
+      && load_debug_section (abbrev, file)
+      && load_debug_section (info, file))
+    {
+      free_dwo_info ();
+
+      if (process_debug_info (& debug_displays[info].section, file, abbrev, TRUE, FALSE))
+       {
+         bfd_boolean introduced = FALSE;
+         dwo_info *   dwinfo;
+         const char * dir = NULL;
+         const char * id = NULL;
+
+         for (dwinfo = first_dwo_info; dwinfo != NULL; dwinfo = dwinfo->next)
+           {
+             switch (dwinfo->type)
+               {
+               case DWO_NAME:
+                 if (do_debug_links)
+                   {
+                     if (! introduced)
+                       {
+                         printf (_("The %s section contains link(s) to dwo file(s):\n\n"),
+                                 debug_displays [info].section.uncompressed_name);
+                         introduced = TRUE;
+                       }
+
+                     printf (_("  Name:      %s\n"), dwinfo->value);
+                     printf (_("  Directory: %s\n"), dir ? dir : _("<not-found>"));
+                     if (id != NULL)
+                       display_data (printf (_("  ID:       ")), (unsigned char *) id, 8);
+                     else
+                       printf (_("  ID: <unknown>\n"));
+                     printf ("\n\n");
+                   }
+
+                 if (do_follow_links)
+                   load_dwo_file (filename, dwinfo->value, dir, id);
+                 break;
+
+               case DWO_DIR:
+                 dir = dwinfo->value;
+                 break;
+
+               case DWO_ID:
+                 id = dwinfo->value;
+                 break;
+
+               default:
+                 error (_("Unexpected DWO INFO type"));
+                 break;
+               }
+           }
+       }
+    }
+
+  if (! do_follow_links)
+    /* The other debug links will be displayed by display_debug_links()
+       so we do not need to do any further processing here.  */
+    return FALSE;
+
+  /* FIXME: We do not check for the presence of both link sections in the same file.  */
+  /* FIXME: We do not check the separate debug info file to see if it too contains debuglinks.  */
+  /* FIXME: We do not check for the presence of multiple, same-name debuglink sections.  */
+  /* FIXME: We do not check for the presence of a dwo link as well as a debuglink.  */
+
+  if (load_debug_section (gnu_debugaltlink, file))
+    {
+      Build_id_data * build_id_data;
+
+      load_separate_debug_info (filename,
+                               & debug_displays[gnu_debugaltlink].section,
+                               parse_gnu_debugaltlink,
+                               check_gnu_debugaltlink,
+                               & build_id_data);
+    }
+
+  if (load_debug_section (gnu_debuglink, file))
+    {
+      unsigned long crc32;
+
+      load_separate_debug_info (filename,
+                               & debug_displays[gnu_debuglink].section,
+                               parse_gnu_debuglink,
+                               check_gnu_debuglink,
+                               & crc32);
+    }
+
+  if (first_separate_info != NULL)
+    return TRUE;
+
+  do_follow_links = 0;
+  return FALSE;
+}  
+
 void
 free_debug_memory (void)
 {
@@ -5069,11 +10245,24 @@ free_debug_memory (void)
                free (debug_information [i].range_lists);
            }
        }
-
       free (debug_information);
       debug_information = NULL;
-      num_debug_info_entries = 0;
+      alloc_num_debug_info_entries = num_debug_info_entries = 0;
     }
+
+  separate_info * d;
+  separate_info * next;
+
+  for (d = first_separate_info; d != NULL; d = next)
+    {
+      close_debug_file (d->handle);
+      free ((void *) d->filename);
+      next = d->next;
+      free ((void *) d);
+    }
+  first_separate_info = NULL;
+  
+  free_dwo_info ();
 }
 
 void
@@ -5092,20 +10281,26 @@ 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 },
+      { "follow-links", & do_follow_links, 1 },
       { "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 },
+      { "links", & do_debug_links, 1 },
       { "loc",  & do_debug_loc, 1 },
       { "macro", & do_debug_macinfo, 1 },
       { "pubnames", & do_debug_pubnames, 1 },
       { "pubtypes", & do_debug_pubtypes, 1 },
-      /* This entry is for compatability
+      /* This entry is for compatibility
         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 +10310,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 +10334,7 @@ dwarf_select_sections_by_names (const char *names)
              break;
            }
        }
-      
+
       if (entry->option == NULL)
        {
          warn (_("Unrecognized debug option '%s'\n"), p);
@@ -5147,7 +10342,7 @@ dwarf_select_sections_by_names (const char *names)
          if (p == NULL)
            break;
        }
-      
+
       if (*p == ',')
        p++;
     }
@@ -5161,58 +10356,30 @@ dwarf_select_sections_by_letters (const char *letters)
   while (letters[lindex])
     switch (letters[lindex++])
       {
-      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;
-       
+      case 'A':        do_debug_addr = 1; break;
+      case 'a':        do_debug_abbrevs = 1; break;
+      case 'c':        do_debug_cu_index = 1; break;
+      case 'F':        do_debug_frames_interp = 1; /* Fall through.  */
+      case 'f':        do_debug_frames = 1; break;
+      case 'g':        do_gdb_index = 1; break;
+      case 'i':        do_debug_info = 1; break;
+      case 'K': do_follow_links = 1; break;
+      case 'k':        do_debug_links = 1; break;
+      case 'l':        do_debug_lines |= FLAG_DEBUG_LINES_RAW; break;
+      case 'L':        do_debug_lines |= FLAG_DEBUG_LINES_DECODED; break;
+      case 'm': do_debug_macinfo = 1; break;
+      case 'o':        do_debug_loc = 1; break;
+      case 'p':        do_debug_pubnames = 1; break;
+      case 'R':        do_debug_ranges = 1; break;
+      case 'r':        do_debug_aranges = 1; break;
+      case 's':        do_debug_str = 1; break;
+      case 'T': do_trace_aranges = 1; break;
+      case 't': do_debug_pubtypes = 1; break;
+      case 'U': do_trace_info = 1; break;
+      case 'u': do_trace_abbrevs = 1; break;
+
       default:
-       warn (_("Unrecognized debug option '%s'\n"), optarg);
+       warn (_("Unrecognized debug option '%s'\n"), letters);
        break;
       }
 }
@@ -5231,49 +10398,70 @@ 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;
+  do_follow_links = 1;
+  do_debug_links = 1;
 }
 
+#define NO_ABBREVS   NULL, NULL, NULL, 0, 0, 0, NULL, 0, NULL
+#define ABBREV(N)    NULL, NULL, NULL, 0, 0, N, NULL, 0, NULL
+
+/* N.B. The order here must match the order in section_display_enum.  */
+
 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",   NO_ABBREVS },      display_debug_abbrev,   &do_debug_abbrevs,   FALSE },
+  { { ".debug_aranges",            ".zdebug_aranges",  NO_ABBREVS },      display_debug_aranges,  &do_debug_aranges,   TRUE },
+  { { ".debug_frame",       ".zdebug_frame",   NO_ABBREVS },      display_debug_frames,   &do_debug_frames,    TRUE },
+  { { ".debug_info",       ".zdebug_info",     ABBREV (abbrev)},  display_debug_info,     &do_debug_info,      TRUE },
+  { { ".debug_line",       ".zdebug_line",     NO_ABBREVS },      display_debug_lines,    &do_debug_lines,     TRUE },
+  { { ".debug_pubnames",    ".zdebug_pubnames",        NO_ABBREVS },      display_debug_pubnames, &do_debug_pubnames,  FALSE },
+  { { ".debug_gnu_pubnames", ".zdebug_gnu_pubnames", NO_ABBREVS }, display_debug_gnu_pubnames, &do_debug_pubnames, FALSE },
+  { { ".eh_frame",         "",                 NO_ABBREVS },      display_debug_frames,   &do_debug_frames,    TRUE },
+  { { ".debug_macinfo",            ".zdebug_macinfo",  NO_ABBREVS },      display_debug_macinfo,  &do_debug_macinfo,   FALSE },
+  { { ".debug_macro",      ".zdebug_macro",    NO_ABBREVS },      display_debug_macro,    &do_debug_macinfo,   TRUE },
+  { { ".debug_str",        ".zdebug_str",      NO_ABBREVS },      display_debug_str,      &do_debug_str,       FALSE },
+  { { ".debug_line_str",    ".zdebug_line_str",        NO_ABBREVS },      display_debug_str,      &do_debug_str,       FALSE },
+  { { ".debug_loc",        ".zdebug_loc",      NO_ABBREVS },      display_debug_loc,      &do_debug_loc,       TRUE },
+  { { ".debug_loclists",    ".zdebug_loclists",        NO_ABBREVS },      display_debug_loc,      &do_debug_loc,       TRUE },
+  { { ".debug_pubtypes",    ".zdebug_pubtypes",        NO_ABBREVS },      display_debug_pubnames, &do_debug_pubtypes,  FALSE },
+  { { ".debug_gnu_pubtypes", ".zdebug_gnu_pubtypes", NO_ABBREVS }, display_debug_gnu_pubnames, &do_debug_pubtypes, FALSE },
+  { { ".debug_ranges",     ".zdebug_ranges",   NO_ABBREVS },      display_debug_ranges,   &do_debug_ranges,    TRUE },
+  { { ".debug_rnglists",    ".zdebug_rnglists",        NO_ABBREVS },      display_debug_ranges,   &do_debug_ranges,    TRUE },
+  { { ".debug_static_func", ".zdebug_static_func", NO_ABBREVS },   display_debug_not_supported, NULL,          FALSE },
+  { { ".debug_static_vars", ".zdebug_static_vars", NO_ABBREVS },   display_debug_not_supported, NULL,          FALSE },
+  { { ".debug_types",      ".zdebug_types",    ABBREV (abbrev) }, display_debug_types,    &do_debug_info,      TRUE },
+  { { ".debug_weaknames",   ".zdebug_weaknames", NO_ABBREVS },     display_debug_not_supported, NULL,          FALSE },
+  { { ".gdb_index",        "",                 NO_ABBREVS },      display_gdb_index,      &do_gdb_index,       FALSE },
+  { { ".debug_names",      "",                 NO_ABBREVS },      display_debug_names,    &do_gdb_index,       FALSE },
+  { { ".trace_info",       "",                 ABBREV (trace_abbrev) }, display_trace_info, &do_trace_info,    TRUE },
+  { { ".trace_abbrev",     "",                 NO_ABBREVS },      display_debug_abbrev,   &do_trace_abbrevs,   FALSE },
+  { { ".trace_aranges",            "",                 NO_ABBREVS },      display_debug_aranges,  &do_trace_aranges,   FALSE },
+  { { ".debug_info.dwo",    ".zdebug_info.dwo",        ABBREV (abbrev_dwo) }, display_debug_info, &do_debug_info,      TRUE },
+  { { ".debug_abbrev.dwo",  ".zdebug_abbrev.dwo", NO_ABBREVS },    display_debug_abbrev,   &do_debug_abbrevs,  FALSE },
+  { { ".debug_types.dwo",   ".zdebug_types.dwo", ABBREV (abbrev_dwo) }, display_debug_types, &do_debug_info,   TRUE },
+  { { ".debug_line.dwo",    ".zdebug_line.dwo", NO_ABBREVS },      display_debug_lines,    &do_debug_lines,    TRUE },
+  { { ".debug_loc.dwo",            ".zdebug_loc.dwo",  NO_ABBREVS },      display_debug_loc,      &do_debug_loc,       TRUE },
+  { { ".debug_macro.dwo",   ".zdebug_macro.dwo", NO_ABBREVS },     display_debug_macro,    &do_debug_macinfo,  TRUE },
+  { { ".debug_macinfo.dwo", ".zdebug_macinfo.dwo", NO_ABBREVS },   display_debug_macinfo,  &do_debug_macinfo,  FALSE },
+  { { ".debug_str.dwo",     ".zdebug_str.dwo",  NO_ABBREVS },      display_debug_str,      &do_debug_str,      TRUE },
+  { { ".debug_str_offsets", ".zdebug_str_offsets", NO_ABBREVS },   display_debug_str_offsets, NULL,            FALSE },
+  { { ".debug_str_offsets.dwo", ".zdebug_str_offsets.dwo", NO_ABBREVS }, display_debug_str_offsets, NULL,      FALSE },
+  { { ".debug_addr",       ".zdebug_addr",     NO_ABBREVS },      display_debug_addr,     &do_debug_addr,      TRUE },
+  { { ".debug_cu_index",    "",                        NO_ABBREVS },      display_cu_index,       &do_debug_cu_index,  FALSE },
+  { { ".debug_tu_index",    "",                        NO_ABBREVS },      display_cu_index,       &do_debug_cu_index,  FALSE },
+  { { ".gnu_debuglink",     "",                 NO_ABBREVS },      display_debug_links,    &do_debug_links,     FALSE },
+  { { ".gnu_debugaltlink",  "",                 NO_ABBREVS },      display_debug_links,    &do_debug_links,     FALSE },
+  /* Separate debug info files can containt their own .debug_str section,
+     and this might be in *addition* to a .debug_str section already present
+     in the main file.  Hence we need to have two entries for .debug_str.  */
+  { { ".debug_str",        ".zdebug_str",      NO_ABBREVS },      display_debug_str,      &do_debug_str,       FALSE },
 };
+
+/* A static assertion.  */
+extern int debug_displays_assert[ARRAY_SIZE (debug_displays) == max ? 1 : -1];
This page took 0.182843 seconds and 4 git commands to generate.