Fix build with GCC 4.2
[deliverable/binutils-gdb.git] / binutils / dwarf.c
index a7310c892726e574d69d02559c6740e8c9a0d129..5cada3704eb31f3c33d0d2982c0c70e88057e948 100644 (file)
@@ -1,5 +1,5 @@
 /* dwarf.c -- display DWARF contents of a BFD binary file
-   Copyright (C) 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2017 Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
 
 #include "dwarf2.h"
 #include "dwarf.h"
 #include "gdb/gdb-index.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);
 
@@ -44,7 +50,7 @@ static debug_info *debug_information = NULL;
    that the .debug_info section could not be loaded/parsed.  */
 #define DEBUG_INFO_UNAVAILABLE  (unsigned int) -1
 
-int eh_addr_size;
+unsigned int eh_addr_size;
 
 int do_debug_info;
 int do_debug_abbrevs;
@@ -76,7 +82,6 @@ int dwarf_check = 0;
    as a zero-terminated list of section indexes comprising one set of debug
    sections from a .dwo file.  */
 
-static int cu_tu_indexes_read = 0;
 static unsigned int *shndx_pool = NULL;
 static unsigned int shndx_pool_size = 0;
 static unsigned int shndx_pool_used = 0;
@@ -99,13 +104,13 @@ static int tu_count = 0;
 static struct cu_tu_set *cu_sets = NULL;
 static struct cu_tu_set *tu_sets = NULL;
 
-static void load_cu_tu_indexes (void *file);
+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 int
+static unsigned int
 size_of_encoded_value (int encoding)
 {
   switch (encoding & 0x7)
@@ -200,7 +205,7 @@ dwarf_vmatoa_1 (const char *fmtch, dwarf_vma value, unsigned num_bytes)
 
   if (num_bytes)
     {
-      /* Printf does not have a way of specifiying a maximum field width for an
+      /* 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);
@@ -281,13 +286,18 @@ read_leb128 (unsigned char *data,
       shift += 7;
       if ((byte & 0x80) == 0)
        break;
+
+      /* PR 17512: file: 0ca183b8.
+        FIXME: Should we signal this error somehow ?  */
+      if (shift >= sizeof (result) * 8)
+       break;
     }
 
   if (length_return != NULL)
     *length_return = num_read;
 
   if (sign && (shift < 8 * sizeof (result)) && (byte & 0x40))
-    result |= (dwarf_vma) -1 << shift;
+    result |= -((dwarf_vma) 1 << shift);
 
   return result;
 }
@@ -309,11 +319,45 @@ read_uleb128 (unsigned char * data,
   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 (%#" DWARF_VMA_FMT "x) too large for containing variable\n"), \
+              __FILE__, __LINE__, _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 (%#" DWARF_VMA_FMT "x) too large for containing variable\n"), \
+              __FILE__, __LINE__, _val);                       \
+      start += length_return;                                  \
+    }                                                          \
+  while (0)
+
 #define SAFE_BYTE_GET(VAL, PTR, AMOUNT, END)   \
   do                                           \
     {                                          \
-      int dummy [sizeof (VAL) < (AMOUNT) ? -1 : 1] ATTRIBUTE_UNUSED ; \
       unsigned int amount = (AMOUNT);          \
+      if (sizeof (VAL) < amount)               \
+       {                                       \
+         error (_("internal error: attempt to read %d bytes of data in to %d sized variable"),\
+                amount, (int) sizeof (VAL));   \
+         amount = sizeof (VAL);                \
+       }                                       \
       if (((PTR) + amount) >= (END))           \
        {                                       \
          if ((PTR) < (END))                    \
@@ -446,9 +490,13 @@ process_extended_line_op (unsigned char * data,
     case DW_LNE_set_address:
       /* 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);
-      SAFE_BYTE_GET (adr, data, len - bytes_read - 1, end);
+       {
+         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.op_index = 0;
@@ -459,18 +507,23 @@ process_extended_line_op (unsigned char * data,
       printf (_("  Entry\tDir\tTime\tSize\tName\n"));
       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\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"));
+       warn (_("DW_LNE_define_file: Bad opcode length\n"));
       break;
 
     case DW_LNE_set_discriminator:
@@ -511,68 +564,68 @@ process_extended_line_op (unsigned char * data,
       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;
-              }
-          }
+       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:
       {
-        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");
+       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;
     }
@@ -584,18 +637,56 @@ 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)
+  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>");
     }
 
-  return (const unsigned char *) section->start + offset;
+  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 *
@@ -608,6 +699,7 @@ fetch_indexed_string (dwarf_vma idx, struct cu_tu_set *this_set,
   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>")
@@ -615,7 +707,7 @@ fetch_indexed_string (dwarf_vma idx, struct cu_tu_set *this_set,
 
   if (this_set != NULL)
     index_offset += this_set->section_offsets [DW_SECT_STR_OFFSETS];
-  if (index_offset > index_section->size)
+  if (index_offset >= index_section->size)
     {
       warn (_("DW_FORM_GNU_str_index offset too big: %s\n"),
            dwarf_vmatoa ("x", index_offset));
@@ -628,14 +720,22 @@ fetch_indexed_string (dwarf_vma idx, struct cu_tu_set *this_set,
 
   str_offset = byte_get (index_section->start + index_offset, offset_size);
   str_offset -= str_section->address;
-  if (str_offset > str_section->size)
+  if (str_offset >= str_section->size)
     {
       warn (_("DW_FORM_GNU_str_index indirect offset too big: %s\n"),
            dwarf_vmatoa ("x", str_offset));
       return _("<indirect index offset is too big>");
     }
 
-  return (const char *) str_section->start + str_offset;
+  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 *
@@ -649,7 +749,7 @@ fetch_indexed_value (dwarf_vma offset, dwarf_vma bytes)
   if (offset + bytes > section->size)
     {
       warn (_("Offset into section %s too big: %s\n"),
-            section->name, dwarf_vmatoa ("x", offset));
+           section->name, dwarf_vmatoa ("x", offset));
       return "<offset too big>";
     }
 
@@ -664,6 +764,7 @@ typedef struct abbrev_attr
 {
   unsigned long attribute;
   unsigned long form;
+  bfd_signed_vma implicit_const;
   struct abbrev_attr *next;
 }
 abbrev_attr;
@@ -733,7 +834,8 @@ 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;
 
@@ -744,6 +846,7 @@ add_abbrev_attr (unsigned long attribute, unsigned long form)
 
   attr->attribute = attribute;
   attr->form      = form;
+  attr->implicit_const = implicit_const;
   attr->next      = NULL;
 
   if (last_abbrev->first_attr == NULL)
@@ -796,6 +899,8 @@ 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_uleb128 (start, & bytes_read, end);
          start += bytes_read;
@@ -807,7 +912,15 @@ process_abbrev_section (unsigned char *start, unsigned char *end)
          if (start == end)
            break;
 
-         add_abbrev_attr (attribute, form);
+         if (form == DW_FORM_implicit_const)
+           {
+             implicit_const = read_sleb128 (start, & bytes_read, end);
+             start += bytes_read;
+             if (start == end)
+               break;
+           }
+
+         add_abbrev_attr (attribute, form, implicit_const);
        }
       while (attribute != 0);
     }
@@ -854,14 +967,30 @@ get_FORM_name (unsigned long form)
   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,
               dwarf_vma length,
-              const unsigned char * const end)
+              const unsigned char * const end, char delimiter)
 {
   dwarf_vma maxlen;
 
-  printf (_(" %s byte block: "), dwarf_vmatoa ("u", length));
+  printf (_("%c%s byte block: "), delimiter, dwarf_vmatoa ("u", length));
   if (data > end)
     return (unsigned char *) end;
 
@@ -1254,7 +1383,7 @@ decode_location_expression (unsigned char * data,
          printf ("DW_OP_implicit_value");
          uvalue = read_uleb128 (data, &bytes_read, end);
          data += bytes_read;
-         data = display_block (data, uvalue, end);
+         data = display_block (data, uvalue, end, ' ');
          break;
 
          /* GNU extensions.  */
@@ -1278,12 +1407,16 @@ decode_location_expression (unsigned char * data,
            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
             this ought to be an 8-byte wide computation.  */
          if (dwarf_version == -1)
            {
-             printf (_("(DW_OP_GNU_implicit_pointer in frame info)"));
+             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;
            }
@@ -1295,19 +1428,23 @@ decode_location_expression (unsigned char * data,
            {
              SAFE_BYTE_GET_AND_INC (uvalue, data, offset_size, end);
            }
-         printf ("DW_OP_GNU_implicit_pointer: <0x%s> %s",
+         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 ("DW_OP_GNU_entry_value: (");
+         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))
@@ -1317,40 +1454,55 @@ decode_location_expression (unsigned char * data,
          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 ("DW_OP_GNU_const_type: <0x%s> ",
+         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);
+         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 ("DW_OP_GNU_regval_type: %s (%s)",
+         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 ("DW_OP_GNU_deref_type: %ld", (long) uvalue);
+         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 ("DW_OP_GNU_convert <0x%s>",
+         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 ("DW_OP_GNU_reinterpret <0x%s>",
+         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:
@@ -1358,16 +1510,16 @@ decode_location_expression (unsigned char * data,
          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_addr_index:
+         uvalue = read_uleb128 (data, &bytes_read, end);
+         data += bytes_read;
+         printf ("DW_OP_GNU_addr_index <0x%s>", dwarf_vmatoa ("x", uvalue));
+         break;
+       case DW_OP_GNU_const_index:
+         uvalue = read_uleb128 (data, &bytes_read, end);
+         data += bytes_read;
+         printf ("DW_OP_GNU_const_index <0x%s>", dwarf_vmatoa ("x", uvalue));
+         break;
 
          /* HP extensions.  */
        case DW_OP_HP_is_value:
@@ -1407,9 +1559,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;
        }
@@ -1485,6 +1637,7 @@ add64 (dwarf_vma * high_bits, dwarf_vma * low_bits, dwarf_vma inc)
 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,
@@ -1494,7 +1647,7 @@ read_and_display_attr_value (unsigned long attribute,
                             debug_info * debug_info_p,
                             int do_loc,
                             struct dwarf_section * section,
-                            struct cu_tu_set * this_set)
+                            struct cu_tu_set * this_set, char delimiter)
 {
   dwarf_vma uvalue = 0;
   unsigned char *block_start = NULL;
@@ -1527,6 +1680,7 @@ read_and_display_attr_value (unsigned long attribute,
       break;
 
     case DW_FORM_strp:
+    case DW_FORM_line_strp:
     case DW_FORM_sec_offset:
     case DW_FORM_GNU_ref_alt:
     case DW_FORM_GNU_strp_alt:
@@ -1573,12 +1727,17 @@ read_and_display_attr_value (unsigned long attribute,
       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, end,
-                                         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, this_set);
+                                         section, this_set, delimiter);
     case DW_FORM_GNU_addr_index:
       uvalue = read_uleb128 (data, & bytes_read, end);
       data += bytes_read;
@@ -1589,12 +1748,12 @@ read_and_display_attr_value (unsigned long attribute,
     {
     case DW_FORM_ref_addr:
       if (!do_loc)
-       printf (" <0x%s>", dwarf_vmatoa ("x",uvalue));
+       printf ("%c<0x%s>", delimiter, dwarf_vmatoa ("x",uvalue));
       break;
 
     case DW_FORM_GNU_ref_alt:
       if (!do_loc)
-       printf (" <alt 0x%s>", dwarf_vmatoa ("x",uvalue));
+       printf ("%c<alt 0x%s>", delimiter, dwarf_vmatoa ("x",uvalue));
       break;
 
     case DW_FORM_ref1:
@@ -1602,14 +1761,14 @@ read_and_display_attr_value (unsigned long attribute,
     case DW_FORM_ref4:
     case DW_FORM_ref_udata:
       if (!do_loc)
-       printf (" <0x%s>", dwarf_vmatoa ("x", 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%s", dwarf_vmatoa ("x", uvalue));
+       printf ("%c0x%s", delimiter, dwarf_vmatoa ("x", uvalue));
       break;
 
     case DW_FORM_flag_present:
@@ -1619,7 +1778,12 @@ read_and_display_attr_value (unsigned long attribute,
     case DW_FORM_sdata:
     case DW_FORM_udata:
       if (!do_loc)
-       printf (" %s", dwarf_vmatoa ("d", 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:
@@ -1634,7 +1798,7 @@ read_and_display_attr_value (unsigned long attribute,
          utmp = uvalue;
          if (form == DW_FORM_ref8)
            add64 (& high_bits, & utmp, cu_offset);
-         printf (" 0x%s",
+         printf ("%c0x%s", delimiter,
                  dwarf_vmatoa64 (high_bits, utmp, buf, sizeof (buf)));
        }
 
@@ -1650,9 +1814,35 @@ read_and_display_attr_value (unsigned long attribute,
       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", (int) (end - data), data);
+       printf ("%c%.*s", delimiter, (int) (end - data), data);
       data += strnlen ((char *) data, end - data) + 1;
       break;
 
@@ -1666,8 +1856,12 @@ read_and_display_attr_value (unsigned long attribute,
          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)
+      if (block_start + uvalue > end || data < block_start)
        {
          warn (_("Corrupt attribute block length: %lx\n"), (long) uvalue);
          uvalue = end - block_start;
@@ -1675,7 +1869,7 @@ read_and_display_attr_value (unsigned long attribute,
       if (do_loc)
        data = block_start + uvalue;
       else
-       data = display_block (block_start, uvalue, end);
+       data = display_block (block_start, uvalue, end, delimiter);
       break;
 
     case DW_FORM_block1:
@@ -1687,7 +1881,8 @@ read_and_display_attr_value (unsigned long attribute,
          uvalue = 0;
          block_start = end;
        }
-      if (block_start + uvalue > 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;
@@ -1695,7 +1890,7 @@ read_and_display_attr_value (unsigned long attribute,
       if (do_loc)
        data = block_start + uvalue;
       else
-       data = display_block (block_start, uvalue, end);
+       data = display_block (block_start, uvalue, end, delimiter);
       break;
 
     case DW_FORM_block2:
@@ -1707,7 +1902,8 @@ read_and_display_attr_value (unsigned long attribute,
          uvalue = 0;
          block_start = end;
        }
-      if (block_start + uvalue > 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;
@@ -1715,7 +1911,7 @@ read_and_display_attr_value (unsigned long attribute,
       if (do_loc)
        data = block_start + uvalue;
       else
-       data = display_block (block_start, uvalue, end);
+       data = display_block (block_start, uvalue, end, delimiter);
       break;
 
     case DW_FORM_block4:
@@ -1728,7 +1924,10 @@ read_and_display_attr_value (unsigned long attribute,
          uvalue = 0;
          block_start = end;
        }
-      if (block_start + uvalue > 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;
@@ -1736,31 +1935,38 @@ read_and_display_attr_value (unsigned long attribute,
       if (do_loc)
        data = block_start + uvalue;
       else
-       data = display_block (block_start, uvalue, end);
+       data = display_block (block_start, uvalue, end, delimiter);
       break;
 
     case DW_FORM_strp:
       if (!do_loc)
-       printf (_(" (indirect string, offset: 0x%s): %s"),
+       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, '.');
-          int dwo = (suffix && strcmp (suffix, ".dwo") == 0) ? 1 : 0;
-
-          printf (_(" (indexed string: 0x%s): %s"),
-                  dwarf_vmatoa ("x", uvalue),
-                  fetch_indexed_string (uvalue, this_set, offset_size, dwo));
-        }
+       {
+         const char *suffix = strrchr (section->name, '.');
+         int dwo = (suffix && strcmp (suffix, ".dwo") == 0) ? 1 : 0;
+
+         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 (_(" (alt indirect string, offset: 0x%s)"),
+       printf (_("%c(alt indirect string, offset: 0x%s)"), delimiter,
                dwarf_vmatoa ("x", uvalue));
       break;
 
@@ -1775,7 +1981,7 @@ read_and_display_attr_value (unsigned long attribute,
          char buf[64];
 
          SAFE_BYTE_GET64 (data, &high_bits, &uvalue, end);
-         printf (" signature: 0x%s",
+         printf ("%csignature: 0x%s", delimiter,
                  dwarf_vmatoa64 (high_bits, uvalue, buf, sizeof (buf)));
        }
       data += 8;
@@ -1783,9 +1989,9 @@ read_and_display_attr_value (unsigned long attribute,
 
     case DW_FORM_GNU_addr_index:
       if (!do_loc)
-        printf (_(" (addr_index: 0x%s): %s"),
-                dwarf_vmatoa ("x", uvalue),
-                fetch_indexed_value (uvalue * pointer_size, pointer_size));
+       printf (_("%c(addr_index: 0x%s): %s"), delimiter,
+               dwarf_vmatoa ("x", uvalue),
+               fetch_indexed_value (uvalue * pointer_size, pointer_size));
       break;
 
     default:
@@ -1801,6 +2007,7 @@ read_and_display_attr_value (unsigned long attribute,
        {
        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:
@@ -1809,11 +2016,15 @@ read_and_display_attr_value (unsigned long attribute,
        case DW_AT_segment:
        case DW_AT_static_link:
        case DW_AT_use_location:
+       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
+         if ((dwarf_version < 4
               && (form == DW_FORM_data4 || form == DW_FORM_data8))
              || form == DW_FORM_sec_offset)
            {
@@ -1825,15 +2036,15 @@ read_and_display_attr_value (unsigned long attribute,
                {
                  lmax += 1024;
                  debug_info_p->loc_offsets = (dwarf_vma *)
-                      xcrealloc (debug_info_p->loc_offsets,
-                                lmax, sizeof (*debug_info_p->loc_offsets));
+                   xcrealloc (debug_info_p->loc_offsets,
+                              lmax, sizeof (*debug_info_p->loc_offsets));
                  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;
                }
              if (this_set != NULL)
-               uvalue += this_set->section_offsets [DW_SECT_LOC];
+               uvalue += this_set->section_offsets [DW_SECT_LOC];
              debug_info_p->loc_offsets [num] = uvalue;
              debug_info_p->have_frame_base [num] = have_frame_base;
              debug_info_p->num_loc_offsets++;
@@ -1846,15 +2057,15 @@ read_and_display_attr_value (unsigned long attribute,
          break;
 
        case DW_AT_GNU_addr_base:
-          debug_info_p->addr_base = uvalue;
+         debug_info_p->addr_base = uvalue;
          break;
 
        case DW_AT_GNU_ranges_base:
-          debug_info_p->ranges_base = uvalue;
+         debug_info_p->ranges_base = uvalue;
          break;
 
        case DW_AT_ranges:
-         if ((dwarf_version < 4
+         if ((dwarf_version < 4
               && (form == DW_FORM_data4 || form == DW_FORM_data8))
              || form == DW_FORM_sec_offset)
            {
@@ -1866,8 +2077,8 @@ read_and_display_attr_value (unsigned long attribute,
                {
                  lmax += 1024;
                  debug_info_p->range_lists = (dwarf_vma *)
-                      xcrealloc (debug_info_p->range_lists,
-                                lmax, sizeof (*debug_info_p->range_lists));
+                   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;
@@ -1942,6 +2153,8 @@ read_and_display_attr_value (unsigned long attribute,
        case DW_LANG_C_plus_plus_11:    printf ("(C++11)"); break;
        case DW_LANG_C11:               printf ("(C11)"); 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;
          /* MIPS extension.  */
        case DW_LANG_Mips_Assembler:    printf ("(MIPS assembler)"); break;
          /* UPC extension.  */
@@ -1986,6 +2199,8 @@ read_and_display_attr_value (unsigned long attribute,
        case DW_ATE_HP_floathpintel:    printf ("(HP_floathpintel)"); break;
        case DW_ATE_HP_imaginary_float80:       printf ("(HP_imaginary_float80)"); break;
        case DW_ATE_HP_imaginary_float128:      printf ("(HP_imaginary_float128)"); break;
+         /* DWARF 4 values:  */
+       case DW_ATE_UTF:                printf ("(unicode string)"); break;
 
        default:
          if (uvalue >= DW_ATE_lo_user
@@ -2072,6 +2287,7 @@ read_and_display_attr_value (unsigned long attribute,
 
     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:
@@ -2080,12 +2296,16 @@ read_and_display_attr_value (unsigned long attribute,
     case DW_AT_segment:
     case DW_AT_static_link:
     case DW_AT_use_location:
+    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_data4 || form == DW_FORM_data8))
          || form == DW_FORM_sec_offset)
        printf (_(" (location list)"));
       /* Fall through.  */
@@ -2116,7 +2336,7 @@ read_and_display_attr_value (unsigned long attribute,
       {
        if (form == DW_FORM_ref_sig8
            || form == DW_FORM_GNU_ref_alt)
-          break;
+         break;
 
        if (form == DW_FORM_ref1
            || form == DW_FORM_ref2
@@ -2125,7 +2345,7 @@ read_and_display_attr_value (unsigned long attribute,
          uvalue += cu_offset;
 
        if (uvalue >= section->size)
-         warn (_("Offset %s used as value for DW_AT_import attribute of DIE at offset %lx is too big.\n"),
+         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
@@ -2188,6 +2408,7 @@ get_AT_name (unsigned long attribute)
 static unsigned char *
 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,
@@ -2201,10 +2422,10 @@ read_and_display_attr (unsigned long attribute,
 {
   if (!do_loc)
     printf ("   %-18s:", get_AT_name (attribute));
-  data = read_and_display_attr_value (attribute, form, data, end,
+  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, this_set);
+                                     do_loc, section, this_set, ' ');
   if (!do_loc)
     printf ("\n");
   return data;
@@ -2218,7 +2439,7 @@ read_and_display_attr (unsigned long attribute,
 static int
 process_debug_info (struct dwarf_section *section,
                    void *file,
-                    enum dwarf_section_display_enum abbrev_sec,
+                   enum dwarf_section_display_enum abbrev_sec,
                    int do_loc,
                    int do_types)
 {
@@ -2259,8 +2480,8 @@ process_debug_info (struct dwarf_section *section,
 
          /* 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 (0x%s) found in section %s\n"),
                    dwarf_vmatoa ("x", length), section->name);
@@ -2284,6 +2505,13 @@ process_debug_info (struct dwarf_section *section,
          alloc_num_debug_info_entries = num_debug_info_entries = 0;
          return 0;
        }
+      /* 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;
     }
 
@@ -2293,6 +2521,7 @@ process_debug_info (struct dwarf_section *section,
        printf (_("Contents of the %s section:\n\n"), section->name);
 
       load_debug_section (str, file);
+      load_debug_section (line_str, file);
       load_debug_section (str_dwo, file);
       load_debug_section (str_index, file);
       load_debug_section (str_index_dwo, file);
@@ -2345,6 +2574,20 @@ process_debug_info (struct dwarf_section *section,
 
       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);
+       }
+
       SAFE_BYTE_GET_AND_INC (compunit.cu_abbrev_offset, hdrptr, offset_size, end);
 
       if (this_set == NULL)
@@ -2358,7 +2601,9 @@ process_debug_info (struct dwarf_section *section,
          abbrev_size = this_set->section_sizes [DW_SECT_ABBREV];
        }
 
-      SAFE_BYTE_GET_AND_INC (compunit.cu_pointer_size, hdrptr, 1, end);
+      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)
        {
@@ -2368,11 +2613,11 @@ process_debug_info (struct dwarf_section *section,
        }
 
       if (do_types)
-        {
+       {
          SAFE_BYTE_GET64 (hdrptr, &signature_high, &signature_low, end);
          hdrptr += 8;
          SAFE_BYTE_GET_AND_INC (type_offset, hdrptr, offset_size, end);
-        }
+       }
 
       if ((do_loc || do_debug_loc || do_debug_ranges)
          && num_debug_info_entries == 0
@@ -2441,17 +2686,23 @@ process_debug_info (struct dwarf_section *section,
          > section->size)
        {
          warn (_("Debug info is corrupted, length of CU at %s"
-                 " extends beyond end of section (length = %s)\n"),
+                 " extends beyond end of section (length = %s)\n"),
                dwarf_vmatoa ("x", 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 (start > end)
+       {
+         warn (_("Debug info is corrupt.  CU at %s extends beyond end of section"),
+               dwarf_vmatoa ("x", cu_offset));
+         start = end;
+       }
+
+      if (compunit.cu_version < 2 || compunit.cu_version > 5)
        {
          warn (_("CU at offset %s contains corrupt or "
                  "unsupported version number: %d.\n"),
@@ -2459,6 +2710,15 @@ process_debug_info (struct dwarf_section *section,
          continue;
        }
 
+      if (compunit.cu_unit_type != DW_UT_compile
+         && compunit.cu_unit_type != DW_UT_type)
+       {
+         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.  */
@@ -2466,11 +2726,12 @@ process_debug_info (struct dwarf_section *section,
        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)
-       warn (_("Debug info is corrupted, abbrev base (%lx) is larger than abbrev section size (%lx)\n"),
-             (unsigned long) abbrev_base,
-             (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
@@ -2570,7 +2831,7 @@ process_debug_info (struct dwarf_section *section,
                  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;
            }
@@ -2608,9 +2869,10 @@ process_debug_info (struct dwarf_section *section,
                arg = debug_information + unit;
              else
                arg = NULL;
-             
+
              tags = read_and_display_attr (attr->attribute,
                                            attr->form,
+                                           attr->implicit_const,
                                            tags,
                                            end,
                                            cu_offset,
@@ -2623,9 +2885,9 @@ process_debug_info (struct dwarf_section *section,
                                            this_set);
            }
 
-         if (entry->children)
-           ++level;
-       }
+         if (entry->children)
+           ++level;
+       }
     }
 
   /* Set num_debug_info_entries here so that it can be used to check if
@@ -2634,7 +2896,7 @@ process_debug_info (struct dwarf_section *section,
       && num_debug_info_entries == 0
       && ! do_types)
     {
-      if (num_units > alloc_num_debug_info_entries)    
+      if (num_units > alloc_num_debug_info_entries)
        num_debug_info_entries = alloc_num_debug_info_entries;
       else
        num_debug_info_entries = num_units;
@@ -2670,7 +2932,7 @@ load_debug_info (void * file)
     return num_debug_info_entries;
 
   /* If this is a DWARF package file, load the CU and TU indexes.  */
-  load_cu_tu_indexes (file);
+  (void) load_cu_tu_indexes (file);
 
   if (load_debug_section (info, file)
       && process_debug_info (&debug_displays [info].section, file, abbrev, 1, 0))
@@ -2698,8 +2960,8 @@ read_debug_line_header (struct dwarf_section * section,
                        unsigned char ** end_of_sequence)
 {
   unsigned char *hdrptr;
-  unsigned int offset_size;
   unsigned int initial_length_size;
+  unsigned char address_size, segment_selector_size;
 
   /* Extract information from the Line Number Program Header.
      (section 6.2.4 in the Dwarf3 doc).  */
@@ -2712,29 +2974,31 @@ read_debug_line_header (struct dwarf_section * section,
     {
       /* This section is 64-bit DWARF 3.  */
       SAFE_BYTE_GET_AND_INC (linfo->li_length, hdrptr, 8, end);
-      offset_size = 8;
+      linfo->li_offset_size = 8;
       initial_length_size = 12;
     }
   else
     {
-      offset_size = 4;
+      linfo->li_offset_size = 4;
       initial_length_size = 4;
     }
 
   if (linfo->li_length + initial_length_size > section->size)
     {
-      /* If the length is just a bias against the initial_length_size then
-        this means that the field has a relocation against it which has not
-        been applied.  (Ie we are dealing with an object file, not a linked
-        binary).  Do not complain but instead assume that the rest of the
-        section applies to this particular header.  */
-      if (linfo->li_length == - initial_length_size)
+      /* 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))
        {
-         linfo->li_length = section->size - initial_length_size;
+         linfo->li_length = (end - data) - initial_length_size;
        }
       else
        {
-         warn (_("The line info appears to be corrupt - the section is too small\n"));
+         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;
        }
     }
@@ -2744,13 +3008,30 @@ read_debug_line_header (struct dwarf_section * section,
 
   if (linfo->li_version != 2
       && linfo->li_version != 3
-      && linfo->li_version != 4)
+      && linfo->li_version != 4
+      && linfo->li_version != 5)
     {
-      warn (_("Only DWARF version 2, 3 and 4 line info is currently supported.\n"));
+      warn (_("Only DWARF version 2, 3, 4 and 5 line info "
+             "is currently supported.\n"));
       return NULL;
     }
 
-  SAFE_BYTE_GET_AND_INC (linfo->li_prologue_length, hdrptr, offset_size, end);
+  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 %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)
@@ -2772,7 +3053,7 @@ read_debug_line_header (struct dwarf_section * section,
   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.  */ 
+  /* PR 17512: file:002-117414-0.004.  */
   if (* end_of_sequence > end)
     {
       warn (_("Line length %s extends beyond end of section\n"),
@@ -2784,15 +3065,131 @@ read_debug_line_header (struct dwarf_section * section,
   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, const char *what)
+{
+  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)
+       {
+         warn (_("Corrupt %s entry format table entry\n"), what);
+         return data;
+       }
+    }
+
+  data_count = read_uleb128 (data, & bytes_read, end);
+  data += bytes_read;
+  if (data == end)
+    {
+      warn (_("Corrupt %s list\n"), what);
+      return data;
+    }
+
+  if (data_count == 0)
+    {
+      printf (_("\n The %s Table is empty.\n"), what);
+      return data;
+    }
+
+  printf (_("\n The %s Table (offset 0x%lx):\n"), what,
+         (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++)
+       {
+         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');
+
+  for (datai = 0; datai < data_count; datai++)
+    {
+      unsigned char *datapass = data;
+
+      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)
+       {
+         warn (_("Corrupt %s entries list\n"), what);
+         return data;
+       }
+      putchar ('\n');
+    }
+  return data;
+}
+
 static int
 display_debug_lines_raw (struct dwarf_section *section,
                         unsigned char *data,
-                         unsigned char *end)
+                        unsigned char *end, void *file)
 {
   unsigned char *start = section->start;
 
   printf (_("Raw dump of debug contents of section %s:\n\n"),
-          section->name);
+         section->name);
 
   while (data < end)
     {
@@ -2800,7 +3197,6 @@ display_debug_lines_raw (struct dwarf_section *section,
       DWARF2_Internal_LineInfo linfo;
       unsigned char *standard_opcodes;
       unsigned char *end_of_sequence;
-      unsigned int last_dir_entry = 0;
       int i;
 
       if (const_strneq (section->name, ".debug_line.")
@@ -2840,7 +3236,7 @@ display_debug_lines_raw (struct dwarf_section *section,
          printf (_("  Offset:                      0x%lx\n"), (long)(data - start));
          printf (_("  Length:                      %ld\n"), (long) linfo.li_length);
          printf (_("  DWARF Version:               %d\n"), linfo.li_version);
-         printf (_("  Prologue Length:             %d\n"), linfo.li_prologue_length);
+         printf (_("  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);
@@ -2855,7 +3251,7 @@ display_debug_lines_raw (struct dwarf_section *section,
              warn (_("Line range of 0 is invalid, using 1 instead\n"));
              linfo.li_line_range = 1;
            }
-         
+
          reset_state_machine (linfo.li_default_is_stmt);
 
          /* Display the contents of the Opcodes table.  */
@@ -2876,67 +3272,82 @@ display_debug_lines_raw (struct dwarf_section *section,
          /* Display the contents of the Directory table.  */
          data = standard_opcodes + linfo.li_opcode_base - 1;
 
-         if (*data == 0)
-           printf (_("\n The Directory Table is empty.\n"));
-         else
+         if (linfo.li_version >= 5)
            {
-             printf (_("\n The Directory Table (offset 0x%lx):\n"),
-                     (long)(data - start));
+             load_debug_section (line_str, file);
 
-             while (data < end && *data != 0)
+             data = display_formatted_table (data, start, end, &linfo, section,
+                                             _("Directory"));
+             data = display_formatted_table (data, start, end, &linfo, section,
+                                             _("File name"));
+           }
+         else
+           {
+             if (*data == 0)
+               printf (_("\n The Directory Table is empty.\n"));
+             else
                {
-                 printf ("  %d\t%.*s\n", ++last_dir_entry, (int) (end - data), data);
-
-                 data += strnlen ((char *) data, end - data) + 1;
-               }
+                 unsigned int last_dir_entry = 0;
 
-             /* PR 17512: file: 002-132094-0.004.  */
-             if (data >= end - 1)
-               break;
-           }
+                 printf (_("\n The Directory Table (offset 0x%lx):\n"),
+                         (long)(data - start));
 
-         /* Skip the NUL at the end of the table.  */
-         data++;
+                 while (data < end && *data != 0)
+                   {
+                     printf ("  %d\t%.*s\n", ++last_dir_entry, (int) (end - data), data);
 
-         /* Display the contents of the File Name table.  */
-         if (*data == 0)
-           printf (_("\n The File Name Table is empty.\n"));
-         else
-           {
-             printf (_("\n The File Name Table (offset 0x%lx):\n"),
-                     (long)(data - start));
-             printf (_("  Entry\tDir\tTime\tSize\tName\n"));
+                     data += strnlen ((char *) data, end - data) + 1;
+                   }
 
-             while (data < end && *data != 0)
-               {
-                 unsigned char *name;
-                 unsigned int bytes_read;
+                 /* PR 17512: file: 002-132094-0.004.  */
+                 if (data >= end - 1)
+                   break;
+               }
 
-                 printf ("  %d\t", ++state_machine_regs.last_file_entry);
-                 name = data;
-                 data += strnlen ((char *) data, end - data) + 1;
+             /* Skip the NUL at the end of the table.  */
+             data++;
 
-                 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);
+             /* Display the contents of the File Name table.  */
+             if (*data == 0)
+               printf (_("\n The File Name Table is empty.\n"));
+             else
+               {
+                 printf (_("\n The File Name Table (offset 0x%lx):\n"),
+                         (long)(data - start));
+                 printf (_("  Entry\tDir\tTime\tSize\tName\n"));
 
-                 if (data == end)
+                 while (data < end && *data != 0)
                    {
-                     warn (_("Corrupt file name table entry\n"));
-                     break;
+                     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;
+                       }
                    }
                }
+
+             /* Skip the NUL at the end of the table.  */
+             data++;
            }
 
-         /* Skip the NUL at the end of the table.  */
-         data++;
          putchar ('\n');
          saved_linfo = linfo;
        }
@@ -3150,12 +3561,12 @@ typedef struct
 static int
 display_debug_lines_decoded (struct dwarf_section *section,
                             unsigned char *data,
-                            unsigned char *end)
+                            unsigned char *end, void *fileptr)
 {
   static DWARF2_Internal_LineInfo saved_linfo;
 
   printf (_("Decoded dump of debug contents of section %s:\n\n"),
-          section->name);
+         section->name);
 
   while (data < end)
     {
@@ -3167,13 +3578,13 @@ display_debug_lines_decoded (struct dwarf_section *section,
       File_Entry *file_table = NULL;
       unsigned int n_files = 0;
       unsigned char **directory_table = NULL;
-      unsigned int n_directories = 0;
+      dwarf_vma n_directories = 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;
@@ -3185,9 +3596,9 @@ display_debug_lines_decoded (struct dwarf_section *section,
              return 0;
            }
          reset_state_machine (linfo.li_default_is_stmt);
-        }
+       }
       else
-        {
+       {
          unsigned char *hdrptr;
 
          if ((hdrptr = read_debug_line_header (section, data, end, & linfo,
@@ -3207,117 +3618,326 @@ display_debug_lines_decoded (struct dwarf_section *section,
 
          /* Traverse the Directory table just to count entries.  */
          data = standard_opcodes + linfo.li_opcode_base - 1;
-         if (*data != 0)
+         /* PR 20440 */
+         if (data >= end)
+           {
+             warn (_("opcode base of %d extends beyond end of section\n"),
+                   linfo.li_opcode_base);
+             return 0;
+           }
+
+         if (linfo.li_version >= 5)
            {
-             unsigned char *ptr_directory_table = data;
+             unsigned char *format_start, format_count, *format;
+             dwarf_vma formati, entryi;
+             unsigned int bytes_read;
+
+             load_debug_section (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;
+               }
 
-             while (*data != 0)
+             n_directories = read_uleb128 (data, & bytes_read, end);
+             data += bytes_read;
+             if (data == end)
                {
-                 data += strnlen ((char *) data, end - data) + 1;
-                 n_directories++;
+                 warn (_("Corrupt directories list\n"));
+                 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)
+             for (entryi = 0; entryi < n_directories; entryi++)
                {
-                 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++;
+                 unsigned char **pathp = &directory_table[entryi];
 
-         /* Traverse the File Name table just to count the entries.  */
-         if (*data != 0)
-           {
-             unsigned char *ptr_file_name_table = data;
+                 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;
+                   }
+               }
 
-             while (*data != 0)
+             /* Skip files format.  */
+             SAFE_BYTE_GET_AND_INC (format_count, data, 1, end);
+             format_start = data;
+             for (formati = 0; formati < format_count; formati++)
                {
-                 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++;
                }
 
-             /* 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)
+             n_files = read_uleb128 (data, & bytes_read, end);
+             data += bytes_read;
+             if (data == end)
                {
-                 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++;
+                 warn (_("Corrupt file name list\n"));
+                 break;
                }
-             i = 0;
 
-             /* Print the Compilation Unit's name and a header.  */
-             if (directory_table == NULL)
+             file_table = (File_Entry *) xcalloc (1, n_files
+                                                     * sizeof (File_Entry));
+
+             for (entryi = 0; entryi < n_files; entryi++)
                {
-                 printf (_("CU: %s:\n"), file_table[0].name);
-                 printf (_("File name                            Line number    Starting address\n"));
-               }
-             else
+                 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 int ix = file_table[0].directory_index;
-                 const char *directory = ix ? (char *)directory_table[ix - 1] : ".";
+                 unsigned char *ptr_directory_table = data;
 
-                 if (do_wide || strlen (directory) < 76)
-                   printf (_("CU: %s/%s:\n"), directory, file_table[0].name);
-                 else
-                   printf ("%s:\n", file_table[0].name);
+                 while (data < end && *data != 0)
+                   {
+                     data += strnlen ((char *) data, end - data) + 1;
+                     n_directories++;
+                   }
 
-                 printf (_("File name                            Line number    Starting address\n"));
+                 /* 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++;
            }
 
-         /* 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\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 adv;
+         unsigned long int uladv;
+         unsigned int bytes_read;
+         int is_special_opcode = 0;
 
-          op_code = *data++;
+         op_code = *data++;
 
-          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);
@@ -3337,11 +3957,11 @@ display_debug_lines_decoded (struct dwarf_section *section,
                    % linfo.li_max_ops_per_insn;
                }
 
-              adv = (op_code % linfo.li_line_range) + linfo.li_line_base;
-              state_machine_regs.line += adv;
-              is_special_opcode = 1;
-            }
-          else switch (op_code)
+             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:
                   {
@@ -3447,20 +4067,36 @@ display_debug_lines_decoded (struct dwarf_section *section,
                   data += bytes_read;
                   state_machine_regs.file = adv;
 
-                  if (file_table == NULL)
-                    printf (_("\n [Use file table entry %d]\n"), state_machine_regs.file - 1);
-                  else if (file_table[state_machine_regs.file - 1].directory_index == 0)
-                    /* If directory index is 0, that means current directory.  */
-                    printf ("\n./%s:[++]\n",
-                            file_table[state_machine_regs.file - 1].name);
-                  else if (directory_table == NULL)
-                    printf (_("\n [Use directory table entry %d]\n"),
-                            file_table[state_machine_regs.file - 1].directory_index - 1);
-                  else
-                    /* The directory index starts counting at 1.  */
-                    printf ("\n%s/%s:\n",
-                            directory_table[file_table[state_machine_regs.file - 1].directory_index - 1],
-                            file_table[state_machine_regs.file - 1].name);
+                  {
+                    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:
@@ -3531,39 +4167,49 @@ display_debug_lines_decoded (struct dwarf_section *section,
                   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)
+         /* 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 *newFileName = NULL;
-              size_t fileNameLength;
+           {
+             const unsigned int MAX_FILENAME_LENGTH = 35;
+             char *fileName;
+             char *newFileName = NULL;
+             size_t fileNameLength;
 
              if (file_table)
-               fileName = (char *) file_table[state_machine_regs.file - 1].name;
+               {
+                 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>";
+               fileName = _("<unknown>");
 
              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 ((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 (linfo.li_max_ops_per_insn == 1)
                    printf ("%-35s  %11d  %#18" DWARF_VMA_FMT "x\n",
                            newFileName, state_machine_regs.line,
@@ -3573,9 +4219,9 @@ display_debug_lines_decoded (struct dwarf_section *section,
                            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  %#18" DWARF_VMA_FMT "x\n",
                            newFileName, state_machine_regs.line,
@@ -3585,14 +4231,14 @@ display_debug_lines_decoded (struct dwarf_section *section,
                            newFileName, state_machine_regs.line,
                            state_machine_regs.address,
                            state_machine_regs.op_index);
-                }
+               }
 
-              if (op_code == DW_LNE_end_sequence)
+             if (op_code == DW_LNE_end_sequence)
                printf ("\n");
 
-              free (newFileName);
-            }
-        }
+             free (newFileName);
+           }
+       }
 
       if (file_table)
        {
@@ -3615,7 +4261,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;
@@ -3626,10 +4272,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;
@@ -3689,7 +4335,8 @@ display_debug_pubnames_worker (struct dwarf_section *section,
   while (start < end)
     {
       unsigned char *data;
-      unsigned long offset;
+      unsigned char *adr;
+      dwarf_vma offset;
       unsigned int offset_size, initial_length_size;
 
       data = start;
@@ -3718,14 +4365,17 @@ display_debug_pubnames_worker (struct dwarf_section *section,
 
       SAFE_BYTE_GET_AND_INC (names.pn_size, data, offset_size, end);
 
+      adr = start + names.pn_length + initial_length_size;
       /* PR 17531: file: 7615b6b2.  */
-      if ((dwarf_signed_vma) names.pn_length < 0)
+      if ((dwarf_signed_vma) names.pn_length < 0
+         /* PR 17531: file: a5dbeaa7. */
+         || adr < start)
        {
          warn (_("Negative length for public name: 0x%lx\n"), (long) names.pn_length);
          start = end;
        }
       else
-       start += names.pn_length + initial_length_size;
+       start = adr;
 
       printf (_("  Length:                              %ld\n"),
              (long) names.pn_length);
@@ -3766,7 +4416,7 @@ display_debug_pubnames_worker (struct dwarf_section *section,
              if (data >= end)
                break;
              maxprint = (end - data) - 1;
-             
+
              if (is_gnu)
                {
                  unsigned int kind_data;
@@ -3786,11 +4436,12 @@ display_debug_pubnames_worker (struct dwarf_section *section,
                  kind_name = get_gdb_index_symbol_kind_name (kind);
                  is_static = GDB_INDEX_SYMBOL_STATIC_VALUE (kind_data);
                  printf ("    %-6lx  %s,%-10s  %.*s\n",
-                         offset, is_static ? _("s") : _("g"),
+                         (unsigned long) offset, is_static ? _("s") : _("g"),
                          kind_name, (int) maxprint, data);
                }
              else
-               printf ("    %-6lx\t%.*s\n", offset, (int) maxprint, data);
+               printf ("    %-6lx\t%.*s\n",
+                       (unsigned long) offset, (int) maxprint, data);
 
              data += strnlen ((char *) data, maxprint) + 1;
              if (data >= end)
@@ -4001,9 +4652,9 @@ display_debug_macro (struct dwarf_section *section,
       unsigned char **extended_ops = NULL;
 
       SAFE_BYTE_GET_AND_INC (version, curr, 2, end);
-      if (version != 4)
+      if (version != 4 && version != 5)
        {
-         error (_("Only GNU extension to DWARF 4 of %s is currently supported.\n"),
+         error (_("Only GNU extension to DWARF 4 or 5 of %s is currently supported.\n"),
                 section->name);
          return 0;
        }
@@ -4040,10 +4691,10 @@ display_debug_macro (struct dwarf_section *section,
                  nargs = read_uleb128 (curr, &bytes_read, end);
                  curr += bytes_read;
                  if (nargs == 0)
-                   printf (_("    DW_MACRO_GNU_%02x has no arguments\n"), op);
+                   printf (_("    DW_MACRO_%02x has no arguments\n"), op);
                  else
                    {
-                     printf (_("    DW_MACRO_GNU_%02x arguments: "), op);
+                     printf (_("    DW_MACRO_%02x arguments: "), op);
                      for (n = 0; n < nargs; n++)
                        {
                          unsigned int form;
@@ -4096,7 +4747,7 @@ display_debug_macro (struct dwarf_section *section,
 
          switch (op)
            {
-           case DW_MACRO_GNU_start_file:
+           case DW_MACRO_start_file:
              {
                unsigned int filenum;
                unsigned char *file_name = NULL, *dir_name = NULL;
@@ -4107,87 +4758,87 @@ display_debug_macro (struct dwarf_section *section,
                curr += bytes_read;
 
                if ((flags & 2) == 0)
-                 error (_("DW_MACRO_GNU_start_file used, but no .debug_line offset provided.\n"));
+                 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_GNU_start_file - lineno: %d filenum: %d\n"),
+                 printf (_(" DW_MACRO_start_file - lineno: %d filenum: %d\n"),
                          lineno, filenum);
                else
-                 printf (_(" DW_MACRO_GNU_start_file - lineno: %d filenum: %d filename: %s%s%s\n"),
+                 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;
 
-           case DW_MACRO_GNU_end_file:
-             printf (_(" DW_MACRO_GNU_end_file\n"));
+           case DW_MACRO_end_file:
+             printf (_(" DW_MACRO_end_file\n"));
              break;
 
-           case DW_MACRO_GNU_define:
+           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_GNU_define - lineno : %d macro : %s\n"),
+             printf (_(" DW_MACRO_define - lineno : %d macro : %s\n"),
                      lineno, string);
              break;
 
-           case DW_MACRO_GNU_undef:
+           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_GNU_undef - lineno : %d macro : %s\n"),
+             printf (_(" DW_MACRO_undef - lineno : %d macro : %s\n"),
                      lineno, string);
              break;
 
-           case DW_MACRO_GNU_define_indirect:
+           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_GNU_define_indirect - lineno : %d macro : %s\n"),
+             printf (_(" DW_MACRO_define_strp - lineno : %d macro : %s\n"),
                      lineno, string);
              break;
 
-           case DW_MACRO_GNU_undef_indirect:
+           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_GNU_undef_indirect - lineno : %d macro : %s\n"),
+             printf (_(" DW_MACRO_undef_strp - lineno : %d macro : %s\n"),
                      lineno, string);
              break;
 
-           case DW_MACRO_GNU_transparent_include:
+           case DW_MACRO_import:
              SAFE_BYTE_GET_AND_INC (offset, curr, offset_size, end);
-             printf (_(" DW_MACRO_GNU_transparent_include - offset : 0x%lx\n"),
+             printf (_(" DW_MACRO_import - offset : 0x%lx\n"),
                      (unsigned long) offset);
              break;
 
-           case DW_MACRO_GNU_define_indirect_alt:
+           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_GNU_define_indirect_alt - lineno : %d macro offset : 0x%lx\n"),
+             printf (_(" DW_MACRO_define_sup - lineno : %d macro offset : 0x%lx\n"),
                      lineno, (unsigned long) offset);
              break;
 
-           case DW_MACRO_GNU_undef_indirect_alt:
+           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_GNU_undef_indirect_alt - lineno : %d macro offset : 0x%lx\n"),
+             printf (_(" DW_MACRO_undef_sup - lineno : %d macro offset : 0x%lx\n"),
                      lineno, (unsigned long) offset);
              break;
 
-           case DW_MACRO_GNU_transparent_include_alt:
+           case DW_MACRO_import_sup:
              SAFE_BYTE_GET_AND_INC (offset, curr, offset_size, end);
-             printf (_(" DW_MACRO_GNU_transparent_include_alt - offset : 0x%lx\n"),
+             printf (_(" DW_MACRO_import_sup - offset : 0x%lx\n"),
                      (unsigned long) offset);
              break;
 
@@ -4206,20 +4857,21 @@ display_debug_macro (struct dwarf_section *section,
                  desc += bytes_read;
                  if (nargs == 0)
                    {
-                     printf (_(" DW_MACRO_GNU_%02x\n"), op);
+                     printf (_(" DW_MACRO_%02x\n"), op);
                      break;
                    }
-                 printf (_(" DW_MACRO_GNU_%02x -"), op);
+                 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,
+                       = read_and_display_attr_value (0, val, 0,
                                                       curr, end, 0, 0, offset_size,
                                                       version, NULL, 0, NULL,
-                                                      NULL);
+                                                      NULL, ' ');
                      if (n != nargs - 1)
                        printf (",");
                    }
@@ -4230,7 +4882,7 @@ display_debug_macro (struct dwarf_section *section,
        }
 
       printf ("\n");
-    }  
+    }
 
   return 1;
 }
@@ -4269,9 +4921,14 @@ display_debug_abbrev (struct dwarf_section *section,
                  entry->children ? _("has children") : _("no children"));
 
          for (attr = entry->first_attr; attr; attr = attr->next)
-           printf ("    %-18s %s\n",
-                   get_AT_name (attr->attribute),
-                   get_FORM_name (attr->form));
+           {
+             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);
@@ -4281,15 +4938,25 @@ display_debug_abbrev (struct dwarf_section *section,
   return 1;
 }
 
+/* Return true when ADDR is the maximum address, when addresses are
+   POINTER_SIZE bytes long.  */
+
+static bfd_boolean
+is_max_address (dwarf_vma addr, unsigned int pointer_size)
+{
+  dwarf_vma mask = ~(~(dwarf_vma) 1 << (pointer_size * 8 - 1));
+  return ((addr & mask) == mask);
+}
+
 /* Display a location list from a normal (ie, non-dwo) .debug_loc section.  */
 
 static void
 display_loc_list (struct dwarf_section *section,
-                  unsigned char **start_ptr,
-                  unsigned int debug_info_entry,
-                  unsigned long offset,
-                  unsigned long base_address,
-                  int has_frame_base)
+                 unsigned char **start_ptr,
+                 unsigned int debug_info_entry,
+                 dwarf_vma offset,
+                 dwarf_vma base_address,
+                 int has_frame_base)
 {
   unsigned char *start = *start_ptr;
   unsigned char *section_end = section->start + section->size;
@@ -4309,12 +4976,12 @@ display_loc_list (struct dwarf_section *section,
            debug_info_entry);
       return;
     }
-  
+
   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 (_("Invalid pointer size (%d) in debug info for entry %d\n"),
@@ -4324,73 +4991,206 @@ display_loc_list (struct dwarf_section *section,
 
   while (1)
     {
+      dwarf_vma off = offset + (start - *start_ptr);
+
       if (start + 2 * pointer_size > section_end)
-        {
-          warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
-                offset);
-          break;
-        }
-
-      printf ("    %8.8lx ", offset + (start - *start_ptr));
-
-      /* Note: we use sign extension here in order to be sure that we can detect
-         the -1 escape value.  Sign extension into the top 32 bits of a 32-bit
-         address will not affect the values that we display since we always show
-         hex values, and always the bottom 32-bits.  */
+       {
+         warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
+               (unsigned long) offset);
+         break;
+       }
+
+      printf ("    %8.8lx ", (unsigned long) off);
+
       SAFE_BYTE_GET_AND_INC (begin, start, pointer_size, section_end);
       SAFE_BYTE_GET_AND_INC (end, start, pointer_size, section_end);
 
       if (begin == 0 && end == 0)
-        {
-          printf (_("<End of list>\n"));
-          break;
-        }
+       {
+         /* 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;
+           }
+       }
 
       /* 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 (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;
+       }
 
       if (start + 2 > section_end)
-        {
-          warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
-                offset);
-          break;
-        }
+       {
+         warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
+               (unsigned long) offset);
+         break;
+       }
 
       SAFE_BYTE_GET_AND_INC (length, start, 2, section_end);
 
       if (start + length > section_end)
-        {
-          warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
-                offset);
-          break;
-        }
+       {
+         warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
+               (unsigned long) offset);
+         break;
+       }
+
+      print_dwarf_vma (begin + base_address, pointer_size);
+      print_dwarf_vma (end + base_address, pointer_size);
+
+      putchar ('(');
+      need_frame_base = decode_location_expression (start,
+                                                   pointer_size,
+                                                   offset_size,
+                                                   dwarf_version,
+                                                   length,
+                                                   cu_offset, section);
+      putchar (')');
+
+      if (need_frame_base && !has_frame_base)
+       printf (_(" [without DW_AT_frame_base]"));
+
+      if (begin == end)
+       fputs (_(" (start == end)"), stdout);
+      else if (begin > end)
+       fputs (_(" (start > end)"), stdout);
+
+      putchar ('\n');
+
+      start += length;
+    }
+
+  *start_ptr = start;
+}
+
+/* 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,
+                      int has_frame_base)
+{
+  unsigned char *start = *start_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;
+
+  /* Initialize it due to a false compiler warning.  */
+  dwarf_vma begin = -1;
+  dwarf_vma end = -1;
+  dwarf_vma length;
+  int need_frame_base;
+
+  if (debug_info_entry >= num_debug_info_entries)
+    {
+      warn (_("No debug information available for "
+             "loclists lists of entry: %u\n"),
+           debug_info_entry);
+      return;
+    }
+
+  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 (_("Invalid pointer size (%d) in debug info for entry %d\n"),
+           pointer_size, debug_info_entry);
+      return;
+    }
+
+  while (1)
+    {
+      dwarf_vma off = offset + (start - *start_ptr);
+      enum dwarf_location_list_entry_type llet;
+
+      if (start + 1 > section_end)
+       {
+         warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
+               (unsigned long) offset);
+         break;
+       }
+
+      printf ("    %8.8lx ", (unsigned long) off);
+
+      SAFE_BYTE_GET_AND_INC (llet, start, 1, section_end);
+
+      switch (llet)
+       {
+       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;
+       default:
+         error (_("Invalid location list entry type %d\n"), llet);
+         return;
+       }
+      if (llet == DW_LLE_end_of_list)
+       break;
+      if (llet != DW_LLE_offset_pair)
+       continue;
+
+      if (start + 2 > section_end)
+       {
+         warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
+               (unsigned long) offset);
+         break;
+       }
+
+      length = read_uleb128 (start, &bytes_read, section_end);
+      start += bytes_read;
 
       print_dwarf_vma (begin + base_address, pointer_size);
       print_dwarf_vma (end + base_address, pointer_size);
 
       putchar ('(');
       need_frame_base = decode_location_expression (start,
-                                                    pointer_size,
-                                                    offset_size,
-                                                    dwarf_version,
-                                                    length,
-                                                    cu_offset, section);
+                                                   pointer_size,
+                                                   offset_size,
+                                                   dwarf_version,
+                                                   length,
+                                                   cu_offset, section);
       putchar (')');
 
       if (need_frame_base && !has_frame_base)
-        printf (_(" [without DW_AT_frame_base]"));
+       printf (_(" [without DW_AT_frame_base]"));
 
       if (begin == end)
-        fputs (_(" (start == end)"), stdout);
+       fputs (_(" (start == end)"), stdout);
       else if (begin > end)
-        fputs (_(" (start > end)"), stdout);
+       fputs (_(" (start > end)"), stdout);
 
       putchar ('\n');
 
@@ -4417,10 +5217,10 @@ print_addr_index (unsigned int idx, unsigned int len)
 
 static void
 display_loc_list_dwo (struct dwarf_section *section,
-                      unsigned char **start_ptr,
-                      unsigned int debug_info_entry,
-                      unsigned long offset,
-                      int has_frame_base)
+                     unsigned char **start_ptr,
+                     unsigned int debug_info_entry,
+                     dwarf_vma offset,
+                     int has_frame_base)
 {
   unsigned char *start = *start_ptr;
   unsigned char *section_end = section->start + section->size;
@@ -4455,82 +5255,82 @@ display_loc_list_dwo (struct dwarf_section *section,
 
   while (1)
     {
-      printf ("    %8.8lx ", offset + (start - *start_ptr));
+      printf ("    %8.8lx ", (unsigned long) (offset + (start - *start_ptr)));
 
       if (start >= section_end)
-        {
-          warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
-                offset);
-          break;
-        }
+       {
+         warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
+               (unsigned long) offset);
+         break;
+       }
 
       SAFE_BYTE_GET_AND_INC (entry_type, start, 1, section_end);
       switch (entry_type)
-        {
-          case 0: /* A terminating entry.  */
-            *start_ptr = start;
-           printf (_("<End of list>\n"));
-            return;
-          case 1: /* A base-address entry.  */
-            idx = read_uleb128 (start, &bytes_read, section_end);
-            start += bytes_read;
-            print_addr_index (idx, 8);
-            printf ("         ");
-            printf (_("(base address selection entry)\n"));
-            continue;
-          case 2: /* A start/end entry.  */
-            idx = read_uleb128 (start, &bytes_read, section_end);
-            start += bytes_read;
-            print_addr_index (idx, 8);
-            idx = read_uleb128 (start, &bytes_read, section_end);
-            start += bytes_read;
-            print_addr_index (idx, 8);
-            break;
-          case 3: /* A start/length entry.  */
-            idx = read_uleb128 (start, &bytes_read, section_end);
-            start += bytes_read;
-            print_addr_index (idx, 8);
-           SAFE_BYTE_GET_AND_INC (idx, start, 4, section_end);
-            printf ("%08x ", idx);
-            break;
-          case 4: /* An offset pair entry.  */
-           SAFE_BYTE_GET_AND_INC (idx, start, 4, section_end);
-            printf ("%08x ", idx);
-           SAFE_BYTE_GET_AND_INC (idx, start, 4, section_end);
-            printf ("%08x ", idx);
-            break;
-          default:
-            warn (_("Unknown location list entry type 0x%x.\n"), entry_type);
-            *start_ptr = start;
-            return;
-        }
+       {
+       case 0: /* A terminating entry.  */
+         *start_ptr = start;
+         printf (_("<End of list>\n"));
+         return;
+       case 1: /* A base-address entry.  */
+         idx = read_uleb128 (start, &bytes_read, section_end);
+         start += bytes_read;
+         print_addr_index (idx, 8);
+         printf ("         ");
+         printf (_("(base address selection entry)\n"));
+         continue;
+       case 2: /* A start/end entry.  */
+         idx = read_uleb128 (start, &bytes_read, section_end);
+         start += bytes_read;
+         print_addr_index (idx, 8);
+         idx = read_uleb128 (start, &bytes_read, section_end);
+         start += bytes_read;
+         print_addr_index (idx, 8);
+         break;
+       case 3: /* A start/length entry.  */
+         idx = read_uleb128 (start, &bytes_read, section_end);
+         start += bytes_read;
+         print_addr_index (idx, 8);
+         SAFE_BYTE_GET_AND_INC (idx, start, 4, section_end);
+         printf ("%08x ", idx);
+         break;
+       case 4: /* An offset pair entry.  */
+         SAFE_BYTE_GET_AND_INC (idx, start, 4, section_end);
+         printf ("%08x ", idx);
+         SAFE_BYTE_GET_AND_INC (idx, start, 4, section_end);
+         printf ("%08x ", idx);
+         break;
+       default:
+         warn (_("Unknown location list entry type 0x%x.\n"), entry_type);
+         *start_ptr = start;
+         return;
+       }
 
       if (start + 2 > section_end)
-        {
-          warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
-                offset);
-          break;
-        }
+       {
+         warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
+               (unsigned long) offset);
+         break;
+       }
 
       SAFE_BYTE_GET_AND_INC (length, start, 2, section_end);
       if (start + length > section_end)
-        {
-          warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
-                offset);
-          break;
-        }
+       {
+         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);
+                                                   pointer_size,
+                                                   offset_size,
+                                                   dwarf_version,
+                                                   length,
+                                                   cu_offset, section);
       putchar (')');
 
       if (need_frame_base && !has_frame_base)
-        printf (_(" [without DW_AT_frame_base]"));
+       printf (_(" [without DW_AT_frame_base]"));
 
       putchar ('\n');
 
@@ -4564,13 +5364,14 @@ display_debug_loc (struct dwarf_section *section, void *file)
   unsigned int first = 0;
   unsigned int i;
   unsigned int j;
-  unsigned int k;
   int seen_first_offset = 0;
   int locs_sorted = 1;
   unsigned char *next;
   unsigned int *array = NULL;
   const char *suffix = strrchr (section->name, '.');
   int is_dwo = 0;
+  int is_loclists = strstr (section->name, "debug_loclists") != NULL;
+  dwarf_vma expected_start = 0;
 
   if (suffix && strcmp (suffix, ".dwo") == 0)
     is_dwo = 1;
@@ -4583,6 +5384,51 @@ display_debug_loc (struct dwarf_section *section, void *file)
       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)
+       {
+         warn (_("The %s section contains corrupt or "
+                 "unsupported version number: %d.\n"),
+               section->name, ll_version);
+         return 0;
+       }
+
+      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 %s section contains "
+                 "unsupported segment selector size: %d.\n"),
+               section->name, segment_selector_size);
+         return 0;
+       }
+
+      SAFE_BYTE_GET_AND_INC (offset_entry_count, hdrptr, 4, end);
+      if (offset_entry_count != 0)
+       {
+         warn (_("The %s section contains "
+                 "unsupported offset entry count: %d.\n"),
+               section->name, offset_entry_count);
+         return 0;
+       }
+
+      expected_start = hdrptr - section_begin;
+    }
+
   if (load_debug_info (file) == 0)
     {
       warn (_("Unable to load/parse the .debug_info section, so cannot interpret the %s section.\n"),
@@ -4632,7 +5478,7 @@ display_debug_loc (struct dwarf_section *section, void *file)
     error (_("No location lists in .debug_info section!\n"));
 
   if (debug_information [first].num_loc_offsets > 0
-      && debug_information [first].loc_offsets [0] != 0)
+      && debug_information [first].loc_offsets [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]));
@@ -4640,13 +5486,16 @@ display_debug_loc (struct dwarf_section *section, void *file)
   if (!locs_sorted)
     array = (unsigned int *) xcmalloc (num_loc_list, sizeof (unsigned int));
   printf (_("Contents of the %s section:\n\n"), section->name);
-  printf (_("    Offset   Begin    End      Expression\n"));
+  if (reloc_at (section, 0))
+    printf (_(" Warning: This section has relocations - addresses seen here may not be accurate.\n\n"));
+  printf (_("    Offset   Begin            End              Expression\n"));
 
   seen_first_offset = 0;
   for (i = first; i < num_debug_info_entries; i++)
     {
-      unsigned long offset;
-      unsigned long base_address;
+      dwarf_vma offset;
+      dwarf_vma base_address;
+      unsigned int k;
       int has_frame_base;
 
       if (!locs_sorted)
@@ -4678,26 +5527,38 @@ display_debug_loc (struct dwarf_section *section, void *file)
              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));
+                     (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) (next - section_begin));
+                     (unsigned long) offset);
            }
          start = next;
 
          if (offset >= bytes)
            {
              warn (_("Offset 0x%lx is bigger than .debug_loc section size.\n"),
-                   offset);
+                   (unsigned long) offset);
              continue;
            }
 
-          if (is_dwo)
-            display_loc_list_dwo (section, &start, i, offset, has_frame_base);
-          else
-            display_loc_list (section, &start, i, offset, base_address,
-                              has_frame_base);
+         if (!is_loclists)
+           {
+             if (is_dwo)
+               display_loc_list_dwo (section, &start, i, offset,
+                                     has_frame_base);
+             else
+               display_loc_list (section, &start, i, offset, base_address,
+                                 has_frame_base);
+           }
+         else
+           {
+             if (is_dwo)
+               warn (_("DWO is not yet supported.\n"));
+             else
+               display_loclists_list (section, &start, i, offset, base_address,
+                                      has_frame_base);
+           }
        }
     }
 
@@ -4839,7 +5700,12 @@ display_debug_aranges (struct dwarf_section *section,
 
       if (arange.ar_version != 2 && arange.ar_version != 3)
        {
-         warn (_("Only DWARF 2 and 3 aranges are currently supported.\n"));
+         /* 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;
        }
 
@@ -4882,7 +5748,13 @@ display_debug_aranges (struct dwarf_section *section,
       if (excess)
        addr_ranges += (2 * address_size) - excess;
 
-      start += arange.ar_length + initial_length_size;
+      hdrptr = start + arange.ar_length + initial_length_size;
+      if (hdrptr < start || hdrptr > end)
+       {
+         error (_("Excessive header length: %lx\n"), (long) arange.ar_length);
+         break;
+       }
+      start = hdrptr;
 
       while (addr_ranges + 2 * address_size <= start)
        {
@@ -4913,7 +5785,7 @@ comp_addr_base (const void * v0, const void * v1)
 /* Display the debug_addr section.  */
 static int
 display_debug_addr (struct dwarf_section *section,
-                    void *file)
+                   void *file)
 {
   debug_info **debug_addr_info;
   unsigned char *entry;
@@ -4941,7 +5813,7 @@ display_debug_addr (struct dwarf_section *section,
      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 *));
+                                            sizeof (debug_info *));
 
   count = 0;
   for (i = 0; i < num_debug_info_entries; i++)
@@ -4966,21 +5838,21 @@ display_debug_addr (struct dwarf_section *section,
       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));
+             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++;
-        }
+       {
+         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");
 
@@ -4991,7 +5863,7 @@ display_debug_addr (struct dwarf_section *section,
 /* 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)
+                          void *file ATTRIBUTE_UNUSED)
 {
   if (section->size == 0)
     {
@@ -5009,7 +5881,7 @@ display_debug_str_offsets (struct dwarf_section *section,
 struct range_entry
 {
   /* The debug_information[x].range_lists[y] value.  */
-  unsigned long ranges_offset;
+  dwarf_vma ranges_offset;
 
   /* Original debug_information to find parameters of the data.  */
   debug_info *debug_info_p;
@@ -5022,12 +5894,132 @@ 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;
+  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)
@@ -5039,11 +6031,86 @@ display_debug_ranges (struct dwarf_section *section,
   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;
+           }
+       }
 
-  if (bytes == 0)
-    {
-      printf (_("\nThe %s section is empty.\n"), section->name);
-      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)
@@ -5060,7 +6127,7 @@ display_debug_ranges (struct dwarf_section *section,
   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.  */
+        which removes references to range lists from the primary .o file.  */
       printf (_("No range lists in .debug_info section.\n"));
       return 1;
     }
@@ -5087,7 +6154,7 @@ display_debug_ranges (struct dwarf_section *section,
 
   if (dwarf_check != 0 && range_entries[0].ranges_offset != 0)
     warn (_("Range lists in %s section start at 0x%lx\n"),
-         section->name, range_entries[0].ranges_offset);
+         section->name, (unsigned long) range_entries[0].ranges_offset);
 
   printf (_("Contents of the %s section:\n\n"), section->name);
   printf (_("    Offset   Begin    End\n"));
@@ -5097,11 +6164,11 @@ display_debug_ranges (struct dwarf_section *section,
       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;
+      dwarf_vma offset;
       unsigned char *next;
-      unsigned long base_address;
+      dwarf_vma base_address;
 
-      pointer_size = debug_info_p->pointer_size;
+      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;
@@ -5110,10 +6177,10 @@ display_debug_ranges (struct dwarf_section *section,
       if (pointer_size < 2 || pointer_size > 8)
        {
          warn (_("Corrupt pointer size (%d) in debug entry at offset %8.8lx\n"),
-               pointer_size, offset);
+               pointer_size, (unsigned long) offset);
          continue;
        }
-      
+
       if (dwarf_check != 0 && i > 0)
        {
          if (start < next)
@@ -5132,49 +6199,8 @@ display_debug_ranges (struct dwarf_section *section,
       start = next;
       last_start = next;
 
-      while (start < finish)
-       {
-         dwarf_vma begin;
-         dwarf_vma end;
-
-         /* Note: we use sign extension here in order to be sure that
-            we can detect the -1 escape value.  Sign extension into the
-            top 32 bits of a 32-bit address will not affect the values
-            that we display since we always show hex values, and always
-            the bottom 32-bits.  */
-         SAFE_BYTE_GET_AND_INC (begin, start, pointer_size, 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 (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;
-           }
-
-         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');
-       }
+      (is_rnglists ? display_debug_rnglists_list : display_debug_ranges_list)
+       (start, finish, pointer_size, offset, base_address);
     }
   putchar ('\n');
 
@@ -5197,7 +6223,7 @@ typedef struct Frame_Chunk
   dwarf_vma pc_begin;
   dwarf_vma pc_range;
   int cfa_reg;
-  int cfa_offset;
+  dwarf_vma cfa_offset;
   unsigned int ra;
   unsigned char fde_encoding;
   unsigned char cfa_exp;
@@ -5245,9 +6271,9 @@ frame_need_space (Frame_Chunk *fc, unsigned int reg)
     }
 
   fc->col_type = (short int *) xcrealloc (fc->col_type, fc->ncols,
-                                          sizeof (short int));
+                                         sizeof (short int));
   fc->col_offset = (int *) xcrealloc (fc->col_offset, fc->ncols, sizeof (int));
-  /* PR 17512: file:002-10025-0.005.  */ 
+  /* 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"),
@@ -5289,6 +6315,27 @@ static const char *const dwarf_regnames_i386[] =
   "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)
 {
@@ -5296,6 +6343,13 @@ init_dwarf_regnames_i386 (void)
   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",
@@ -5337,16 +6391,16 @@ init_dwarf_regnames_x86_64 (void)
 
 static const char *const dwarf_regnames_aarch64[] =
 {
-   "x0",  "x1",  "x2",  "x3",  "x4",  "x5",  "x6",  "x7", 
-   "x8",  "x9", "x10", "x11", "x12", "x13", "x14", "x15", 
+   "x0",  "x1",  "x2",  "x3",  "x4",  "x5",  "x6",  "x7",
+   "x8",  "x9", "x10", "x11", "x12", "x13", "x14", "x15",
   "x16", "x17", "x18", "x19", "x20", "x21", "x22", "x23",
   "x24", "x25", "x26", "x27", "x28", "x29", "x30", "sp",
    NULL, "elr",  NULL,  NULL,  NULL,  NULL,  NULL,  NULL,
    NULL,  NULL,  NULL,  NULL,  NULL,  NULL,  NULL,  NULL,
    NULL,  NULL,  NULL,  NULL,  NULL,  NULL,  NULL,  NULL,
    NULL,  NULL,  NULL,  NULL,  NULL,  NULL,  NULL,  NULL,
-   "v0",  "v1",  "v2",  "v3",  "v4",  "v5",  "v6",  "v7", 
-   "v8",  "v9", "v10", "v11", "v12", "v13", "v14", "v15", 
+   "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",
 };
@@ -5358,16 +6412,43 @@ init_dwarf_regnames_aarch64 (void)
   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);
+}
+
 void
 init_dwarf_regnames (unsigned int e_machine)
 {
   switch (e_machine)
     {
     case EM_386:
-    case EM_486:
       init_dwarf_regnames_i386 ();
       break;
 
+    case EM_IAMCU:
+      init_dwarf_regnames_iamcu ();
+      break;
+
     case EM_X86_64:
     case EM_L1OM:
     case EM_K1OM:
@@ -5378,6 +6459,10 @@ init_dwarf_regnames (unsigned int e_machine)
       init_dwarf_regnames_aarch64 ();
       break;
 
+    case EM_S390:
+      init_dwarf_regnames_s390 ();
+      break;
+
     default:
       break;
     }
@@ -5387,6 +6472,7 @@ static const char *
 regname (unsigned int regno, int row)
 {
   static char reg[64];
+
   if (dwarf_regnames
       && regno < dwarf_regnames_count
       && dwarf_regnames [regno] != NULL)
@@ -5407,7 +6493,7 @@ frame_display_row (Frame_Chunk *fc, int *need_col_headers, unsigned int *max_reg
   unsigned int r;
   char tmp[100];
 
-  if (*max_regs < fc->ncols)
+  if (*max_regs != fc->ncols)
     *max_regs = fc->ncols;
 
   if (*need_col_headers)
@@ -5422,7 +6508,7 @@ frame_display_row (Frame_Chunk *fc, int *need_col_headers, unsigned int *max_reg
        if (fc->col_type[r] != DW_CFA_unreferenced)
          {
            if (r == fc->ra)
-             printf ("ra      ");
+             printf ("ra    ");
            else
              printf ("%-5s ", regname (r, 1));
          }
@@ -5434,7 +6520,7 @@ frame_display_row (Frame_Chunk *fc, int *need_col_headers, unsigned int *max_reg
   if (fc->cfa_exp)
     strcpy (tmp, "exp");
   else
-    sprintf (tmp, "%s%+d", regname (fc->cfa_reg, 1), fc->cfa_offset);
+    sprintf (tmp, "%s%+d", regname (fc->cfa_reg, 1), (int) fc->cfa_offset);
   printf ("%-8s ", tmp);
 
   for (r = 0; r < fc->ncols; r++)
@@ -5475,8 +6561,6 @@ frame_display_row (Frame_Chunk *fc, int *need_col_headers, unsigned int *max_reg
 }
 
 #define GET(VAR, N)    SAFE_BYTE_GET_AND_INC (VAR, start, N, end)
-#define LEB()  read_uleb128 (start, & length_return, end); start += length_return
-#define SLEB() read_sleb128 (start, & length_return, end); start += length_return
 
 static unsigned char *
 read_cie (unsigned char *start, unsigned char *end,
@@ -5520,7 +6604,20 @@ read_cie (unsigned char *start, unsigned char *end,
   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);
+         return end;
+       }
+
       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);
+         return end;
+       }
+
       eh_addr_size = fc->ptr_size;
     }
   else
@@ -5528,26 +6625,27 @@ read_cie (unsigned char *start, unsigned char *end,
       fc->ptr_size = eh_addr_size;
       fc->segment_size = 0;
     }
-  fc->code_factor = LEB ();
-  fc->data_factor = SLEB ();
+  READ_ULEB (fc->code_factor);
+  READ_SLEB (fc->data_factor);
   if (version == 1)
     {
       GET (fc->ra, 1);
     }
   else
     {
-      fc->ra = LEB ();
+      READ_ULEB (fc->ra);
     }
 
   if (fc->augmentation[0] == 'z')
     {
-      augmentation_data_len = LEB ();
+      READ_ULEB (augmentation_data_len);
       augmentation_data = start;
       start += augmentation_data_len;
       /* PR 17512: file: 11042-2589-0.004.  */
       if (start > end)
        {
-         warn (_("Augmentation data too long: 0x%lx\n"), augmentation_data_len);
+         warn (_("Augmentation data too long: %#lx, expected at most %#lx\n"),
+               augmentation_data_len, (long)((end - start) + augmentation_data_len));
          return end;
        }
     }
@@ -5557,7 +6655,7 @@ read_cie (unsigned char *start, unsigned char *end,
       unsigned char *p;
       unsigned char *q;
       unsigned char *qend;
-      
+
       p = (unsigned char *) fc->augmentation + 1;
       q = augmentation_data;
       qend = q + augmentation_data_len;
@@ -5612,7 +6710,7 @@ display_debug_frames (struct dwarf_section *section,
   unsigned int length_return;
   unsigned int max_regs = 0;
   const char *bad_reg = _("bad register: ");
-  int saved_eh_addr_size = eh_addr_size;
+  unsigned int saved_eh_addr_size = eh_addr_size;
 
   printf (_("Contents of the %s section:\n"), section->name);
 
@@ -5630,6 +6728,7 @@ display_debug_frames (struct dwarf_section *section,
       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;
 
@@ -5861,7 +6960,15 @@ display_debug_frames (struct dwarf_section *section,
 
          segment_selector = 0;
          if (fc->segment_size)
-           SAFE_BYTE_GET_AND_INC (segment_selector, start, fc->segment_size, end);
+           {
+             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);
 
@@ -5873,7 +6980,7 @@ display_debug_frames (struct dwarf_section *section,
 
          if (cie->augmentation[0] == 'z')
            {
-             augmentation_data_len = LEB ();
+             READ_ULEB (augmentation_data_len);
              augmentation_data = start;
              start += augmentation_data_len;
              /* PR 17512: file: 722-8446-0.004.  */
@@ -5929,6 +7036,7 @@ display_debug_frames (struct dwarf_section *section,
            {
              unsigned int reg, op, opa;
              unsigned long temp;
+             unsigned char * new_start;
 
              op = *start++;
              opa = op & 0x3f;
@@ -5942,7 +7050,7 @@ display_debug_frames (struct dwarf_section *section,
                case DW_CFA_advance_loc:
                  break;
                case DW_CFA_offset:
-                 LEB ();
+                 SKIP_ULEB ();
                  if (frame_need_space (fc, opa) >= 0)
                    fc->col_type[opa] = DW_CFA_undefined;
                  break;
@@ -5964,84 +7072,92 @@ display_debug_frames (struct dwarf_section *section,
                  break;
                case DW_CFA_offset_extended:
                case DW_CFA_val_offset:
-                 reg = LEB (); LEB ();
+                 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:
-                 reg = LEB ();
+                 READ_ULEB (reg);
                  if (frame_need_space (fc, reg) >= 0)
                    fc->col_type[reg] = DW_CFA_undefined;
                  break;
                case DW_CFA_undefined:
-                 reg = LEB ();
+                 READ_ULEB (reg);
                  if (frame_need_space (fc, reg) >= 0)
                    fc->col_type[reg] = DW_CFA_undefined;
                  break;
                case DW_CFA_same_value:
-                 reg = LEB ();
+                 READ_ULEB (reg);
                  if (frame_need_space (fc, reg) >= 0)
                    fc->col_type[reg] = DW_CFA_undefined;
                  break;
                case DW_CFA_register:
-                 reg = LEB (); LEB ();
+                 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:
-                 LEB (); LEB ();
+                 SKIP_ULEB ();
+                 SKIP_ULEB ();
                  break;
                case DW_CFA_def_cfa_register:
-                 LEB ();
+                 SKIP_ULEB ();
                  break;
                case DW_CFA_def_cfa_offset:
-                 LEB ();
+                 SKIP_ULEB ();
                  break;
                case DW_CFA_def_cfa_expression:
-                 temp = LEB ();
-                 if (start + temp < start)
+                 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 += temp;
+                   start = new_start;
                  break;
                case DW_CFA_expression:
                case DW_CFA_val_expression:
-                 reg = LEB ();
-                 temp = LEB ();
-                 if (start + temp < start)
+                 READ_ULEB (reg);
+                 READ_ULEB (temp);
+                 new_start = start + temp;
+                 if (new_start < start)
                    {
-                     /* PR 17512: file:306-192417-0.005.  */ 
+                     /* PR 17512: file:306-192417-0.005.  */
                      warn (_("Corrupt CFA expression value: %lu\n"), temp);
                      start = block_end;
                    }
                  else
-                   start += temp;
+                   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:
-                 reg = LEB (); SLEB ();
+                 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:
-                 LEB (); SLEB ();
+                 SKIP_ULEB ();
+                 SKIP_SLEB ();
                  break;
                case DW_CFA_def_cfa_offset_sf:
-                 SLEB ();
+                 SKIP_SLEB ();
                  break;
                case DW_CFA_MIPS_advance_loc8:
                  start += 8;
                  break;
                case DW_CFA_GNU_args_size:
-                 LEB ();
+                 SKIP_ULEB ();
                  break;
                case DW_CFA_GNU_negative_offset_extended:
-                 reg = LEB (); LEB ();
+                 READ_ULEB (reg);
+                 SKIP_ULEB ();
                  if (frame_need_space (fc, reg) >= 0)
                    fc->col_type[reg] = DW_CFA_undefined;
                  break;
@@ -6052,14 +7168,21 @@ display_debug_frames (struct dwarf_section *section,
          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, reg, roffs;
-         long l;
+         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 = "";
@@ -6069,6 +7192,10 @@ display_debug_frames (struct dwarf_section *section,
          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)
@@ -6079,14 +7206,14 @@ display_debug_frames (struct dwarf_section *section,
              else
                printf ("  DW_CFA_advance_loc: %d to %s\n",
                        opa * fc->code_factor,
-                       dwarf_vmatoa_1 (NULL, 
+                       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:
-             roffs = LEB ();
+             READ_ULEB (roffs);
              if (opa >= (unsigned int) fc->ncols)
                reg_prefix = bad_reg;
              if (! do_debug_frames_interp || *reg_prefix != '\0')
@@ -6101,19 +7228,25 @@ display_debug_frames (struct dwarf_section *section,
              break;
 
            case DW_CFA_restore:
-             if (opa >= (unsigned int) cie->ncols
-                 || opa >= (unsigned int) fc->ncols)
+             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')
+             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];
-                 if (do_debug_frames_interp
-                     && fc->col_type[opa] == DW_CFA_unreferenced)
-                   fc->col_type[opa] = DW_CFA_undefined;
                }
              break;
 
@@ -6167,8 +7300,8 @@ display_debug_frames (struct dwarf_section *section,
              break;
 
            case DW_CFA_offset_extended:
-             reg = LEB ();
-             roffs = LEB ();
+             READ_ULEB (reg);
+             READ_ULEB (roffs);
              if (reg >= (unsigned int) fc->ncols)
                reg_prefix = bad_reg;
              if (! do_debug_frames_interp || *reg_prefix != '\0')
@@ -6183,12 +7316,12 @@ display_debug_frames (struct dwarf_section *section,
              break;
 
            case DW_CFA_val_offset:
-             reg = LEB ();
-             roffs = LEB ();
+             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 at cfa%+ld\n",
+               printf ("  DW_CFA_val_offset: %s%s is cfa%+ld\n",
                        reg_prefix, regname (reg, 0),
                        roffs * fc->data_factor);
              if (*reg_prefix == '\0')
@@ -6199,14 +7332,21 @@ display_debug_frames (struct dwarf_section *section,
              break;
 
            case DW_CFA_restore_extended:
-             reg = LEB ();
-             if (reg >= (unsigned int) cie->ncols
-                 || reg >= (unsigned int) fc->ncols)
+             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')
+             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];
@@ -6214,7 +7354,7 @@ display_debug_frames (struct dwarf_section *section,
              break;
 
            case DW_CFA_undefined:
-             reg = LEB ();
+             READ_ULEB (reg);
              if (reg >= (unsigned int) fc->ncols)
                reg_prefix = bad_reg;
              if (! do_debug_frames_interp || *reg_prefix != '\0')
@@ -6228,7 +7368,7 @@ display_debug_frames (struct dwarf_section *section,
              break;
 
            case DW_CFA_same_value:
-             reg = LEB ();
+             READ_ULEB (reg);
              if (reg >= (unsigned int) fc->ncols)
                reg_prefix = bad_reg;
              if (! do_debug_frames_interp || *reg_prefix != '\0')
@@ -6242,8 +7382,8 @@ display_debug_frames (struct dwarf_section *section,
              break;
 
            case DW_CFA_register:
-             reg = LEB ();
-             roffs = LEB ();
+             READ_ULEB (reg);
+             READ_ULEB (roffs);
              if (reg >= (unsigned int) fc->ncols)
                reg_prefix = bad_reg;
              if (! do_debug_frames_interp || *reg_prefix != '\0')
@@ -6263,13 +7403,13 @@ display_debug_frames (struct dwarf_section *section,
              if (! do_debug_frames_interp)
                printf ("  DW_CFA_remember_state\n");
              rs = (Frame_Chunk *) xmalloc (sizeof (Frame_Chunk));
-              rs->cfa_offset = fc->cfa_offset;
+             rs->cfa_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));
+                                                    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));
@@ -6286,8 +7426,8 @@ display_debug_frames (struct dwarf_section *section,
                  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;
+                 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"));
@@ -6306,16 +7446,16 @@ display_debug_frames (struct dwarf_section *section,
              break;
 
            case DW_CFA_def_cfa:
-             fc->cfa_reg = LEB ();
-             fc->cfa_offset = LEB ();
+             READ_SLEB (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), fc->cfa_offset);
+                       regname (fc->cfa_reg, 0), (int) fc->cfa_offset);
              break;
 
            case DW_CFA_def_cfa_register:
-             fc->cfa_reg = LEB ();
+             READ_SLEB (fc->cfa_reg);
              fc->cfa_exp = 0;
              if (! do_debug_frames_interp)
                printf ("  DW_CFA_def_cfa_register: %s\n",
@@ -6323,9 +7463,9 @@ display_debug_frames (struct dwarf_section *section,
              break;
 
            case DW_CFA_def_cfa_offset:
-             fc->cfa_offset = LEB ();
+             READ_ULEB (fc->cfa_offset);
              if (! do_debug_frames_interp)
-               printf ("  DW_CFA_def_cfa_offset: %d\n", fc->cfa_offset);
+               printf ("  DW_CFA_def_cfa_offset: %d\n", (int) fc->cfa_offset);
              break;
 
            case DW_CFA_nop:
@@ -6334,8 +7474,8 @@ display_debug_frames (struct dwarf_section *section,
              break;
 
            case DW_CFA_def_cfa_expression:
-             ul = LEB ();
-             if (start >= block_end || start + ul > block_end || start + ul < start)
+             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;
@@ -6352,13 +7492,14 @@ display_debug_frames (struct dwarf_section *section,
              break;
 
            case DW_CFA_expression:
-             reg = LEB ();
-             ul = LEB ();
+             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.  */
-             if (start >= block_end || start + ul > block_end || start + ul < start)
+             tmp = start + ul;
+             if (start >= block_end || tmp > block_end || tmp < start)
                {
                  printf (_("  DW_CFA_expression: <corrupt len %lu>\n"), ul);
                  break;
@@ -6373,15 +7514,16 @@ display_debug_frames (struct dwarf_section *section,
                }
              if (*reg_prefix == '\0')
                fc->col_type[reg] = DW_CFA_expression;
-             start += ul;
+             start = tmp;
              break;
 
            case DW_CFA_val_expression:
-             reg = LEB ();
-             ul = LEB ();
+             READ_ULEB (reg);
+             READ_ULEB (ul);
              if (reg >= (unsigned int) fc->ncols)
                reg_prefix = bad_reg;
-             if (start >= block_end || start + ul > block_end || start + ul < start)
+             tmp = start + ul;
+             if (start >= block_end || tmp > block_end || tmp < start)
                {
                  printf ("  DW_CFA_val_expression: <corrupt len %lu>\n", ul);
                  break;
@@ -6396,18 +7538,18 @@ display_debug_frames (struct dwarf_section *section,
                }
              if (*reg_prefix == '\0')
                fc->col_type[reg] = DW_CFA_val_expression;
-             start += ul;
+             start = tmp;
              break;
 
            case DW_CFA_offset_extended_sf:
-             reg = LEB ();
-             l = SLEB ();
+             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),
-                       l * fc->data_factor);
+                       (long)(l * fc->data_factor));
              if (*reg_prefix == '\0')
                {
                  fc->col_type[reg] = DW_CFA_offset;
@@ -6416,14 +7558,14 @@ display_debug_frames (struct dwarf_section *section,
              break;
 
            case DW_CFA_val_offset_sf:
-             reg = LEB ();
-             l = SLEB ();
+             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 at cfa%+ld\n",
+               printf ("  DW_CFA_val_offset_sf: %s%s is cfa%+ld\n",
                        reg_prefix, regname (reg, 0),
-                       l * fc->data_factor);
+                       (long)(l * fc->data_factor));
              if (*reg_prefix == '\0')
                {
                  fc->col_type[reg] = DW_CFA_val_offset;
@@ -6432,20 +7574,20 @@ display_debug_frames (struct dwarf_section *section,
              break;
 
            case DW_CFA_def_cfa_sf:
-             fc->cfa_reg = LEB ();
-             fc->cfa_offset = SLEB ();
+             READ_SLEB (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), fc->cfa_offset);
+                       regname (fc->cfa_reg, 0), (int) fc->cfa_offset);
              break;
 
            case DW_CFA_def_cfa_offset_sf:
-             fc->cfa_offset = SLEB ();
-             fc->cfa_offset = fc->cfa_offset * fc->data_factor;
+             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", fc->cfa_offset);
+               printf ("  DW_CFA_def_cfa_offset_sf: %d\n", (int) fc->cfa_offset);
              break;
 
            case DW_CFA_MIPS_advance_loc8:
@@ -6467,20 +7609,21 @@ display_debug_frames (struct dwarf_section *section,
              break;
 
            case DW_CFA_GNU_args_size:
-             ul = LEB ();
+             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:
-             reg = LEB ();
-             l = - LEB ();
+             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),
-                       l * fc->data_factor);
+                       (long)(l * fc->data_factor));
              if (*reg_prefix == '\0')
                {
                  fc->col_type[reg] = DW_CFA_offset;
@@ -6497,7 +7640,8 @@ display_debug_frames (struct dwarf_section *section,
            }
        }
 
-      if (do_debug_frames_interp)
+      /* 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;
@@ -6510,8 +7654,349 @@ display_debug_frames (struct dwarf_section *section,
 }
 
 #undef GET
-#undef LEB
-#undef SLEB
+
+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;
+
+  printf (_("Contents of the %s section:\n"), section->name);
+
+  load_debug_section (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;
+
+      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)
+       {
+         /* 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;
+
+      if ((hdrptr - section->start) + unit_length > section->size)
+       {
+         warn (_("The length field (0x%lx) for unit 0x%lx in the debug_names "
+                 "header is wrong - the section is too small\n"),
+               (long) unit_length, (long) (unit_start - section->start));
+         return 0;
+       }
+
+      /* 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:"));
+      for (i = 0; i < augmentation_string_size; i++)
+       {
+         unsigned char uc;
+
+         SAFE_BYTE_GET_AND_INC (uc, hdrptr, 1, unit_end);
+         printf (" %02x", uc);
+       }
+      putchar ('\n');
+      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 (_("Used %zu of %lu buckets.\n"), buckets_filled,
+             (unsigned long) bucket_count);
+
+      uint32_t hash_prev;
+      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)
+           {
+             if (hash_prev % bucket_count == hash_this % bucket_count)
+               {
+                 ++hash_clash_count;
+                 ++this_length;
+                 longest_clash = MAX (longest_clash, this_length);
+               }
+             else
+               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);
+
+      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)
+               {
+                 second_abbrev_tag = abbrev_tag;
+                 tagno = 0;
+                 entryptr = entry_pool + entry_offset;
+                 continue;
+               }
+             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)
+               {
+                 warn (_("Undefined abbreviation tag %lu "
+                         "in unit 0x%lx in the debug_names\n"),
+                       (long) abbrev_tag,
+                       (long) (unit_start - section->start));
+                 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;
+
+                 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');
+       }
+
+      free (abbrev_lookup);
+    }
+
+  return 1;
+}
 
 static int
 display_gdb_index (struct dwarf_section *section,
@@ -6620,12 +8105,12 @@ display_gdb_index (struct dwarf_section *section,
   symbol_table = start + symbol_table_offset;
   constant_pool = start + constant_pool_offset;
 
-  if (address_table + address_table_size * (2 + 8 + 4) > section->start + section->size)
+  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)
     {
@@ -6675,10 +8160,11 @@ display_gdb_index (struct dwarf_section *section,
          || cu_vector_offset != 0)
        {
          unsigned int j;
+         unsigned char * adr;
 
+         adr = constant_pool + name_offset;
          /* PR 17531: file: 5b7b07ad.  */
-         if (constant_pool + name_offset < constant_pool
-             || constant_pool + name_offset >= section->start + section->size)
+         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"),
@@ -6689,20 +8175,21 @@ display_gdb_index (struct dwarf_section *section,
                    (int) (section->size - (constant_pool_offset + name_offset)),
                    constant_pool + name_offset);
 
-         if (constant_pool + cu_vector_offset < constant_pool
-             || constant_pool + cu_vector_offset >= section->start + section->size)
+         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;
            }
-         else
-           num_cus = byte_get_little_endian (constant_pool + cu_vector_offset, 4);
 
+         num_cus = byte_get_little_endian (adr, 4);
+
+         adr = constant_pool + cu_vector_offset + 4 + num_cus * 4;
          if (num_cus * 4 < num_cus
-             || constant_pool + cu_vector_offset + 4 + num_cus * 4 >=
-             section->start + section->size)
+             || 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"),
@@ -6712,6 +8199,7 @@ display_gdb_index (struct dwarf_section *section,
 
          if (num_cus > 1)
            printf ("\n");
+
          for (j = 0; j < num_cus; ++j)
            {
              int is_static;
@@ -6810,7 +8298,7 @@ get_DW_SECT_short_name (unsigned int dw_sect)
       case DW_SECT_MACRO:
        return "macro";
       default:
-        break;
+       break;
     }
 
   snprintf (buf, sizeof (buf), "%d", dw_sect);
@@ -6863,6 +8351,14 @@ process_cu_tu_index (struct dwarf_section *section, int do_display)
   pindex = phash + nslots * 8;
   ppool = pindex + nslots * 4;
 
+  /* PR 17531: file: 45d69832.  */
+  if (pindex < phash || ppool < phdr || (pindex == phash && nslots != 0))
+    {
+      warn (_("Section %s is too small for %d slots\n"),
+           section->name, nslots);
+      return 0;
+    }
+
   if (do_display)
     {
       printf (_("Contents of the %s section:\n\n"), section->name);
@@ -6873,7 +8369,7 @@ process_cu_tu_index (struct dwarf_section *section, int do_display)
       printf (_("  Number of slots:         %d\n\n"), nslots);
     }
 
-  if (ppool > limit)
+  if (ppool > limit || ppool < phdr)
     {
       warn (_("Section %s too small for %d hash table entries\n"),
            section->name, nslots);
@@ -6894,6 +8390,13 @@ process_cu_tu_index (struct dwarf_section *section, int do_display)
            {
              SAFE_BYTE_GET (j, pindex, 4, limit);
              shndx_list = ppool + j * 4;
+             /* PR 17531: file: 705e010d.  */
+             if (shndx_list < ppool)
+               {
+                 warn (_("Section index pool located before start of section\n"));
+                 return 0;
+               }
+
              if (do_display)
                printf (_("  [%3d] Signature:  0x%s  Sections: "),
                        i, dwarf_vmatoa64 (signature_high, signature_low,
@@ -6940,6 +8443,14 @@ process_cu_tu_index (struct dwarf_section *section, int do_display)
 
       is_tu_index = strcmp (section->name, ".debug_tu_index") == 0;
 
+      /* PR 17531: file: 0dd159bf.
+        Check for wraparound with an overlarge ncols value.  */
+      if (poffsets < ppool || (unsigned int) ((poffsets - ppool) / 4) != ncols)
+       {
+         warn (_("Overlarge number of columns: %x\n"), ncols);
+         return 0;
+       }
+
       if (pend > limit)
        {
          warn (_("Section %s too small for offset and size tables\n"),
@@ -6998,6 +8509,13 @@ process_cu_tu_index (struct dwarf_section *section, int do_display)
                memcpy (&this_set[row - 1].signature, ph, sizeof (uint64_t));
 
              prow = poffsets + (row - 1) * ncols * 4;
+             /* PR 17531: file: b8ce60a8.  */
+             if (prow < poffsets || prow > limit)
+               {
+                 warn (_("Row index (%u) * num columns (%u) > space remaining in section\n"),
+                       row, ncols);
+                 return 0;
+               }
 
              if (do_display)
                printf (_("  [%3d] 0x%s"),
@@ -7030,12 +8548,12 @@ process_cu_tu_index (struct dwarf_section *section, int do_display)
       ph = phash;
       pi = pindex;
       if (do_display)
-        {
+       {
          printf ("\n");
          printf (_("  Size table\n"));
          printf ("  slot  %-16s  ",
                 is_tu_index ? _("signature") : _("dwo_id"));
-        }
+       }
 
       for (j = 0; j < ncols; j++)
        {
@@ -7097,21 +8615,27 @@ process_cu_tu_index (struct dwarf_section *section, int do_display)
    section sets that we can use to associate a .debug_info.dwo section
    with its associated .debug_abbrev.dwo section in a .dwp file.  */
 
-static void
+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)
-    return;
-
-  if (load_debug_section (dwp_cu_index, file))
-    process_cu_tu_index (&debug_displays [dwp_cu_index].section, 0);
+  if (cu_tu_indexes_read == -1)
+    {
+      cu_tu_indexes_read = TRUE;
+  
+      if (load_debug_section (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 (dwp_tu_index, file))
-    process_cu_tu_index (&debug_displays [dwp_tu_index].section, 0);
+      if (load_debug_section (dwp_tu_index, file))
+       if (! process_cu_tu_index (&debug_displays [dwp_tu_index].section, 0))
+         cu_tu_indexes_read = FALSE;
+    }
 
-  cu_tu_indexes_read = 1;
+  return (bfd_boolean) cu_tu_indexes_read;
 }
 
 /* Find the set of sections that includes section SHNDX.  */
@@ -7121,7 +8645,8 @@ find_cu_tu_set (void *file, unsigned int shndx)
 {
   unsigned int i;
 
-  load_cu_tu_indexes (file);
+  if (! load_cu_tu_indexes (file))
+    return NULL;
 
   /* Find SHNDX in the shndx pool.  */
   for (i = 0; i < shndx_pool_used; i++)
@@ -7177,7 +8702,12 @@ xcmalloc (size_t nmemb, size_t size)
 {
   /* Check for overflow.  */
   if (nmemb >= ~(size_t) 0 / size)
-    return NULL;
+    {
+      fprintf (stderr,
+              _("Attempt to allocate an array with an excessive number of elements: 0x%lx\n"),
+              (long) nmemb);
+      xexit (1);
+    }
 
   return xmalloc (nmemb * size);
 }
@@ -7190,7 +8720,12 @@ xcrealloc (void *ptr, size_t nmemb, size_t size)
 {
   /* Check for overflow.  */
   if (nmemb >= ~(size_t) 0 / size)
-    return NULL;
+    {
+      fprintf (stderr,
+              _("Attempt to re-allocate an array with an excessive number of elements: 0x%lx\n"),
+              (long) nmemb);
+      xexit (1);
+    }
 
   return xrealloc (ptr, nmemb * size);
 }
@@ -7201,7 +8736,12 @@ xcalloc2 (size_t nmemb, size_t size)
 {
   /* Check for overflow.  */
   if (nmemb >= ~(size_t) 0 / size)
-    return NULL;
+    {
+      fprintf (stderr,
+              _("Attempt to allocate a zero'ed array with an excessive number of elements: 0x%lx\n"),
+              (long) nmemb);
+      xexit (1);
+    }
 
   return xcalloc (nmemb, size);
 }
@@ -7267,7 +8807,7 @@ dwarf_select_sections_by_names (const char *names)
       { "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 },
@@ -7360,6 +8900,7 @@ dwarf_select_sections_by_letters (const char *letters)
 
       case 'F':
        do_debug_frames_interp = 1;
+       /* Fall through.  */
       case 'f':
        do_debug_frames = 1;
        break;
@@ -7377,7 +8918,7 @@ dwarf_select_sections_by_letters (const char *letters)
        break;
 
       default:
-       warn (_("Unrecognized debug option '%s'\n"), optarg);
+       warn (_("Unrecognized debug option '%s'\n"), letters);
        break;
       }
 }
@@ -7406,76 +8947,87 @@ dwarf_select_sections_all (void)
 
 struct dwarf_section_display debug_displays[] =
 {
-  { { ".debug_abbrev",     ".zdebug_abbrev",   NULL, NULL, 0, 0, 0, NULL },
-    display_debug_abbrev,   &do_debug_abbrevs, 0 },
-  { { ".debug_aranges",            ".zdebug_aranges",  NULL, NULL, 0, 0, 0, NULL },
-    display_debug_aranges,  &do_debug_aranges, 1 },
-  { { ".debug_frame",       ".zdebug_frame",   NULL, NULL, 0, 0, 0, NULL },
-    display_debug_frames,   &do_debug_frames,  1 },
-  { { ".debug_info",       ".zdebug_info",     NULL, NULL, 0, 0, abbrev, NULL },
-    display_debug_info,            &do_debug_info,     1 },
-  { { ".debug_line",       ".zdebug_line",     NULL, NULL, 0, 0, 0, NULL },
-    display_debug_lines,    &do_debug_lines,   1 },
-  { { ".debug_pubnames",    ".zdebug_pubnames",        NULL, NULL, 0, 0, 0, NULL },
-    display_debug_pubnames, &do_debug_pubnames,        0 },
-  { { ".debug_gnu_pubnames", ".zdebug_gnu_pubnames", NULL, NULL, 0, 0, 0, NULL },
-    display_debug_gnu_pubnames, &do_debug_pubnames, 0 },
-  { { ".eh_frame",         "",                 NULL, NULL, 0, 0, 0, NULL },
-    display_debug_frames,   &do_debug_frames,  1 },
-  { { ".debug_macinfo",            ".zdebug_macinfo",  NULL, NULL, 0, 0, 0, NULL },
-    display_debug_macinfo,  &do_debug_macinfo, 0 },
-  { { ".debug_macro",      ".zdebug_macro",    NULL, NULL, 0, 0, 0, NULL },
-    display_debug_macro,    &do_debug_macinfo, 1 },
-  { { ".debug_str",        ".zdebug_str",      NULL, NULL, 0, 0, 0, NULL },
-    display_debug_str,     &do_debug_str,      0 },
-  { { ".debug_loc",        ".zdebug_loc",      NULL, NULL, 0, 0, 0, NULL },
-    display_debug_loc,     &do_debug_loc,      1 },
-  { { ".debug_pubtypes",    ".zdebug_pubtypes",        NULL, NULL, 0, 0, 0, NULL },
-    display_debug_pubnames, &do_debug_pubtypes,        0 },
-  { { ".debug_gnu_pubtypes", ".zdebug_gnu_pubtypes", NULL, NULL, 0, 0, 0, NULL },
-    display_debug_gnu_pubnames, &do_debug_pubtypes, 0 },
-  { { ".debug_ranges",     ".zdebug_ranges",   NULL, NULL, 0, 0, 0, NULL },
-    display_debug_ranges,   &do_debug_ranges,  1 },
-  { { ".debug_static_func", ".zdebug_static_func", NULL, NULL, 0, 0, 0, NULL },
-    display_debug_not_supported, NULL,         0 },
-  { { ".debug_static_vars", ".zdebug_static_vars", NULL, NULL, 0, 0, 0, NULL },
-    display_debug_not_supported, NULL,         0 },
-  { { ".debug_types",      ".zdebug_types",    NULL, NULL, 0, 0, abbrev, NULL },
-    display_debug_types,    &do_debug_info,    1 },
-  { { ".debug_weaknames",   ".zdebug_weaknames", NULL, NULL, 0, 0, 0, NULL },
-    display_debug_not_supported, NULL,         0 },
-  { { ".gdb_index",        "",                 NULL, NULL, 0, 0, 0, NULL },
-    display_gdb_index,      &do_gdb_index,     0 },
-  { { ".trace_info",       "",                 NULL, NULL, 0, 0, trace_abbrev, NULL },
-    display_trace_info,            &do_trace_info,     1 },
-  { { ".trace_abbrev",     "",                 NULL, NULL, 0, 0, 0, NULL },
-    display_debug_abbrev,   &do_trace_abbrevs, 0 },
-  { { ".trace_aranges",            "",                 NULL, NULL, 0, 0, 0, NULL },
-    display_debug_aranges,  &do_trace_aranges, 0 },
-  { { ".debug_info.dwo",    ".zdebug_info.dwo",        NULL, NULL, 0, 0, abbrev_dwo, NULL },
-    display_debug_info,            &do_debug_info,     1 },
-  { { ".debug_abbrev.dwo",  ".zdebug_abbrev.dwo", NULL, NULL, 0, 0, 0, NULL },
-    display_debug_abbrev,   &do_debug_abbrevs, 0 },
-  { { ".debug_types.dwo",   ".zdebug_types.dwo", NULL, NULL, 0, 0, abbrev_dwo, NULL },
-    display_debug_types,    &do_debug_info,    1 },
-  { { ".debug_line.dwo",    ".zdebug_line.dwo", NULL, NULL, 0, 0, 0, NULL },
-    display_debug_lines,    &do_debug_lines,   1 },
-  { { ".debug_loc.dwo",            ".zdebug_loc.dwo",  NULL, NULL, 0, 0, 0, NULL },
-    display_debug_loc,     &do_debug_loc,      1 },
-  { { ".debug_macro.dwo",   ".zdebug_macro.dwo", NULL, NULL, 0, 0, 0, NULL },
-    display_debug_macro,    &do_debug_macinfo, 1 },
-  { { ".debug_macinfo.dwo", ".zdebug_macinfo.dwo", NULL, NULL, 0, 0, 0, NULL },
-    display_debug_macinfo,  &do_debug_macinfo, 0 },
-  { { ".debug_str.dwo",     ".zdebug_str.dwo",  NULL, NULL, 0, 0, 0, NULL },
-    display_debug_str,      &do_debug_str,     1 },
-  { { ".debug_str_offsets", ".zdebug_str_offsets", NULL, NULL, 0, 0, 0, NULL },
-    display_debug_str_offsets, NULL,           0 },
-  { { ".debug_str_offsets.dwo", ".zdebug_str_offsets.dwo", NULL, NULL, 0, 0, 0, NULL },
-    display_debug_str_offsets, NULL,           0 },
-  { { ".debug_addr",       ".zdebug_addr",     NULL, NULL, 0, 0, 0, NULL },
-    display_debug_addr,     &do_debug_addr,    1 },
-  { { ".debug_cu_index",    "",                        NULL, NULL, 0, 0, 0, NULL },
-    display_cu_index,       &do_debug_cu_index,        0 },
-  { { ".debug_tu_index",    "",                        NULL, NULL, 0, 0, 0, NULL },
-    display_cu_index,       &do_debug_cu_index,        0 },
+  { { ".debug_abbrev",     ".zdebug_abbrev",   NULL, NULL, 0, 0, 0, NULL, 0, NULL },
+    display_debug_abbrev,   &do_debug_abbrevs, FALSE },
+  { { ".debug_aranges",            ".zdebug_aranges",  NULL, NULL, 0, 0, 0, NULL, 0, NULL },
+    display_debug_aranges,  &do_debug_aranges, TRUE },
+  { { ".debug_frame",       ".zdebug_frame",   NULL, NULL, 0, 0, 0, NULL, 0, NULL },
+    display_debug_frames,   &do_debug_frames,  TRUE },
+  { { ".debug_info",       ".zdebug_info",     NULL, NULL, 0, 0, abbrev, NULL, 0, NULL },
+    display_debug_info,            &do_debug_info,     TRUE },
+  { { ".debug_line",       ".zdebug_line",     NULL, NULL, 0, 0, 0, NULL, 0, NULL },
+    display_debug_lines,    &do_debug_lines,   TRUE },
+  { { ".debug_pubnames",    ".zdebug_pubnames",        NULL, NULL, 0, 0, 0, NULL, 0, NULL },
+    display_debug_pubnames, &do_debug_pubnames,        FALSE },
+  { { ".debug_gnu_pubnames", ".zdebug_gnu_pubnames", NULL, NULL, 0, 0, 0, NULL, 0, NULL },
+    display_debug_gnu_pubnames, &do_debug_pubnames, FALSE },
+  { { ".eh_frame",         "",                 NULL, NULL, 0, 0, 0, NULL, 0, NULL },
+    display_debug_frames,   &do_debug_frames,  TRUE },
+  { { ".debug_macinfo",            ".zdebug_macinfo",  NULL, NULL, 0, 0, 0, NULL, 0, NULL },
+    display_debug_macinfo,  &do_debug_macinfo, FALSE },
+  { { ".debug_macro",      ".zdebug_macro",    NULL, NULL, 0, 0, 0, NULL, 0, NULL },
+    display_debug_macro,    &do_debug_macinfo, TRUE },
+  { { ".debug_str",        ".zdebug_str",      NULL, NULL, 0, 0, 0, NULL, 0, NULL },
+    display_debug_str,     &do_debug_str,      FALSE },
+  { { ".debug_line_str",    ".zdebug_line_str",        NULL, NULL, 0, 0, 0, NULL, 0, NULL },
+    display_debug_str,     &do_debug_str,      FALSE },
+  { { ".debug_loc",        ".zdebug_loc",      NULL, NULL, 0, 0, 0, NULL, 0, NULL },
+    display_debug_loc,     &do_debug_loc,      TRUE },
+  { { ".debug_loclists",    ".zdebug_loclists",        NULL, NULL, 0, 0, 0, NULL, 0, NULL },
+    display_debug_loc,     &do_debug_loc,      TRUE },
+  { { ".debug_pubtypes",    ".zdebug_pubtypes",        NULL, NULL, 0, 0, 0, NULL, 0, NULL },
+    display_debug_pubnames, &do_debug_pubtypes,        FALSE },
+  { { ".debug_gnu_pubtypes", ".zdebug_gnu_pubtypes", NULL, NULL, 0, 0, 0, NULL, 0, NULL },
+    display_debug_gnu_pubnames, &do_debug_pubtypes, FALSE },
+  { { ".debug_ranges",     ".zdebug_ranges",   NULL, NULL, 0, 0, 0, NULL, 0, NULL },
+    display_debug_ranges,   &do_debug_ranges,  TRUE },
+  { { ".debug_rnglists",    ".zdebug_rnglists",        NULL, NULL, 0, 0, 0, NULL, 0, NULL },
+    display_debug_ranges,   &do_debug_ranges,  TRUE },
+  { { ".debug_static_func", ".zdebug_static_func", NULL, NULL, 0, 0, 0, NULL, 0, NULL },
+    display_debug_not_supported, NULL,         FALSE },
+  { { ".debug_static_vars", ".zdebug_static_vars", NULL, NULL, 0, 0, 0, NULL, 0, NULL },
+    display_debug_not_supported, NULL,         FALSE },
+  { { ".debug_types",      ".zdebug_types",    NULL, NULL, 0, 0, abbrev, NULL, 0, NULL },
+    display_debug_types,    &do_debug_info,    TRUE },
+  { { ".debug_weaknames",   ".zdebug_weaknames", NULL, NULL, 0, 0, 0, NULL, 0, NULL },
+    display_debug_not_supported, NULL,         FALSE },
+  { { ".gdb_index",        "",                 NULL, NULL, 0, 0, 0, NULL, 0, NULL },
+    display_gdb_index,      &do_gdb_index,     FALSE },
+  { { ".debug_names",      "",                 NULL, NULL, 0, 0, 0, NULL, 0, NULL },
+    display_debug_names,    &do_gdb_index,     FALSE },
+  { { ".trace_info",       "",                 NULL, NULL, 0, 0, trace_abbrev, NULL, 0, NULL },
+    display_trace_info,            &do_trace_info,     TRUE },
+  { { ".trace_abbrev",     "",                 NULL, NULL, 0, 0, 0, NULL, 0, NULL },
+    display_debug_abbrev,   &do_trace_abbrevs, FALSE },
+  { { ".trace_aranges",            "",                 NULL, NULL, 0, 0, 0, NULL, 0, NULL },
+    display_debug_aranges,  &do_trace_aranges, FALSE },
+  { { ".debug_info.dwo",    ".zdebug_info.dwo",        NULL, NULL, 0, 0, abbrev_dwo, NULL, 0, NULL },
+    display_debug_info,            &do_debug_info,     TRUE },
+  { { ".debug_abbrev.dwo",  ".zdebug_abbrev.dwo", NULL, NULL, 0, 0, 0, NULL, 0, NULL },
+    display_debug_abbrev,   &do_debug_abbrevs, FALSE },
+  { { ".debug_types.dwo",   ".zdebug_types.dwo", NULL, NULL, 0, 0, abbrev_dwo, NULL, 0, NULL },
+    display_debug_types,    &do_debug_info,    TRUE },
+  { { ".debug_line.dwo",    ".zdebug_line.dwo", NULL, NULL, 0, 0, 0, NULL, 0, NULL },
+    display_debug_lines,    &do_debug_lines,   TRUE },
+  { { ".debug_loc.dwo",            ".zdebug_loc.dwo",  NULL, NULL, 0, 0, 0, NULL, 0, NULL },
+    display_debug_loc,     &do_debug_loc,      TRUE },
+  { { ".debug_macro.dwo",   ".zdebug_macro.dwo", NULL, NULL, 0, 0, 0, NULL, 0, NULL },
+    display_debug_macro,    &do_debug_macinfo, TRUE },
+  { { ".debug_macinfo.dwo", ".zdebug_macinfo.dwo", NULL, NULL, 0, 0, 0, NULL, 0, NULL },
+    display_debug_macinfo,  &do_debug_macinfo, FALSE },
+  { { ".debug_str.dwo",     ".zdebug_str.dwo",  NULL, NULL, 0, 0, 0, NULL, 0, NULL },
+    display_debug_str,      &do_debug_str,     TRUE },
+  { { ".debug_str_offsets", ".zdebug_str_offsets", NULL, NULL, 0, 0, 0, NULL, 0, NULL },
+    display_debug_str_offsets, NULL,           FALSE },
+  { { ".debug_str_offsets.dwo", ".zdebug_str_offsets.dwo", NULL, NULL, 0, 0, 0, NULL, 0, NULL },
+    display_debug_str_offsets, NULL,           FALSE },
+  { { ".debug_addr",       ".zdebug_addr",     NULL, NULL, 0, 0, 0, NULL, 0, NULL },
+    display_debug_addr,     &do_debug_addr,    TRUE },
+  { { ".debug_cu_index",    "",                        NULL, NULL, 0, 0, 0, NULL, 0, NULL },
+    display_cu_index,       &do_debug_cu_index,        FALSE },
+  { { ".debug_tu_index",    "",                        NULL, NULL, 0, 0, 0, NULL, 0, NULL },
+    display_cu_index,       &do_debug_cu_index,        FALSE },
 };
+
+/* A static assertion.  */
+extern int debug_displays_assert[ARRAY_SIZE (debug_displays) == max ? 1 : -1];
This page took 0.103873 seconds and 4 git commands to generate.