gas: run the hwcaps-bump tests with 64-bit sparc objects only.

[deliverable/binutils-gdb.git] / binutils / readelf.c

diff --git a/binutils/readelf.c b/binutils/readelf.c
index b7269d163e744a8b5ba5a45109a54b85aace574b..e782e9561f2069d7ec2e7ac8b63ab73fb34d6183 100644 (file)
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -1,5 +1,5 @@
 /* readelf.c -- display contents of an ELF format file
 /* readelf.c -- display contents of an ELF format file

-   Copyright (C) 1998-2014 Free Software Foundation, Inc.
+   Copyright (C) 1998-2016 Free Software Foundation, Inc.

 
    Originally developed by Eric Youngdale <eric@andante.jic.com>
    Modifications by Nick Clifton <nickc@redhat.com>
 
    Originally developed by Eric Youngdale <eric@andante.jic.com>
    Modifications by Nick Clifton <nickc@redhat.com>


@@ -43,9 +43,7 @@
 #include "sysdep.h"
 #include <assert.h>
 #include <time.h>
 #include "sysdep.h"
 #include <assert.h>
 #include <time.h>

-#ifdef HAVE_ZLIB_H

 #include <zlib.h>
 #include <zlib.h>

-#endif

 #ifdef HAVE_WCHAR_H
 #include <wchar.h>
 #endif
 #ifdef HAVE_WCHAR_H
 #include <wchar.h>
 #endif


@@ -106,6 +104,7 @@
 #include "elf/epiphany.h"
 #include "elf/fr30.h"
 #include "elf/frv.h"
 #include "elf/epiphany.h"
 #include "elf/fr30.h"
 #include "elf/frv.h"

+#include "elf/ft32.h"

 #include "elf/h8.h"
 #include "elf/hppa.h"
 #include "elf/i386.h"
 #include "elf/h8.h"
 #include "elf/hppa.h"
 #include "elf/i386.h"


@@ -125,6 +124,7 @@
 #include "elf/metag.h"
 #include "elf/microblaze.h"
 #include "elf/mips.h"
 #include "elf/metag.h"
 #include "elf/microblaze.h"
 #include "elf/mips.h"

+#include "elf/riscv.h"

 #include "elf/mmix.h"
 #include "elf/mn10200.h"
 #include "elf/mn10300.h"
 #include "elf/mmix.h"
 #include "elf/mn10200.h"
 #include "elf/mn10300.h"


@@ -149,6 +149,7 @@
 #include "elf/tilepro.h"
 #include "elf/v850.h"
 #include "elf/vax.h"
 #include "elf/tilepro.h"
 #include "elf/v850.h"
 #include "elf/vax.h"

+#include "elf/visium.h"

 #include "elf/x86-64.h"
 #include "elf/xc16x.h"
 #include "elf/xgate.h"
 #include "elf/x86-64.h"
 #include "elf/xc16x.h"
 #include "elf/xgate.h"


@@ -164,8 +165,14 @@
 #define offsetof(TYPE, MEMBER) ((size_t) &(((TYPE *) 0)->MEMBER))
 #endif
 
 #define offsetof(TYPE, MEMBER) ((size_t) &(((TYPE *) 0)->MEMBER))
 #endif
 

+typedef struct elf_section_list
+{
+  Elf_Internal_Shdr * hdr;
+  struct elf_section_list * next;
+} elf_section_list;
+

 char * program_name = "readelf";
 char * program_name = "readelf";

-static long archive_file_offset;
+static unsigned long archive_file_offset;

 static unsigned long archive_file_size;
 static bfd_size_type current_file_size;
 static unsigned long dynamic_addr;
 static unsigned long archive_file_size;
 static bfd_size_type current_file_size;
 static unsigned long dynamic_addr;


@@ -188,7 +195,7 @@ static Elf_Internal_Ehdr elf_header;
 static Elf_Internal_Shdr * section_headers;
 static Elf_Internal_Phdr * program_headers;
 static Elf_Internal_Dyn *  dynamic_section;
 static Elf_Internal_Shdr * section_headers;
 static Elf_Internal_Phdr * program_headers;
 static Elf_Internal_Dyn *  dynamic_section;

-static Elf_Internal_Shdr * symtab_shndx_hdr;
+static elf_section_list * symtab_shndx_list;

 static int show_name;
 static int do_dynamic;
 static int do_syms;
 static int show_name;
 static int do_dynamic;
 static int do_syms;


@@ -209,6 +216,7 @@ static int do_arch;
 static int do_notes;
 static int do_archive_index;
 static int is_32bit_elf;
 static int do_notes;
 static int do_archive_index;
 static int is_32bit_elf;

+static int decompress_dumps;

 
 struct group_list
 {
 
 struct group_list
 {


@@ -272,6 +280,20 @@ typedef enum print_mode
 }
 print_mode;
 
 }
 print_mode;
 

+/* Versioned symbol info.  */
+enum versioned_symbol_info
+{
+  symbol_undefined,
+  symbol_hidden,
+  symbol_public
+};
+
+static const char *get_symbol_version_string
+  (FILE *file, int is_dynsym, const char *strtab,
+   unsigned long int strtab_size, unsigned int si,
+   Elf_Internal_Sym *psym, enum versioned_symbol_info *sym_info,
+   unsigned short *vna_other);
+

 #define UNKNOWN -1
 
 #define SECTION_NAME(X)                                                \
 #define UNKNOWN -1
 
 #define SECTION_NAME(X)                                                \


@@ -299,36 +321,65 @@ print_mode;
     }                                          \
   while (0)
 \f
     }                                          \
   while (0)
 \f

-/* Retrieve NMEMB structures, each SIZE bytes long from FILE starting at OFFSET.
+/* Retrieve NMEMB structures, each SIZE bytes long from FILE starting at OFFSET +
+   the offset of the current archive member, if we are examining an archive.

    Put the retrieved data into VAR, if it is not NULL.  Otherwise allocate a buffer
    using malloc and fill that.  In either case return the pointer to the start of
    the retrieved data or NULL if something went wrong.  If something does go wrong
    Put the retrieved data into VAR, if it is not NULL.  Otherwise allocate a buffer
    using malloc and fill that.  In either case return the pointer to the start of
    the retrieved data or NULL if something went wrong.  If something does go wrong

-   emit an error message using REASON as part of the context.  */
+   and REASON is not NULL then emit an error message using REASON as part of the
+   context.  */

 
 static void *
 
 static void *

-get_data (void * var, FILE * file, long offset, size_t size, size_t nmemb,
-         const char * reason)
+get_data (void * var, FILE * file, unsigned long offset, bfd_size_type size,
+         bfd_size_type nmemb, const char * reason)

 {
   void * mvar;
 {
   void * mvar;

+  bfd_size_type amt = size * nmemb;

 
   if (size == 0 || nmemb == 0)
     return NULL;
 
 
   if (size == 0 || nmemb == 0)
     return NULL;
 

-  if (fseek (file, archive_file_offset + offset, SEEK_SET))
+  /* If the size_t type is smaller than the bfd_size_type, eg because
+     you are building a 32-bit tool on a 64-bit host, then make sure
+     that when the sizes are cast to (size_t) no information is lost.  */
+  if (sizeof (size_t) < sizeof (bfd_size_type)
+      && (   (bfd_size_type) ((size_t) size) != size
+         || (bfd_size_type) ((size_t) nmemb) != nmemb))

     {
       if (reason)
     {
       if (reason)

-       error (_("Unable to seek to 0x%lx for %s\n"),
-              (unsigned long) archive_file_offset + offset, reason);
+       error (_("Size truncation prevents reading 0x%" BFD_VMA_FMT "x"
+                " elements of size 0x%" BFD_VMA_FMT "x for %s\n"),
+              nmemb, size, reason);
+      return NULL;
+    }
+
+  /* Check for size overflow.  */
+  if (amt < nmemb)
+    {
+      if (reason)
+       error (_("Size overflow prevents reading 0x%" BFD_VMA_FMT "x"
+                " elements of size 0x%" BFD_VMA_FMT "x for %s\n"),
+              nmemb, size, reason);

       return NULL;
     }
 
   /* Be kind to memory chekers (eg valgrind, address sanitizer) by not
      attempting to allocate memory when the read is bound to fail.  */
       return NULL;
     }
 
   /* Be kind to memory chekers (eg valgrind, address sanitizer) by not
      attempting to allocate memory when the read is bound to fail.  */

-  if (offset + archive_file_offset + size * nmemb > current_file_size)
+  if (amt > current_file_size
+      || offset + archive_file_offset + amt > current_file_size)
+    {
+      if (reason)
+       error (_("Reading 0x%" BFD_VMA_FMT "x"
+                " bytes extends past end of file for %s\n"),
+              amt, reason);
+      return NULL;
+    }
+
+  if (fseek (file, archive_file_offset + offset, SEEK_SET))

     {
       if (reason)
     {
       if (reason)

-       error (_("Reading 0x%lx bytes extends past end of file for %s\n"),
-              (unsigned long) (size * nmemb), reason);
+       error (_("Unable to seek to 0x%lx for %s\n"),
+              archive_file_offset + offset, reason);

       return NULL;
     }
 
       return NULL;
     }
 


@@ -336,26 +387,27 @@ get_data (void * var, FILE * file, long offset, size_t size, size_t nmemb,
   if (mvar == NULL)
     {
       /* Check for overflow.  */
   if (mvar == NULL)
     {
       /* Check for overflow.  */

-      if (nmemb < (~(size_t) 0 - 1) / size)
+      if (nmemb < (~(bfd_size_type) 0 - 1) / size)

        /* + 1 so that we can '\0' terminate invalid string table sections.  */
        /* + 1 so that we can '\0' terminate invalid string table sections.  */

-       mvar = malloc (size * nmemb + 1);
+       mvar = malloc ((size_t) amt + 1);

 
       if (mvar == NULL)
        {
          if (reason)
 
       if (mvar == NULL)
        {
          if (reason)

-           error (_("Out of memory allocating 0x%lx bytes for %s\n"),
-                  (unsigned long)(size * nmemb), reason);
+           error (_("Out of memory allocating 0x%" BFD_VMA_FMT "x"
+                    " bytes for %s\n"),
+                  amt, reason);

          return NULL;
        }
 
          return NULL;
        }
 

-      ((char *) mvar)[size * nmemb] = '\0';
+      ((char *) mvar)[amt] = '\0';

     }
 
     }
 

-  if (fread (mvar, size, nmemb, file) != nmemb)
+  if (fread (mvar, (size_t) size, (size_t) nmemb, file) != nmemb)

     {
       if (reason)
     {
       if (reason)

-       error (_("Unable to read in 0x%lx bytes of %s\n"),
-              (unsigned long)(size * nmemb), reason);
+       error (_("Unable to read in 0x%" BFD_VMA_FMT "x bytes of %s\n"),
+              amt, reason);

       if (mvar != var)
        free (mvar);
       return NULL;
       if (mvar != var)
        free (mvar);
       return NULL;


@@ -375,7 +427,7 @@ print_vma (bfd_vma vma, print_mode mode)
     {
     case FULL_HEX:
       nc = printf ("0x");
     {
     case FULL_HEX:
       nc = printf ("0x");

-      /* Drop through.  */
+      /* Fall through.  */

 
     case LONG_HEX:
 #ifdef BFD64
 
     case LONG_HEX:
 #ifdef BFD64


@@ -388,11 +440,11 @@ print_vma (bfd_vma vma, print_mode mode)
     case DEC_5:
       if (vma <= 99999)
        return printf ("%5" BFD_VMA_FMT "d", vma);
     case DEC_5:
       if (vma <= 99999)
        return printf ("%5" BFD_VMA_FMT "d", vma);

-      /* Drop through.  */
+      /* Fall through.  */

 
     case PREFIX_HEX:
       nc = printf ("0x");
 
     case PREFIX_HEX:
       nc = printf ("0x");

-      /* Drop through.  */
+      /* Fall through.  */

 
     case HEX:
       return nc + printf ("%" BFD_VMA_FMT "x", vma);
 
     case HEX:
       return nc + printf ("%" BFD_VMA_FMT "x", vma);


@@ -505,12 +557,12 @@ print_symbol (int width, const char *symbol)
   return num_printed;
 }
 
   return num_printed;
 }
 

-/* Returns a pointer to a static buffer containing a  printable version of
+/* Returns a pointer to a static buffer containing a printable version of

    the given section's name.  Like print_symbol, except that it does not try
    to print multibyte characters, it just interprets them as hex values.  */
 
 static const char *
    the given section's name.  Like print_symbol, except that it does not try
    to print multibyte characters, it just interprets them as hex values.  */
 
 static const char *

-printable_section_name (Elf_Internal_Shdr * sec)
+printable_section_name (const Elf_Internal_Shdr * sec)

 {
 #define MAX_PRINT_SEC_NAME_LEN 128
   static char  sec_name_buf [MAX_PRINT_SEC_NAME_LEN + 1];
 {
 #define MAX_PRINT_SEC_NAME_LEN 128
   static char  sec_name_buf [MAX_PRINT_SEC_NAME_LEN + 1];


@@ -525,7 +577,7 @@ printable_section_name (Elf_Internal_Shdr * sec)
        {
          if (remaining < 2)
            break;
        {
          if (remaining < 2)
            break;

-         
+

          * buf ++ = '^';
          * buf ++ = c + 0x40;
          remaining -= 2;
          * buf ++ = '^';
          * buf ++ = c + 0x40;
          remaining -= 2;


@@ -661,7 +713,7 @@ guess_is_rela (unsigned int e_machine)
     {
       /* Targets that use REL relocations.  */
     case EM_386:
     {
       /* Targets that use REL relocations.  */
     case EM_386:

-    case EM_486:
+    case EM_IAMCU:

     case EM_960:
     case EM_ARM:
     case EM_D10V:
     case EM_960:
     case EM_ARM:
     case EM_D10V:


@@ -681,6 +733,9 @@ guess_is_rela (unsigned int e_machine)
     case EM_ADAPTEVA_EPIPHANY:
     case EM_ALPHA:
     case EM_ALTERA_NIOS2:
     case EM_ADAPTEVA_EPIPHANY:
     case EM_ALPHA:
     case EM_ALTERA_NIOS2:

+    case EM_ARC:
+    case EM_ARC_COMPACT:
+    case EM_ARC_COMPACT2:

     case EM_AVR:
     case EM_AVR_OLD:
     case EM_BLACKFIN:
     case EM_AVR:
     case EM_AVR_OLD:
     case EM_BLACKFIN:


@@ -690,6 +745,7 @@ guess_is_rela (unsigned int e_machine)
     case EM_D30V:
     case EM_CYGNUS_D30V:
     case EM_FR30:
     case EM_D30V:
     case EM_CYGNUS_D30V:
     case EM_FR30:

+    case EM_FT32:

     case EM_CYGNUS_FR30:
     case EM_CYGNUS_FRV:
     case EM_H8S:
     case EM_CYGNUS_FR30:
     case EM_CYGNUS_FRV:
     case EM_H8S:


@@ -720,6 +776,7 @@ guess_is_rela (unsigned int e_machine)
     case EM_OR1K:
     case EM_PPC64:
     case EM_PPC:
     case EM_OR1K:
     case EM_PPC64:
     case EM_PPC:

+    case EM_RISCV:

     case EM_RL78:
     case EM_RX:
     case EM_S390:
     case EM_RL78:
     case EM_RX:
     case EM_S390:


@@ -736,6 +793,7 @@ guess_is_rela (unsigned int e_machine)
     case EM_V850:
     case EM_CYGNUS_V850:
     case EM_VAX:
     case EM_V850:
     case EM_CYGNUS_V850:
     case EM_VAX:

+    case EM_VISIUM:

     case EM_X86_64:
     case EM_L1OM:
     case EM_K1OM:
     case EM_X86_64:
     case EM_L1OM:
     case EM_K1OM:


@@ -1015,7 +1073,8 @@ dump_relocations (FILE * file,
                  unsigned long nsyms,
                  char * strtab,
                  unsigned long strtablen,
                  unsigned long nsyms,
                  char * strtab,
                  unsigned long strtablen,

-                 int is_rela)
+                 int is_rela,
+                 int is_dynsym)

 {
   unsigned int i;
   Elf_Internal_Rela * rels;
 {
   unsigned int i;
   Elf_Internal_Rela * rels;


@@ -1135,7 +1194,7 @@ dump_relocations (FILE * file,
          break;
 
        case EM_386:
          break;
 
        case EM_386:

-       case EM_486:
+       case EM_IAMCU:

          rtype = elf_i386_reloc_type (type);
          break;
 
          rtype = elf_i386_reloc_type (type);
          break;
 


@@ -1213,6 +1272,10 @@ dump_relocations (FILE * file,
          rtype = elf_frv_reloc_type (type);
          break;
 
          rtype = elf_frv_reloc_type (type);
          break;
 

+       case EM_FT32:
+         rtype = elf_ft32_reloc_type (type);
+         break;
+

        case EM_MCORE:
          rtype = elf_mcore_reloc_type (type);
          break;
        case EM_MCORE:
          rtype = elf_mcore_reloc_type (type);
          break;


@@ -1231,6 +1294,7 @@ dump_relocations (FILE * file,
              rtype = elf_msp430x_reloc_type (type);
              break;
            }
              rtype = elf_msp430x_reloc_type (type);
              break;
            }

+         /* Fall through.  */

        case EM_MSP430_OLD:
          rtype = elf_msp430_reloc_type (type);
          break;
        case EM_MSP430_OLD:
          rtype = elf_msp430_reloc_type (type);
          break;


@@ -1252,6 +1316,10 @@ dump_relocations (FILE * file,
          rtype = elf_mips_reloc_type (type);
          break;
 
          rtype = elf_mips_reloc_type (type);
          break;
 

+       case EM_RISCV:
+         rtype = elf_riscv_reloc_type (type);
+         break;
+

        case EM_ALPHA:
          rtype = elf_alpha_reloc_type (type);
          break;
        case EM_ALPHA:
          rtype = elf_alpha_reloc_type (type);
          break;


@@ -1261,6 +1329,8 @@ dump_relocations (FILE * file,
          break;
 
        case EM_ARC:
          break;
 
        case EM_ARC:

+       case EM_ARC_COMPACT:
+       case EM_ARC_COMPACT2:

          rtype = elf_arc_reloc_type (type);
          break;
 
          rtype = elf_arc_reloc_type (type);
          break;
 


@@ -1325,6 +1395,10 @@ dump_relocations (FILE * file,
          rtype = elf_vax_reloc_type (type);
          break;
 
          rtype = elf_vax_reloc_type (type);
          break;
 

+       case EM_VISIUM:
+         rtype = elf_visium_reloc_type (type);
+         break;
+

        case EM_ADAPTEVA_EPIPHANY:
          rtype = elf_epiphany_reloc_type (type);
          break;
        case EM_ADAPTEVA_EPIPHANY:
          rtype = elf_epiphany_reloc_type (type);
          break;


@@ -1448,9 +1522,20 @@ dump_relocations (FILE * file,
          else
            {
              Elf_Internal_Sym * psym;
          else
            {
              Elf_Internal_Sym * psym;

+             const char * version_string;
+             enum versioned_symbol_info sym_info;
+             unsigned short vna_other;

 
              psym = symtab + symtab_index;
 
 
              psym = symtab + symtab_index;
 

+             version_string
+               = get_symbol_version_string (file, is_dynsym,
+                                            strtab, strtablen,
+                                            symtab_index,
+                                            psym,
+                                            &sym_info,
+                                            &vna_other);
+

              printf (" ");
 
              if (ELF_ST_TYPE (psym->st_info) == STT_GNU_IFUNC)
              printf (" ");
 
              if (ELF_ST_TYPE (psym->st_info) == STT_GNU_IFUNC)


@@ -1477,6 +1562,9 @@ dump_relocations (FILE * file,
                    name = strtab + psym->st_name;
 
                  len = print_symbol (width, name);
                    name = strtab + psym->st_name;
 
                  len = print_symbol (width, name);

+                 if (version_string)
+                   printf (sym_info == symbol_public ? "@@%s" : "@%s",
+                           version_string);

                  printf ("()%-*s", len <= width ? (width + 1) - len : 1, " ");
                }
              else
                  printf ("()%-*s", len <= width ? (width + 1) - len : 1, " ");
                }
              else


@@ -1533,13 +1621,18 @@ dump_relocations (FILE * file,
              else if (psym->st_name >= strtablen)
                printf (_("<corrupt string table index: %3ld>"), psym->st_name);
              else
              else if (psym->st_name >= strtablen)
                printf (_("<corrupt string table index: %3ld>"), psym->st_name);
              else

-               print_symbol (22, strtab + psym->st_name);
+               {
+                 print_symbol (22, strtab + psym->st_name);
+                 if (version_string)
+                   printf (sym_info == symbol_public ? "@@%s" : "@%s",
+                           version_string);
+               }

 
              if (is_rela)
                {
 
              if (is_rela)
                {

-                 bfd_signed_vma off = rels[i].r_addend;
+                 bfd_vma off = rels[i].r_addend;

 
 

-                 if (off < 0)
+                 if ((bfd_signed_vma) off < 0)

                    printf (" - %" BFD_VMA_FMT "x", - off);
                  else
                    printf (" + %" BFD_VMA_FMT "x", off);
                    printf (" - %" BFD_VMA_FMT "x", - off);
                  else
                    printf (" + %" BFD_VMA_FMT "x", off);


@@ -1548,10 +1641,10 @@ dump_relocations (FILE * file,
        }
       else if (is_rela)
        {
        }
       else if (is_rela)
        {

-         bfd_signed_vma off = rels[i].r_addend;
+         bfd_vma off = rels[i].r_addend;

 
          printf ("%*c", is_32bit_elf ? 12 : 20, ' ');
 
          printf ("%*c", is_32bit_elf ? 12 : 20, ' ');

-         if (off < 0)
+         if ((bfd_signed_vma) off < 0)

            printf ("-%" BFD_VMA_FMT "x", - off);
          else
            printf ("%" BFD_VMA_FMT "x", off);
            printf ("-%" BFD_VMA_FMT "x", - off);
          else
            printf ("%" BFD_VMA_FMT "x", off);


@@ -1618,6 +1711,7 @@ get_mips_dynamic_type (unsigned long type)
     case DT_MIPS_GOTSYM: return "MIPS_GOTSYM";
     case DT_MIPS_HIPAGENO: return "MIPS_HIPAGENO";
     case DT_MIPS_RLD_MAP: return "MIPS_RLD_MAP";
     case DT_MIPS_GOTSYM: return "MIPS_GOTSYM";
     case DT_MIPS_HIPAGENO: return "MIPS_HIPAGENO";
     case DT_MIPS_RLD_MAP: return "MIPS_RLD_MAP";

+    case DT_MIPS_RLD_MAP_REL: return "MIPS_RLD_MAP_REL";

     case DT_MIPS_DELTA_CLASS: return "MIPS_DELTA_CLASS";
     case DT_MIPS_DELTA_CLASS_NO: return "MIPS_DELTA_CLASS_NO";
     case DT_MIPS_DELTA_INSTANCE: return "MIPS_DELTA_INSTANCE";
     case DT_MIPS_DELTA_CLASS: return "MIPS_DELTA_CLASS";
     case DT_MIPS_DELTA_CLASS_NO: return "MIPS_DELTA_CLASS_NO";
     case DT_MIPS_DELTA_INSTANCE: return "MIPS_DELTA_INSTANCE";


@@ -1763,6 +1857,34 @@ get_ia64_dynamic_type (unsigned long type)
     }
 }
 
     }
 }
 

+static const char *
+get_solaris_section_type (unsigned long type)
+{
+  switch (type)
+    {
+    case 0x6fffffee: return "SUNW_ancillary";
+    case 0x6fffffef: return "SUNW_capchain";
+    case 0x6ffffff0: return "SUNW_capinfo";
+    case 0x6ffffff1: return "SUNW_symsort";
+    case 0x6ffffff2: return "SUNW_tlssort";
+    case 0x6ffffff3: return "SUNW_LDYNSYM";
+    case 0x6ffffff4: return "SUNW_dof";
+    case 0x6ffffff5: return "SUNW_cap";
+    case 0x6ffffff6: return "SUNW_SIGNATURE";
+    case 0x6ffffff7: return "SUNW_ANNOTATE";
+    case 0x6ffffff8: return "SUNW_DEBUGSTR";
+    case 0x6ffffff9: return "SUNW_DEBUG";
+    case 0x6ffffffa: return "SUNW_move";
+    case 0x6ffffffb: return "SUNW_COMDAT";
+    case 0x6ffffffc: return "SUNW_syminfo";
+    case 0x6ffffffd: return "SUNW_verdef";
+    case 0x6ffffffe: return "SUNW_verneed";
+    case 0x6fffffff: return "SUNW_versym";
+    case 0x70000000: return "SPARC_GOTDATA";
+    default: return NULL;
+    }
+}
+

 static const char *
 get_alpha_dynamic_type (unsigned long type)
 {
 static const char *
 get_alpha_dynamic_type (unsigned long type)
 {


@@ -1817,6 +1939,43 @@ get_nios2_dynamic_type (unsigned long type)
     }
 }
 
     }
 }
 

+static const char *
+get_solaris_dynamic_type (unsigned long type)
+{
+  switch (type)
+    {
+    case 0x6000000d: return "SUNW_AUXILIARY";
+    case 0x6000000e: return "SUNW_RTLDINF";
+    case 0x6000000f: return "SUNW_FILTER";
+    case 0x60000010: return "SUNW_CAP";
+    case 0x60000011: return "SUNW_SYMTAB";
+    case 0x60000012: return "SUNW_SYMSZ";
+    case 0x60000013: return "SUNW_SORTENT";
+    case 0x60000014: return "SUNW_SYMSORT";
+    case 0x60000015: return "SUNW_SYMSORTSZ";
+    case 0x60000016: return "SUNW_TLSSORT";
+    case 0x60000017: return "SUNW_TLSSORTSZ";
+    case 0x60000018: return "SUNW_CAPINFO";
+    case 0x60000019: return "SUNW_STRPAD";
+    case 0x6000001a: return "SUNW_CAPCHAIN";
+    case 0x6000001b: return "SUNW_LDMACH";
+    case 0x6000001d: return "SUNW_CAPCHAINENT";
+    case 0x6000001f: return "SUNW_CAPCHAINSZ";
+    case 0x60000021: return "SUNW_PARENT";
+    case 0x60000023: return "SUNW_ASLR";
+    case 0x60000025: return "SUNW_RELAX";
+    case 0x60000029: return "SUNW_NXHEAP";
+    case 0x6000002b: return "SUNW_NXSTACK";
+
+    case 0x70000001: return "SPARC_REGISTER";
+    case 0x7ffffffd: return "AUXILIARY";
+    case 0x7ffffffe: return "USED";
+    case 0x7fffffff: return "FILTER";
+
+    default: return NULL;
+    }
+}
+

 static const char *
 get_dynamic_type (unsigned long type)
 {
 static const char *
 get_dynamic_type (unsigned long type)
 {


@@ -1858,6 +2017,7 @@ get_dynamic_type (unsigned long type)
 
     case DT_PREINIT_ARRAY: return "PREINIT_ARRAY";
     case DT_PREINIT_ARRAYSZ: return "PREINIT_ARRAYSZ";
 
     case DT_PREINIT_ARRAY: return "PREINIT_ARRAY";
     case DT_PREINIT_ARRAYSZ: return "PREINIT_ARRAYSZ";

+    case DT_SYMTAB_SHNDX: return "SYMTAB_SHNDX";

 
     case DT_CHECKSUM:  return "CHECKSUM";
     case DT_PLTPADSZ:  return "PLTPADSZ";
 
     case DT_CHECKSUM:  return "CHECKSUM";
     case DT_PLTPADSZ:  return "PLTPADSZ";


@@ -1935,7 +2095,10 @@ get_dynamic_type (unsigned long type)
              result = get_nios2_dynamic_type (type);
              break;
            default:
              result = get_nios2_dynamic_type (type);
              break;
            default:

-             result = NULL;
+             if (elf_header.e_ident[EI_OSABI] == ELFOSABI_SOLARIS)
+               result = get_solaris_dynamic_type (type);
+             else
+               result = NULL;

              break;
            }
 
              break;
            }
 


@@ -1959,7 +2122,10 @@ get_dynamic_type (unsigned long type)
              result = get_ia64_dynamic_type (type);
              break;
            default:
              result = get_ia64_dynamic_type (type);
              break;
            default:

-             result = NULL;
+             if (elf_header.e_ident[EI_OSABI] == ELFOSABI_SOLARIS)
+               result = get_solaris_dynamic_type (type);
+             else
+               result = NULL;

              break;
            }
 
              break;
            }
 


@@ -2015,7 +2181,7 @@ get_machine_name (unsigned e_machine)
     case EM_386:               return "Intel 80386";
     case EM_68K:               return "MC68000";
     case EM_88K:               return "MC88000";
     case EM_386:               return "Intel 80386";
     case EM_68K:               return "MC68000";
     case EM_88K:               return "MC88000";

-    case EM_486:               return "Intel 80486";
+    case EM_IAMCU:             return "Intel MCU";

     case EM_860:               return "Intel 80860";
     case EM_MIPS:              return "MIPS R3000";
     case EM_S370:              return "IBM System/370";
     case EM_860:               return "Intel 80860";
     case EM_MIPS:              return "MIPS R3000";
     case EM_S370:              return "IBM System/370";


@@ -2028,6 +2194,7 @@ get_machine_name (unsigned e_machine)
     case EM_PPC:               return "PowerPC";
     case EM_PPC64:             return "PowerPC64";
     case EM_FR20:              return "Fujitsu FR20";
     case EM_PPC:               return "PowerPC";
     case EM_PPC64:             return "PowerPC64";
     case EM_FR20:              return "Fujitsu FR20";

+    case EM_FT32:              return "FTDI FT32";

     case EM_RH32:              return "TRW RH32";
     case EM_MCORE:             return "MCORE";
     case EM_ARM:               return "ARM";
     case EM_RH32:              return "TRW RH32";
     case EM_MCORE:             return "MCORE";
     case EM_ARM:               return "ARM";


@@ -2036,6 +2203,8 @@ get_machine_name (unsigned e_machine)
     case EM_SPARCV9:           return "Sparc v9";
     case EM_TRICORE:           return "Siemens Tricore";
     case EM_ARC:               return "ARC";
     case EM_SPARCV9:           return "Sparc v9";
     case EM_TRICORE:           return "Siemens Tricore";
     case EM_ARC:               return "ARC";

+    case EM_ARC_COMPACT:       return "ARCompact";
+    case EM_ARC_COMPACT2:      return "ARCv2";

     case EM_H8_300:            return "Renesas H8/300";
     case EM_H8_300H:           return "Renesas H8/300H";
     case EM_H8S:               return "Renesas H8S";
     case EM_H8_300:            return "Renesas H8/300";
     case EM_H8_300H:           return "Renesas H8/300H";
     case EM_H8S:               return "Renesas H8S";


@@ -2085,6 +2254,7 @@ get_machine_name (unsigned e_machine)
     case EM_SVX:               return "Silicon Graphics SVx";
     case EM_ST19:              return "STMicroelectronics ST19 8-bit microcontroller";
     case EM_VAX:               return "Digital VAX";
     case EM_SVX:               return "Silicon Graphics SVx";
     case EM_ST19:              return "STMicroelectronics ST19 8-bit microcontroller";
     case EM_VAX:               return "Digital VAX";

+    case EM_VISIUM:            return "CDS VISIUMcore processor";

     case EM_AVR_OLD:
     case EM_AVR:               return "Atmel AVR 8-bit microcontroller";
     case EM_CRIS:              return "Axis Communications 32-bit embedded processor";
     case EM_AVR_OLD:
     case EM_AVR:               return "Atmel AVR 8-bit microcontroller";
     case EM_CRIS:              return "Axis Communications 32-bit embedded processor";


@@ -2102,7 +2272,6 @@ get_machine_name (unsigned e_machine)
     case EM_SCORE:             return "SUNPLUS S+Core";
     case EM_XSTORMY16:         return "Sanyo XStormy16 CPU core";
     case EM_OR1K:              return "OpenRISC 1000";
     case EM_SCORE:             return "SUNPLUS S+Core";
     case EM_XSTORMY16:         return "Sanyo XStormy16 CPU core";
     case EM_OR1K:              return "OpenRISC 1000";

-    case EM_ARC_A5:            return "ARC International ARCompact processor";

     case EM_CRX:               return "National Semiconductor CRX microprocessor";
     case EM_ADAPTEVA_EPIPHANY: return "Adapteva EPIPHANY";
     case EM_DLX:               return "OpenDLX";
     case EM_CRX:               return "National Semiconductor CRX microprocessor";
     case EM_ADAPTEVA_EPIPHANY: return "Adapteva EPIPHANY";
     case EM_DLX:               return "OpenDLX";


@@ -2164,6 +2333,7 @@ get_machine_name (unsigned e_machine)
     case EM_CR16:
     case EM_MICROBLAZE:
     case EM_MICROBLAZE_OLD:    return "Xilinx MicroBlaze";
     case EM_CR16:
     case EM_MICROBLAZE:
     case EM_MICROBLAZE_OLD:    return "Xilinx MicroBlaze";

+    case EM_RISCV:             return "RISC-V";

     case EM_RL78:              return "Renesas RL78";
     case EM_RX:                        return "Renesas RX";
     case EM_METAG:             return "Imagination Technologies Meta processor architecture";
     case EM_RL78:              return "Renesas RL78";
     case EM_RX:                        return "Renesas RX";
     case EM_METAG:             return "Imagination Technologies Meta processor architecture";


@@ -2178,12 +2348,101 @@ get_machine_name (unsigned e_machine)
     case EM_TILEGX:            return "Tilera TILE-Gx multicore architecture family";
     case EM_CUDA:              return "NVIDIA CUDA architecture";
     case EM_XGATE:             return "Motorola XGATE embedded processor";
     case EM_TILEGX:            return "Tilera TILE-Gx multicore architecture family";
     case EM_CUDA:              return "NVIDIA CUDA architecture";
     case EM_XGATE:             return "Motorola XGATE embedded processor";

+    case EM_CLOUDSHIELD:       return "CloudShield architecture family";
+    case EM_COREA_1ST:         return "KIPO-KAIST Core-A 1st generation processor family";
+    case EM_COREA_2ND:         return "KIPO-KAIST Core-A 2nd generation processor family";
+    case EM_OPEN8:             return "Open8 8-bit RISC soft processor core";
+    case EM_VIDEOCORE5:                return "Broadcom VideoCore V processor";
+    case EM_56800EX:           return "Freescale 56800EX Digital Signal Controller (DSC)";
+    case EM_BA1:               return "Beyond BA1 CPU architecture";
+    case EM_BA2:               return "Beyond BA2 CPU architecture";
+    case EM_XCORE:             return "XMOS xCORE processor family";
+    case EM_MCHP_PIC:          return "Microchip 8-bit PIC(r) family";
+    case EM_KM32:              return "KM211 KM32 32-bit processor";
+    case EM_KMX32:             return "KM211 KMX32 32-bit processor";
+    case EM_KMX16:             return "KM211 KMX16 16-bit processor";
+    case EM_KMX8:              return "KM211 KMX8 8-bit processor";
+    case EM_KVARC:             return "KM211 KVARC processor";
+    case EM_CDP:               return "Paneve CDP architecture family";
+    case EM_COGE:              return "Cognitive Smart Memory Processor";
+    case EM_COOL:              return "Bluechip Systems CoolEngine";
+    case EM_NORC:              return "Nanoradio Optimized RISC";
+    case EM_CSR_KALIMBA:       return "CSR Kalimba architecture family";
+    case EM_Z80:               return "Zilog Z80";
+    case EM_AMDGPU:            return "AMD GPU architecture";

     default:
       snprintf (buff, sizeof (buff), _("<unknown>: 0x%x"), e_machine);
       return buff;
     }
 }
 
     default:
       snprintf (buff, sizeof (buff), _("<unknown>: 0x%x"), e_machine);
       return buff;
     }
 }
 

+static void
+decode_ARC_machine_flags (unsigned e_flags, unsigned e_machine, char buf[])
+{
+  /* ARC has two machine types EM_ARC_COMPACT and EM_ARC_COMPACT2.  Some
+     other compilers don't a specific architecture type in the e_flags, and
+     instead use EM_ARC_COMPACT for old ARC600, ARC601, and ARC700
+     architectures, and switch to EM_ARC_COMPACT2 for newer ARCEM and ARCHS
+     architectures.
+
+     Th GNU tools follows this use of EM_ARC_COMPACT and EM_ARC_COMPACT2,
+     but also sets a specific architecture type in the e_flags field.
+
+     However, when decoding the flags we don't worry if we see an
+     unexpected pairing, for example EM_ARC_COMPACT machine type, with
+     ARCEM architecture type.  */
+
+  switch (e_flags & EF_ARC_MACH_MSK)
+    {
+      /* We only expect these to occur for EM_ARC_COMPACT2.  */
+    case EF_ARC_CPU_ARCV2EM:
+      strcat (buf, ", ARC EM");
+      break;
+    case EF_ARC_CPU_ARCV2HS:
+      strcat (buf, ", ARC HS");
+      break;
+
+      /* We only expect these to occur for EM_ARC_COMPACT.  */
+    case E_ARC_MACH_ARC600:
+      strcat (buf, ", ARC600");
+      break;
+    case E_ARC_MACH_ARC601:
+      strcat (buf, ", ARC601");
+      break;
+    case E_ARC_MACH_ARC700:
+      strcat (buf, ", ARC700");
+      break;
+
+      /* The only times we should end up here are (a) A corrupt ELF, (b) A
+         new ELF with new architecture being read by an old version of
+         readelf, or (c) An ELF built with non-GNU compiler that does not
+         set the architecture in the e_flags.  */
+    default:
+      if (e_machine == EM_ARC_COMPACT)
+        strcat (buf, ", Unknown ARCompact");
+      else
+        strcat (buf, ", Unknown ARC");
+      break;
+    }
+
+  switch (e_flags & EF_ARC_OSABI_MSK)
+    {
+    case E_ARC_OSABI_ORIG:
+      strcat (buf, ", (ABI:legacy)");
+      break;
+    case E_ARC_OSABI_V2:
+      strcat (buf, ", (ABI:v2)");
+      break;
+      /* Only upstream 3.9+ kernels will support ARCv2 ISA.  */
+    case E_ARC_OSABI_V3:
+      strcat (buf, ", v3 no-legacy-syscalls ABI");
+      break;
+    default:
+      strcat (buf, ", unrecognised ARC OSABI flag");
+      break;
+    }
+}
+

 static void
 decode_ARM_machine_flags (unsigned e_flags, char buf[])
 {
 static void
 decode_ARM_machine_flags (unsigned e_flags, char buf[])
 {


@@ -2200,12 +2459,6 @@ decode_ARM_machine_flags (unsigned e_flags, char buf[])
       e_flags &= ~ EF_ARM_RELEXEC;
     }
 
       e_flags &= ~ EF_ARM_RELEXEC;
     }
 

-  if (e_flags & EF_ARM_HASENTRY)
-    {
-      strcat (buf, ", has entry point");
-      e_flags &= ~ EF_ARM_HASENTRY;
-    }
-

   /* Now handle EABI specific flags.  */
   switch (eabi)
     {
   /* Now handle EABI specific flags.  */
   switch (eabi)
     {


@@ -2399,6 +2652,77 @@ decode_ARM_machine_flags (unsigned e_flags, char buf[])
     strcat (buf,_(", <unknown>"));
 }
 
     strcat (buf,_(", <unknown>"));
 }
 

+static void
+decode_AVR_machine_flags (unsigned e_flags, char buf[], size_t size)
+{
+  --size; /* Leave space for null terminator.  */
+
+  switch (e_flags & EF_AVR_MACH)
+    {
+    case E_AVR_MACH_AVR1:
+      strncat (buf, ", avr:1", size);
+      break;
+    case E_AVR_MACH_AVR2:
+      strncat (buf, ", avr:2", size);
+      break;
+    case E_AVR_MACH_AVR25:
+      strncat (buf, ", avr:25", size);
+      break;
+    case E_AVR_MACH_AVR3:
+      strncat (buf, ", avr:3", size);
+      break;
+    case E_AVR_MACH_AVR31:
+      strncat (buf, ", avr:31", size);
+      break;
+    case E_AVR_MACH_AVR35:
+      strncat (buf, ", avr:35", size);
+      break;
+    case E_AVR_MACH_AVR4:
+      strncat (buf, ", avr:4", size);
+      break;
+    case E_AVR_MACH_AVR5:
+      strncat (buf, ", avr:5", size);
+      break;
+    case E_AVR_MACH_AVR51:
+      strncat (buf, ", avr:51", size);
+      break;
+    case E_AVR_MACH_AVR6:
+      strncat (buf, ", avr:6", size);
+      break;
+    case E_AVR_MACH_AVRTINY:
+      strncat (buf, ", avr:100", size);
+      break;
+    case E_AVR_MACH_XMEGA1:
+      strncat (buf, ", avr:101", size);
+      break;
+    case E_AVR_MACH_XMEGA2:
+      strncat (buf, ", avr:102", size);
+      break;
+    case E_AVR_MACH_XMEGA3:
+      strncat (buf, ", avr:103", size);
+      break;
+    case E_AVR_MACH_XMEGA4:
+      strncat (buf, ", avr:104", size);
+      break;
+    case E_AVR_MACH_XMEGA5:
+      strncat (buf, ", avr:105", size);
+      break;
+    case E_AVR_MACH_XMEGA6:
+      strncat (buf, ", avr:106", size);
+      break;
+    case E_AVR_MACH_XMEGA7:
+      strncat (buf, ", avr:107", size);
+      break;
+    default:
+      strncat (buf, ", avr:<unknown>", size);
+      break;
+    }
+
+  size -= strlen (buf);
+  if (e_flags & EF_AVR_LINKRELAX_PREPARED)
+    strncat (buf, ", link-relax", size);
+}
+

 static void
 decode_NDS32_machine_flags (unsigned e_flags, char buf[], size_t size)
 {
 static void
 decode_NDS32_machine_flags (unsigned e_flags, char buf[], size_t size)
 {


@@ -2616,10 +2940,19 @@ get_machine_flags (unsigned e_flags, unsigned e_machine)
        default:
          break;
 
        default:
          break;
 

+       case EM_ARC_COMPACT2:
+       case EM_ARC_COMPACT:
+          decode_ARC_machine_flags (e_flags, e_machine, buf);
+          break;
+

        case EM_ARM:
          decode_ARM_machine_flags (e_flags, buf);
          break;
 
        case EM_ARM:
          decode_ARM_machine_flags (e_flags, buf);
          break;
 

+        case EM_AVR:
+          decode_AVR_machine_flags (e_flags, buf, sizeof buf);
+          break;
+

        case EM_BLACKFIN:
          if (e_flags & EF_BFIN_PIC)
            strcat (buf, ", PIC");
        case EM_BLACKFIN:
          if (e_flags & EF_BFIN_PIC)
            strcat (buf, ", PIC");


@@ -2745,6 +3078,40 @@ get_machine_flags (unsigned e_flags, unsigned e_machine)
            }
          break;
 
            }
          break;
 

+       case EM_CYGNUS_MEP:
+         switch (e_flags & EF_MEP_CPU_MASK)
+           {
+           case EF_MEP_CPU_MEP: strcat (buf, ", generic MeP"); break;
+           case EF_MEP_CPU_C2: strcat (buf, ", MeP C2"); break;
+           case EF_MEP_CPU_C3: strcat (buf, ", MeP C3"); break;
+           case EF_MEP_CPU_C4: strcat (buf, ", MeP C4"); break;
+           case EF_MEP_CPU_C5: strcat (buf, ", MeP C5"); break;
+           case EF_MEP_CPU_H1: strcat (buf, ", MeP H1"); break;
+           default: strcat (buf, _(", <unknown MeP cpu type>")); break;
+           }
+
+         switch (e_flags & EF_MEP_COP_MASK)
+           {
+           case EF_MEP_COP_NONE: break;
+           case EF_MEP_COP_AVC: strcat (buf, ", AVC coprocessor"); break;
+           case EF_MEP_COP_AVC2: strcat (buf, ", AVC2 coprocessor"); break;
+           case EF_MEP_COP_FMAX: strcat (buf, ", FMAX coprocessor"); break;
+           case EF_MEP_COP_IVC2: strcat (buf, ", IVC2 coprocessor"); break;
+           default: strcat (buf, _("<unknown MeP copro type>")); break;
+           }
+
+         if (e_flags & EF_MEP_LIBRARY)
+           strcat (buf, ", Built for Library");
+
+         if (e_flags & EF_MEP_INDEX_MASK)
+           sprintf (buf + strlen (buf), ", Configuration Index: %#x",
+                    e_flags & EF_MEP_INDEX_MASK);
+
+         if (e_flags & ~ EF_MEP_ALL_FLAGS)
+           sprintf (buf + strlen (buf), _(", unknown flags bits: %#x"),
+                    e_flags & ~ EF_MEP_ALL_FLAGS);
+         break;
+

        case EM_PPC:
          if (e_flags & EF_PPC_EMB)
            strcat (buf, ", emb");
        case EM_PPC:
          if (e_flags & EF_PPC_EMB)
            strcat (buf, ", emb");


@@ -2797,12 +3164,8 @@ get_machine_flags (unsigned e_flags, unsigned e_machine)
                {
                case EF_RH850_FPU_DOUBLE: strcat (buf, ", double precision FPU"); break;
                case EF_RH850_FPU_SINGLE: strcat (buf, ", single precision FPU"); break;
                {
                case EF_RH850_FPU_DOUBLE: strcat (buf, ", double precision FPU"); break;
                case EF_RH850_FPU_SINGLE: strcat (buf, ", single precision FPU"); break;

-               case EF_RH850_SIMD: strcat (buf, ", SIMD"); break;
-               case EF_RH850_CACHE: strcat (buf, ", CACHE"); break;
-               case EF_RH850_MMU: strcat (buf, ", MMU"); break;

                case EF_RH850_REGMODE22: strcat (buf, ", regmode:22"); break;
                case EF_RH850_REGMODE32: strcat (buf, ", regmode:23"); break;
                case EF_RH850_REGMODE22: strcat (buf, ", regmode:22"); break;
                case EF_RH850_REGMODE32: strcat (buf, ", regmode:23"); break;

-               case EF_RH850_DATA_ALIGN8: strcat (buf, ", 8-byte alignment"); break;

                case EF_RH850_GP_FIX: strcat (buf, ", r4 fixed"); break;
                case EF_RH850_GP_NOFIX: strcat (buf, ", r4 free"); break;
                case EF_RH850_EP_FIX: strcat (buf, ", r30 fixed"); break;
                case EF_RH850_GP_FIX: strcat (buf, ", r4 fixed"); break;
                case EF_RH850_GP_NOFIX: strcat (buf, ", r4 free"); break;
                case EF_RH850_EP_FIX: strcat (buf, ", r30 fixed"); break;


@@ -2951,6 +3314,13 @@ get_machine_flags (unsigned e_flags, unsigned e_machine)
          decode_NDS32_machine_flags (e_flags, buf, sizeof buf);
          break;
 
          decode_NDS32_machine_flags (e_flags, buf, sizeof buf);
          break;
 

+       case EM_RISCV:
+         if (e_flags & EF_RISCV_RVC)
+           strcat (buf, ", RVC");
+         if (e_flags & EF_RISCV_SOFT_FLOAT)
+           strcat (buf, ", soft-float ABI");
+         break;
+

        case EM_SH:
          switch ((e_flags & EF_SH_MACH_MASK))
            {
        case EM_SH:
          switch ((e_flags & EF_SH_MACH_MASK))
            {


@@ -2984,7 +3354,7 @@ get_machine_flags (unsigned e_flags, unsigned e_machine)
          if (e_flags & EF_SH_FDPIC)
            strcat (buf, ", fdpic");
          break;
          if (e_flags & EF_SH_FDPIC)
            strcat (buf, ", fdpic");
          break;

-          
+

         case EM_OR1K:
           if (e_flags & EF_OR1K_NODELAY)
             strcat (buf, ", no delay");
         case EM_OR1K:
           if (e_flags & EF_OR1K_NODELAY)
             strcat (buf, ", no delay");


@@ -3085,7 +3455,9 @@ get_machine_flags (unsigned e_flags, unsigned e_machine)
                   strcat (buf, ", abort");
                   break;
                 default:
                   strcat (buf, ", abort");
                   break;
                 default:

-                  abort ();
+                 warn (_("Unrecognised IA64 VMS Command Code: %x\n"),
+                       e_flags & EF_IA_64_VMS_COMCOD);
+                 strcat (buf, ", <unknown>");

                 }
             }
          break;
                 }
             }
          break;


@@ -3099,9 +3471,23 @@ get_machine_flags (unsigned e_flags, unsigned e_machine)
            strcat (buf, ", G-Float");
          break;
 
            strcat (buf, ", G-Float");
          break;
 

+        case EM_VISIUM:
+         if (e_flags & EF_VISIUM_ARCH_MCM)
+           strcat (buf, ", mcm");
+         else if (e_flags & EF_VISIUM_ARCH_MCM24)
+           strcat (buf, ", mcm24");
+         if (e_flags & EF_VISIUM_ARCH_GR6)
+           strcat (buf, ", gr6");
+         break;
+

        case EM_RL78:
        case EM_RL78:

-         if (e_flags & E_FLAG_RL78_G10)
-           strcat (buf, ", G10");
+         switch (e_flags & E_FLAG_RL78_CPU_MASK)
+           {
+           case E_FLAG_RL78_ANY_CPU: break;
+           case E_FLAG_RL78_G10: strcat (buf, ", G10"); break;
+           case E_FLAG_RL78_G13: strcat (buf, ", G13"); break;
+           case E_FLAG_RL78_G14: strcat (buf, ", G14"); break;
+           }

          if (e_flags & E_FLAG_RL78_64BIT_DOUBLES)
            strcat (buf, ", 64-bit doubles");
          break;
          if (e_flags & E_FLAG_RL78_64BIT_DOUBLES)
            strcat (buf, ", 64-bit doubles");
          break;


@@ -3115,6 +3501,11 @@ get_machine_flags (unsigned e_flags, unsigned e_machine)
            strcat (buf, ", pid");
          if (e_flags & E_FLAG_RX_ABI)
            strcat (buf, ", RX ABI");
            strcat (buf, ", pid");
          if (e_flags & E_FLAG_RX_ABI)
            strcat (buf, ", RX ABI");

+         if (e_flags & E_FLAG_RX_SINSNS_SET)
+           strcat (buf, e_flags & E_FLAG_RX_SINSNS_YES
+                   ? ", uses String instructions" : ", bans String instructions");
+         if (e_flags & E_FLAG_RX_V2)
+           strcat (buf, ", V2");

          break;
 
        case EM_S390:
          break;
 
        case EM_S390:


@@ -3180,6 +3571,8 @@ get_osabi_name (unsigned int osabi)
     case ELFOSABI_NSK:         return "HP - Non-Stop Kernel";
     case ELFOSABI_AROS:                return "AROS";
     case ELFOSABI_FENIXOS:     return "FenixOS";
     case ELFOSABI_NSK:         return "HP - Non-Stop Kernel";
     case ELFOSABI_AROS:                return "AROS";
     case ELFOSABI_FENIXOS:     return "FenixOS";

+    case ELFOSABI_CLOUDABI:    return "Nuxi CloudABI";
+    case ELFOSABI_OPENVOS:     return "Stratus Technologies OpenVOS";

     default:
       if (osabi >= 64)
        switch (elf_header.e_machine)
     default:
       if (osabi >= 64)
        switch (elf_header.e_machine)


@@ -3195,6 +3588,7 @@ get_osabi_name (unsigned int osabi)
 
          case EM_MSP430:
          case EM_MSP430_OLD:
 
          case EM_MSP430:
          case EM_MSP430_OLD:

+         case EM_VISIUM:

            switch (osabi)
              {
              case ELFOSABI_STANDALONE: return _("Standalone App");
            switch (osabi)
              {
              case ELFOSABI_STANDALONE: return _("Standalone App");


@@ -3331,6 +3725,23 @@ get_tic6x_segment_type (unsigned long type)
   return NULL;
 }
 
   return NULL;
 }
 

+static const char *
+get_solaris_segment_type (unsigned long type)
+{
+  switch (type)
+    {
+    case 0x6464e550: return "PT_SUNW_UNWIND";
+    case 0x6474e550: return "PT_SUNW_EH_FRAME";
+    case 0x6ffffff7: return "PT_LOSUNW";
+    case 0x6ffffffa: return "PT_SUNWBSS";
+    case 0x6ffffffb: return "PT_SUNWSTACK";
+    case 0x6ffffffc: return "PT_SUNWDTRACE";
+    case 0x6ffffffd: return "PT_SUNWCAP";
+    case 0x6fffffff: return "PT_HISUNW";
+    default: return NULL;
+    }
+}
+

 static const char *
 get_segment_type (unsigned long p_type)
 {
 static const char *
 get_segment_type (unsigned long p_type)
 {


@@ -3401,7 +3812,10 @@ get_segment_type (unsigned long p_type)
              result = get_ia64_segment_type (p_type);
              break;
            default:
              result = get_ia64_segment_type (p_type);
              break;
            default:

-             result = NULL;
+             if (elf_header.e_ident[EI_OSABI] == ELFOSABI_SOLARIS)
+               result = get_solaris_segment_type (p_type);
+             else
+               result = NULL;

              break;
            }
 
              break;
            }
 


@@ -3591,10 +4005,25 @@ get_msp430x_section_type_name (unsigned int sh_type)
     }
 }
 
     }
 }
 

+static const char *
+get_v850_section_type_name (unsigned int sh_type)
+{
+  switch (sh_type)
+    {
+    case SHT_V850_SCOMMON: return "V850 Small Common";
+    case SHT_V850_TCOMMON: return "V850 Tiny Common";
+    case SHT_V850_ZCOMMON: return "V850 Zero Common";
+    case SHT_RENESAS_IOP:  return "RENESAS IOP";
+    case SHT_RENESAS_INFO: return "RENESAS INFO";
+    default: return NULL;
+    }
+}
+

 static const char *
 get_section_type_name (unsigned int sh_type)
 {
   static char buff[32];
 static const char *
 get_section_type_name (unsigned int sh_type)
 {
   static char buff[32];

+  const char * result;

 
   switch (sh_type)
     {
 
   switch (sh_type)
     {


@@ -3628,8 +4057,6 @@ get_section_type_name (unsigned int sh_type)
     default:
       if ((sh_type >= SHT_LOPROC) && (sh_type <= SHT_HIPROC))
        {
     default:
       if ((sh_type >= SHT_LOPROC) && (sh_type <= SHT_HIPROC))
        {

-         const char * result;
-

          switch (elf_header.e_machine)
            {
            case EM_MIPS:
          switch (elf_header.e_machine)
            {
            case EM_MIPS:


@@ -3659,6 +4086,11 @@ get_section_type_name (unsigned int sh_type)
            case EM_MSP430:
              result = get_msp430x_section_type_name (sh_type);
              break;
            case EM_MSP430:
              result = get_msp430x_section_type_name (sh_type);
              break;

+           case EM_V800:
+           case EM_V850:
+           case EM_CYGNUS_V850:
+             result = get_v850_section_type_name (sh_type);
+             break;

            default:
              result = NULL;
              break;
            default:
              result = NULL;
              break;


@@ -3667,29 +4099,47 @@ get_section_type_name (unsigned int sh_type)
          if (result != NULL)
            return result;
 
          if (result != NULL)
            return result;
 

-         sprintf (buff, "LOPROC+%x", sh_type - SHT_LOPROC);
+         sprintf (buff, "LOPROC+%#x", sh_type - SHT_LOPROC);

        }
       else if ((sh_type >= SHT_LOOS) && (sh_type <= SHT_HIOS))
        {
        }
       else if ((sh_type >= SHT_LOOS) && (sh_type <= SHT_HIOS))
        {

-         const char * result;
-

          switch (elf_header.e_machine)
            {
            case EM_IA_64:
              result = get_ia64_section_type_name (sh_type);
              break;
            default:
          switch (elf_header.e_machine)
            {
            case EM_IA_64:
              result = get_ia64_section_type_name (sh_type);
              break;
            default:

-             result = NULL;
+             if (elf_header.e_ident[EI_OSABI] == ELFOSABI_SOLARIS)
+               result = get_solaris_section_type (sh_type);
+             else
+               result = NULL;

              break;
            }
 
          if (result != NULL)
            return result;
 
              break;
            }
 
          if (result != NULL)
            return result;
 

-         sprintf (buff, "LOOS+%x", sh_type - SHT_LOOS);
+         sprintf (buff, "LOOS+%#x", sh_type - SHT_LOOS);

        }
       else if ((sh_type >= SHT_LOUSER) && (sh_type <= SHT_HIUSER))
        }
       else if ((sh_type >= SHT_LOUSER) && (sh_type <= SHT_HIUSER))

-       sprintf (buff, "LOUSER+%x", sh_type - SHT_LOUSER);
+       {
+         switch (elf_header.e_machine)
+           {
+           case EM_V800:
+           case EM_V850:
+           case EM_CYGNUS_V850:
+             result = get_v850_section_type_name (sh_type);
+             break;
+           default:
+             result = NULL;
+             break;
+           }
+
+         if (result != NULL)
+           return result;
+
+         sprintf (buff, "LOUSER+%#x", sh_type - SHT_LOUSER);
+       }

       else
        /* This message is probably going to be displayed in a 15
           character wide field, so put the hex value first.  */
       else
        /* This message is probably going to be displayed in a 15
           character wide field, so put the hex value first.  */


@@ -3732,6 +4182,7 @@ static struct option options[] =
   {"hex-dump",        required_argument, 0, 'x'},
   {"relocated-dump",   required_argument, 0, 'R'},
   {"string-dump",      required_argument, 0, 'p'},
   {"hex-dump",        required_argument, 0, 'x'},
   {"relocated-dump",   required_argument, 0, 'R'},
   {"string-dump",      required_argument, 0, 'p'},

+  {"decompress",       no_argument, 0, 'z'},

 #ifdef SUPPORT_DISASSEMBLY
   {"instruction-dump", required_argument, 0, 'i'},
 #endif
 #ifdef SUPPORT_DISASSEMBLY
   {"instruction-dump", required_argument, 0, 'i'},
 #endif


@@ -3779,6 +4230,7 @@ usage (FILE * stream)
                          Dump the contents of section <number|name> as strings\n\
   -R --relocated-dump=<number|name>\n\
                          Dump the contents of section <number|name> as relocated bytes\n\
                          Dump the contents of section <number|name> as strings\n\
   -R --relocated-dump=<number|name>\n\
                          Dump the contents of section <number|name> as relocated bytes\n\

+  -z --decompress        Decompress section before dumping it\n\

   -w[lLiaprmfFsoRt] or\n\
   --debug-dump[=rawline,=decodedline,=info,=abbrev,=pubnames,=aranges,=macro,=frames,\n\
                =frames-interp,=str,=loc,=Ranges,=pubtypes,\n\
   -w[lLiaprmfFsoRt] or\n\
   --debug-dump[=rawline,=decodedline,=info,=abbrev,=pubnames,=aranges,=macro,=frames,\n\
                =frames-interp,=str,=loc,=Ranges,=pubtypes,\n\


@@ -3826,10 +4278,13 @@ request_dump_bynumber (unsigned int section, dump_type type)
        error (_("Out of memory allocating dump request table.\n"));
       else
        {
        error (_("Out of memory allocating dump request table.\n"));
       else
        {

-         /* Copy current flag settings.  */
-         memcpy (new_dump_sects, dump_sects, num_dump_sects * sizeof (* dump_sects));
+         if (dump_sects)
+           {
+             /* Copy current flag settings.  */
+             memcpy (new_dump_sects, dump_sects, num_dump_sects * sizeof (* dump_sects));

 
 

-         free (dump_sects);
+             free (dump_sects);
+           }

 
          dump_sects = new_dump_sects;
          num_dump_sects = section + 1;
 
          dump_sects = new_dump_sects;
          num_dump_sects = section + 1;


@@ -3889,7 +4344,7 @@ parse_args (int argc, char ** argv)
     usage (stderr);
 
   while ((c = getopt_long
     usage (stderr);
 
   while ((c = getopt_long

-         (argc, argv, "ADHINR:SVWacdeghi:lnp:rstuvw::x:", options, NULL)) != EOF)
+         (argc, argv, "ADHINR:SVWacdeghi:lnp:rstuvw::x:z", options, NULL)) != EOF)

     {
       switch (c)
        {
     {
       switch (c)
        {


@@ -3972,6 +4427,9 @@ parse_args (int argc, char ** argv)
        case 'R':
          request_dump (RELOC_DUMP);
          break;
        case 'R':
          request_dump (RELOC_DUMP);
          break;

+       case 'z':
+         decompress_dumps++;
+         break;

        case 'w':
          do_dump++;
          if (optarg == 0)
        case 'w':
          do_dump++;
          if (optarg == 0)


@@ -4032,7 +4490,7 @@ parse_args (int argc, char ** argv)
        default:
          /* xgettext:c-format */
          error (_("Invalid option '-%c'\n"), c);
        default:
          /* xgettext:c-format */
          error (_("Invalid option '-%c'\n"), c);

-         /* Drop through.  */
+         /* Fall through.  */

        case '?':
          usage (stderr);
        }
        case '?':
          usage (stderr);
        }


@@ -4044,11 +4502,6 @@ parse_args (int argc, char ** argv)
       && !do_section_groups && !do_archive_index
       && !do_dyn_syms)
     usage (stderr);
       && !do_section_groups && !do_archive_index
       && !do_dyn_syms)
     usage (stderr);

-  else if (argc < 3)
-    {
-      warn (_("Nothing to do.\n"));
-      usage (stderr);
-    }

 }
 
 static const char *
 }
 
 static const char *


@@ -4323,7 +4776,7 @@ process_program_headers (FILE * file)
       /* PR binutils/12467.  */
       if (elf_header.e_phoff != 0)
        warn (_("possibly corrupt ELF header - it has a non-zero program"
       /* PR binutils/12467.  */
       if (elf_header.e_phoff != 0)
        warn (_("possibly corrupt ELF header - it has a non-zero program"

-               " header offset, but no program headers"));
+               " header offset, but no program headers\n"));

       else if (do_segments)
        printf (_("\nThere are no program headers in this file.\n"));
       return 0;
       else if (do_segments)
        printf (_("\nThere are no program headers in this file.\n"));
       return 0;


@@ -4646,6 +5099,10 @@ get_32bit_section_headers (FILE * file, bfd_boolean probe)
       internal->sh_info      = BYTE_GET (shdrs[i].sh_info);
       internal->sh_addralign = BYTE_GET (shdrs[i].sh_addralign);
       internal->sh_entsize   = BYTE_GET (shdrs[i].sh_entsize);
       internal->sh_info      = BYTE_GET (shdrs[i].sh_info);
       internal->sh_addralign = BYTE_GET (shdrs[i].sh_addralign);
       internal->sh_entsize   = BYTE_GET (shdrs[i].sh_entsize);

+      if (!probe && internal->sh_link > num)
+       warn (_("Section %u has an out of range sh_link value of %u\n"), i, internal->sh_link);
+      if (!probe && internal->sh_flags & SHF_INFO_LINK && internal->sh_info > num)
+       warn (_("Section %u has an out of range sh_info value of %u\n"), i, internal->sh_info);

     }
 
   free (shdrs);
     }
 
   free (shdrs);


@@ -4704,6 +5161,10 @@ get_64bit_section_headers (FILE * file, bfd_boolean probe)
       internal->sh_info      = BYTE_GET (shdrs[i].sh_info);
       internal->sh_offset    = BYTE_GET (shdrs[i].sh_offset);
       internal->sh_addralign = BYTE_GET (shdrs[i].sh_addralign);
       internal->sh_info      = BYTE_GET (shdrs[i].sh_info);
       internal->sh_offset    = BYTE_GET (shdrs[i].sh_offset);
       internal->sh_addralign = BYTE_GET (shdrs[i].sh_addralign);

+      if (!probe && internal->sh_link > num)
+       warn (_("Section %u has an out of range sh_link value of %u\n"), i, internal->sh_link);
+      if (!probe && internal->sh_flags & SHF_INFO_LINK && internal->sh_info > num)
+       warn (_("Section %u has an out of range sh_info value of %u\n"), i, internal->sh_info);

     }
 
   free (shdrs);
     }
 
   free (shdrs);


@@ -4722,10 +5183,18 @@ get_32bit_elf_symbols (FILE * file,
   Elf_Internal_Sym * psym;
   unsigned int j;
 
   Elf_Internal_Sym * psym;
   unsigned int j;
 

+  if (section->sh_size == 0)
+    {
+      if (num_syms_return != NULL)
+       * num_syms_return = 0;
+      return NULL;
+    }
+

   /* Run some sanity checks first.  */
   /* Run some sanity checks first.  */

-  if (section->sh_entsize == 0)
+  if (section->sh_entsize == 0 || section->sh_entsize > section->sh_size)

     {
     {

-      error (_("sh_entsize is zero\n"));
+      error (_("Section %s has an invalid sh_entsize of 0x%lx\n"),
+            printable_section_name (section), (unsigned long) section->sh_entsize);

       goto exit_point;
     }
 
       goto exit_point;
     }
 


@@ -4740,7 +5209,10 @@ get_32bit_elf_symbols (FILE * file,
 
   if (number * sizeof (Elf32_External_Sym) > section->sh_size + 1)
     {
 
   if (number * sizeof (Elf32_External_Sym) > section->sh_size + 1)
     {

-      error (_("Invalid sh_entsize\n"));
+      error (_("Size (0x%lx) of section %s is not a multiple of its sh_entsize (0x%lx)\n"),
+            (unsigned long) section->sh_size,
+            printable_section_name (section),
+            (unsigned long) section->sh_entsize);

       goto exit_point;
     }
 
       goto exit_point;
     }
 


@@ -4749,18 +5221,30 @@ get_32bit_elf_symbols (FILE * file,
   if (esyms == NULL)
     goto exit_point;
 
   if (esyms == NULL)
     goto exit_point;
 

-  shndx = NULL;
-  if (symtab_shndx_hdr != NULL
-      && (symtab_shndx_hdr->sh_link
-         == (unsigned long) (section - section_headers)))
-    {
-      shndx = (Elf_External_Sym_Shndx *) get_data (NULL, file,
-                                                   symtab_shndx_hdr->sh_offset,
-                                                   1, symtab_shndx_hdr->sh_size,
-                                                   _("symbol table section indicies"));
-      if (shndx == NULL)
-       goto exit_point;
-    }
+  {
+    elf_section_list * entry;
+
+    shndx = NULL;
+    for (entry = symtab_shndx_list; entry != NULL; entry = entry->next)
+      if (entry->hdr->sh_link == (unsigned long) (section - section_headers))
+       {
+         shndx = (Elf_External_Sym_Shndx *) get_data (NULL, file,
+                                                      entry->hdr->sh_offset,
+                                                      1, entry->hdr->sh_size,
+                                                      _("symbol table section indicies"));
+         if (shndx == NULL)
+           goto exit_point;
+         /* PR17531: file: heap-buffer-overflow */
+         else if (entry->hdr->sh_size / sizeof (Elf_External_Sym_Shndx) < number)
+           {
+             error (_("Index section %s has an sh_size of 0x%lx - expected 0x%lx\n"),
+                    printable_section_name (entry->hdr),
+                    (unsigned long) entry->hdr->sh_size,
+                    (unsigned long) section->sh_size);
+             goto exit_point;
+           }
+       }
+  }

 
   isyms = (Elf_Internal_Sym *) cmalloc (number, sizeof (Elf_Internal_Sym));
 
 
   isyms = (Elf_Internal_Sym *) cmalloc (number, sizeof (Elf_Internal_Sym));
 


@@ -4810,17 +5294,27 @@ get_64bit_elf_symbols (FILE * file,
   Elf_Internal_Sym * psym;
   unsigned int j;
 
   Elf_Internal_Sym * psym;
   unsigned int j;
 

+  if (section->sh_size == 0)
+    {
+      if (num_syms_return != NULL)
+       * num_syms_return = 0;
+      return NULL;
+    }
+

   /* Run some sanity checks first.  */
   /* Run some sanity checks first.  */

-  if (section->sh_entsize == 0)
+  if (section->sh_entsize == 0 || section->sh_entsize > section->sh_size)

     {
     {

-      error (_("sh_entsize is zero\n"));
+      error (_("Section %s has an invalid sh_entsize of 0x%lx\n"),
+            printable_section_name (section),
+            (unsigned long) section->sh_entsize);

       goto exit_point;
     }
 
   if (section->sh_size > current_file_size)
     {
       error (_("Section %s has an invalid sh_size of 0x%lx\n"),
       goto exit_point;
     }
 
   if (section->sh_size > current_file_size)
     {
       error (_("Section %s has an invalid sh_size of 0x%lx\n"),

-            printable_section_name (section), (unsigned long) section->sh_size);
+            printable_section_name (section),
+            (unsigned long) section->sh_size);

       goto exit_point;
     }
 
       goto exit_point;
     }
 


@@ -4828,7 +5322,10 @@ get_64bit_elf_symbols (FILE * file,
 
   if (number * sizeof (Elf64_External_Sym) > section->sh_size + 1)
     {
 
   if (number * sizeof (Elf64_External_Sym) > section->sh_size + 1)
     {

-      error (_("Invalid sh_entsize\n"));
+      error (_("Size (0x%lx) of section %s is not a multiple of its sh_entsize (0x%lx)\n"),
+            (unsigned long) section->sh_size,
+            printable_section_name (section),
+            (unsigned long) section->sh_entsize);

       goto exit_point;
     }
 
       goto exit_point;
     }
 


@@ -4837,17 +5334,30 @@ get_64bit_elf_symbols (FILE * file,
   if (!esyms)
     goto exit_point;
 
   if (!esyms)
     goto exit_point;
 

-  if (symtab_shndx_hdr != NULL
-      && (symtab_shndx_hdr->sh_link
-         == (unsigned long) (section - section_headers)))
-    {
-      shndx = (Elf_External_Sym_Shndx *) get_data (NULL, file,
-                                                   symtab_shndx_hdr->sh_offset,
-                                                   1, symtab_shndx_hdr->sh_size,
-                                                   _("symbol table section indicies"));
-      if (shndx == NULL)
-       goto exit_point;
-    }
+  {
+    elf_section_list * entry;
+
+    shndx = NULL;
+    for (entry = symtab_shndx_list; entry != NULL; entry = entry->next)
+      if (entry->hdr->sh_link == (unsigned long) (section - section_headers))
+       {
+         shndx = (Elf_External_Sym_Shndx *) get_data (NULL, file,
+                                                      entry->hdr->sh_offset,
+                                                      1, entry->hdr->sh_size,
+                                                      _("symbol table section indicies"));
+         if (shndx == NULL)
+           goto exit_point;
+         /* PR17531: file: heap-buffer-overflow */
+         else if (entry->hdr->sh_size / sizeof (Elf_External_Sym_Shndx) < number)
+           {
+             error (_("Index section %s has an sh_size of 0x%lx - expected 0x%lx\n"),
+                    printable_section_name (entry->hdr),
+                    (unsigned long) entry->hdr->sh_size,
+                    (unsigned long) section->sh_size);
+             goto exit_point;
+           }
+       }
+  }

 
   isyms = (Elf_Internal_Sym *) cmalloc (number, sizeof (Elf_Internal_Sym));
 
 
   isyms = (Elf_Internal_Sym *) cmalloc (number, sizeof (Elf_Internal_Sym));
 


@@ -4928,7 +5438,12 @@ get_elf_section_flags (bfd_vma sh_flags)
       /* Generic.  */
       /* 18 */ { STRING_COMMA_LEN ("EXCLUDE") },
       /* SPARC specific.  */
       /* Generic.  */
       /* 18 */ { STRING_COMMA_LEN ("EXCLUDE") },
       /* SPARC specific.  */

-      /* 19 */ { STRING_COMMA_LEN ("ORDERED") }
+      /* 19 */ { STRING_COMMA_LEN ("ORDERED") },
+      /* 20 */ { STRING_COMMA_LEN ("COMPRESSED") },
+      /* ARM specific.  */
+      /* 21 */ { STRING_COMMA_LEN ("ENTRYSECT") },
+      /* 22 */ { STRING_COMMA_LEN ("ARM_PURECODE") },
+      /* 23 */ { STRING_COMMA_LEN ("COMDEF") }

     };
 
   if (do_section_details)
     };
 
   if (do_section_details)


@@ -4960,6 +5475,7 @@ get_elf_section_flags (bfd_vma sh_flags)
            case SHF_GROUP:             sindex = 8; break;
            case SHF_TLS:               sindex = 9; break;
            case SHF_EXCLUDE:           sindex = 18; break;
            case SHF_GROUP:             sindex = 8; break;
            case SHF_TLS:               sindex = 9; break;
            case SHF_EXCLUDE:           sindex = 18; break;

+           case SHF_COMPRESSED:        sindex = 20; break;

 
            default:
              sindex = -1;
 
            default:
              sindex = -1;


@@ -4986,7 +5502,7 @@ get_elf_section_flags (bfd_vma sh_flags)
                  break;
 
                case EM_386:
                  break;
 
                case EM_386:

-               case EM_486:
+               case EM_IAMCU:

                case EM_X86_64:
                case EM_L1OM:
                case EM_K1OM:
                case EM_X86_64:
                case EM_L1OM:
                case EM_K1OM:


@@ -4997,6 +5513,17 @@ get_elf_section_flags (bfd_vma sh_flags)
                  if (flag == SHF_ORDERED)
                    sindex = 19;
                  break;
                  if (flag == SHF_ORDERED)
                    sindex = 19;
                  break;

+
+               case EM_ARM:
+                 switch (flag)
+                   {
+                   case SHF_ENTRYSECT: sindex = 21; break;
+                   case SHF_ARM_PURECODE: sindex = 22; break;
+                   case SHF_COMDEF: sindex = 23; break;
+                   default: break;
+                   }
+                 break;
+

                default:
                  break;
                }
                default:
                  break;
                }


@@ -5007,7 +5534,10 @@ get_elf_section_flags (bfd_vma sh_flags)
              if (p != buff + field_size + 4)
                {
                  if (size < (10 + 2))
              if (p != buff + field_size + 4)
                {
                  if (size < (10 + 2))

-                   abort ();
+                   {
+                     warn (_("Internal error: not enough buffer room for section flag info"));
+                     return _("<unknown>");
+                   }

                  size -= 2;
                  *p++ = ',';
                  *p++ = ' ';
                  size -= 2;
                  *p++ = ',';
                  *p++ = ' ';


@@ -5038,6 +5568,7 @@ get_elf_section_flags (bfd_vma sh_flags)
            case SHF_GROUP:             *p = 'G'; break;
            case SHF_TLS:               *p = 'T'; break;
            case SHF_EXCLUDE:           *p = 'E'; break;
            case SHF_GROUP:             *p = 'G'; break;
            case SHF_TLS:               *p = 'T'; break;
            case SHF_EXCLUDE:           *p = 'E'; break;

+           case SHF_COMPRESSED:        *p = 'C'; break;

 
            default:
              if ((elf_header.e_machine == EM_X86_64
 
            default:
              if ((elf_header.e_machine == EM_X86_64


@@ -5045,6 +5576,9 @@ get_elf_section_flags (bfd_vma sh_flags)
                   || elf_header.e_machine == EM_K1OM)
                  && flag == SHF_X86_64_LARGE)
                *p = 'l';
                   || elf_header.e_machine == EM_K1OM)
                  && flag == SHF_X86_64_LARGE)
                *p = 'l';

+             else if (elf_header.e_machine == EM_ARM
+                      && flag == SHF_ARM_PURECODE)
+                 *p = 'y';

              else if (flag & SHF_MASKOS)
                {
                  *p = 'o';
              else if (flag & SHF_MASKOS)
                {
                  *p = 'o';


@@ -5071,7 +5605,10 @@ get_elf_section_flags (bfd_vma sh_flags)
          if (p != buff + field_size + 4)
            {
              if (size < (2 + 1))
          if (p != buff + field_size + 4)
            {
              if (size < (2 + 1))

-               abort ();
+               {
+                 warn (_("Internal error: not enough buffer room for section flag info"));
+                 return _("<unknown>");
+               }

              size -= 2;
              *p++ = ',';
              *p++ = ' ';
              size -= 2;
              *p++ = ',';
              *p++ = ' ';


@@ -5086,7 +5623,10 @@ get_elf_section_flags (bfd_vma sh_flags)
          if (p != buff + field_size + 4)
            {
              if (size < (2 + 1))
          if (p != buff + field_size + 4)
            {
              if (size < (2 + 1))

-               abort ();
+               {
+                 warn (_("Internal error: not enough buffer room for section flag info"));
+                 return _("<unknown>");
+               }

              size -= 2;
              *p++ = ',';
              *p++ = ' ';
              size -= 2;
              *p++ = ',';
              *p++ = ' ';


@@ -5101,7 +5641,10 @@ get_elf_section_flags (bfd_vma sh_flags)
          if (p != buff + field_size + 4)
            {
              if (size < (2 + 1))
          if (p != buff + field_size + 4)
            {
              if (size < (2 + 1))

-               abort ();
+               {
+                 warn (_("Internal error: not enough buffer room for section flag info"));
+                 return _("<unknown>");
+               }

              size -= 2;
              *p++ = ',';
              *p++ = ' ';
              size -= 2;
              *p++ = ',';
              *p++ = ' ';


@@ -5116,6 +5659,29 @@ get_elf_section_flags (bfd_vma sh_flags)
   return buff;
 }
 
   return buff;
 }
 

+static unsigned int
+get_compression_header (Elf_Internal_Chdr *chdr, unsigned char *buf)
+{
+  if (is_32bit_elf)
+    {
+      Elf32_External_Chdr *echdr = (Elf32_External_Chdr *) buf;
+
+      chdr->ch_type = BYTE_GET (echdr->ch_type);
+      chdr->ch_size = BYTE_GET (echdr->ch_size);
+      chdr->ch_addralign = BYTE_GET (echdr->ch_addralign);
+      return sizeof (*echdr);
+    }
+  else
+    {
+      Elf64_External_Chdr *echdr = (Elf64_External_Chdr *) buf;
+
+      chdr->ch_type = BYTE_GET (echdr->ch_type);
+      chdr->ch_size = BYTE_GET (echdr->ch_size);
+      chdr->ch_addralign = BYTE_GET (echdr->ch_addralign);
+      return sizeof (*echdr);
+    }
+}
+

 static int
 process_section_headers (FILE * file)
 {
 static int
 process_section_headers (FILE * file)
 {


@@ -5169,7 +5735,7 @@ process_section_headers (FILE * file)
   dynamic_symbols = NULL;
   dynamic_strings = NULL;
   dynamic_syminfo = NULL;
   dynamic_symbols = NULL;
   dynamic_strings = NULL;
   dynamic_syminfo = NULL;

-  symtab_shndx_hdr = NULL;
+  symtab_shndx_list = NULL;

 
   eh_addr_size = is_32bit_elf ? 4 : 8;
   switch (elf_header.e_machine)
 
   eh_addr_size = is_32bit_elf ? 4 : 8;
   switch (elf_header.e_machine)


@@ -5274,12 +5840,10 @@ process_section_headers (FILE * file)
        }
       else if (section->sh_type == SHT_SYMTAB_SHNDX)
        {
        }
       else if (section->sh_type == SHT_SYMTAB_SHNDX)
        {

-         if (symtab_shndx_hdr != NULL)
-           {
-             error (_("File contains multiple symtab shndx tables\n"));
-             continue;
-           }
-         symtab_shndx_hdr = section;
+         elf_section_list * entry = xmalloc (sizeof * entry);
+         entry->hdr = section;
+         entry->next = symtab_shndx_list;
+         symtab_shndx_list = entry;

        }
       else if (section->sh_type == SHT_SYMTAB)
        CHECK_ENTSIZE (section, i, Sym);
        }
       else if (section->sh_type == SHT_SYMTAB)
        CHECK_ENTSIZE (section, i, Sym);


@@ -5401,25 +5965,141 @@ process_section_headers (FILE * file)
        i < elf_header.e_shnum;
        i++, section++)
     {
        i < elf_header.e_shnum;
        i++, section++)
     {

-      printf ("  [%2u] ", i);
-      if (do_section_details)
-       printf ("%s\n      ", printable_section_name (section));
-      else
-       print_symbol (-17, SECTION_NAME (section));
-
-      printf (do_wide ? " %-15s " : " %-15.15s ",
-             get_section_type_name (section->sh_type));
+      /* Run some sanity checks on the section header.  */

 
 

-      if (is_32bit_elf)
+      /* Check the sh_link field.  */
+      switch (section->sh_type)

        {
        {

-         const char * link_too_big = NULL;
+       case SHT_SYMTAB_SHNDX:
+       case SHT_GROUP:
+       case SHT_HASH:
+       case SHT_GNU_HASH:
+       case SHT_GNU_versym:
+       case SHT_REL:
+       case SHT_RELA:
+         if (section->sh_link < 1
+             || section->sh_link >= elf_header.e_shnum
+             || (section_headers[section->sh_link].sh_type != SHT_SYMTAB
+                 && section_headers[section->sh_link].sh_type != SHT_DYNSYM))
+           warn (_("[%2u]: Link field (%u) should index a symtab section.\n"),
+                 i, section->sh_link);
+         break;

 
 

-         print_vma (section->sh_addr, LONG_HEX);
+       case SHT_DYNAMIC:
+       case SHT_SYMTAB:
+       case SHT_DYNSYM:
+       case SHT_GNU_verneed:
+       case SHT_GNU_verdef:
+       case SHT_GNU_LIBLIST:
+         if (section->sh_link < 1
+             || section->sh_link >= elf_header.e_shnum
+             || section_headers[section->sh_link].sh_type != SHT_STRTAB)
+           warn (_("[%2u]: Link field (%u) should index a string section.\n"),
+                 i, section->sh_link);
+         break;

 
 

-         printf ( " %6.6lx %6.6lx %2.2lx",
-                  (unsigned long) section->sh_offset,
-                  (unsigned long) section->sh_size,
-                  (unsigned long) section->sh_entsize);
+       case SHT_INIT_ARRAY:
+       case SHT_FINI_ARRAY:
+       case SHT_PREINIT_ARRAY:
+         if (section->sh_type < SHT_LOOS && section->sh_link != 0)
+           warn (_("[%2u]: Unexpected value (%u) in link field.\n"),
+                 i, section->sh_link);
+         break;
+
+       default:
+         /* FIXME: Add support for target specific section types.  */
+#if 0    /* Currently we do not check other section types as there are too
+            many special cases.  Stab sections for example have a type
+            of SHT_PROGBITS but an sh_link field that links to the .stabstr
+            section.  */
+         if (section->sh_type < SHT_LOOS && section->sh_link != 0)
+           warn (_("[%2u]: Unexpected value (%u) in link field.\n"),
+                 i, section->sh_link);
+#endif
+         break;
+       }
+
+      /* Check the sh_info field.  */
+      switch (section->sh_type)
+       {
+       case SHT_REL:
+       case SHT_RELA:
+         if (section->sh_info < 1
+             || section->sh_info >= elf_header.e_shnum
+             || (section_headers[section->sh_info].sh_type != SHT_PROGBITS
+                 && section_headers[section->sh_info].sh_type != SHT_NOBITS
+                 && section_headers[section->sh_info].sh_type != SHT_NOTE
+                 && section_headers[section->sh_info].sh_type != SHT_INIT_ARRAY
+                 /* FIXME: Are other section types valid ?  */
+                 && section_headers[section->sh_info].sh_type < SHT_LOOS))
+           {
+             if (section->sh_info == 0
+                 && (streq (SECTION_NAME (section), ".rel.dyn")
+                     || streq (SECTION_NAME (section), ".rela.dyn")))
+               /* The .rel.dyn and .rela.dyn sections have an sh_info field
+                  of zero.  No idea why.  I would have expected the index
+                  of the .plt section.  */
+                  ;
+             else
+               warn (_("[%2u]: Info field (%u) should index a relocatable section.\n"),
+                     i, section->sh_info);
+           }
+         break;
+
+       case SHT_DYNAMIC:
+       case SHT_HASH:
+       case SHT_SYMTAB_SHNDX:
+       case SHT_INIT_ARRAY:
+       case SHT_FINI_ARRAY:
+       case SHT_PREINIT_ARRAY:
+         if (section->sh_info != 0)
+           warn (_("[%2u]: Unexpected value (%u) in info field.\n"),
+                 i, section->sh_info);
+         break;
+
+       case SHT_GROUP:
+       case SHT_SYMTAB:
+       case SHT_DYNSYM:
+         /* A symbol index - we assume that it is valid.  */
+         break;
+
+       default:
+         /* FIXME: Add support for target specific section types.  */
+         if (section->sh_type == SHT_NOBITS)
+           /* NOBITS section headers with non-zero sh_info fields can be
+              created when a binary is stripped of everything but its debug
+              information.  The stripped sections have their headers preserved but their types set to SHT_NOBITS.  so do not check this type of section.  */
+           ;
+         else if (section->sh_flags & SHF_INFO_LINK)
+           {
+             if (section->sh_info < 1 || section->sh_info >= elf_header.e_shnum)
+               warn (_("[%2u]: Expected link to another section in info field"), i);
+           }
+         else if (section->sh_type < SHT_LOOS && section->sh_info != 0)
+           warn (_("[%2u]: Unexpected value (%u) in info field.\n"),
+                 i, section->sh_info);
+         break;
+       }
+
+      printf ("  [%2u] ", i);
+      if (do_section_details)
+       printf ("%s\n      ", printable_section_name (section));
+      else
+       print_symbol (-17, SECTION_NAME (section));
+
+      printf (do_wide ? " %-15s " : " %-15.15s ",
+             get_section_type_name (section->sh_type));
+
+      if (is_32bit_elf)
+       {
+         const char * link_too_big = NULL;
+
+         print_vma (section->sh_addr, LONG_HEX);
+
+         printf ( " %6.6lx %6.6lx %2.2lx",
+                  (unsigned long) section->sh_offset,
+                  (unsigned long) section->sh_size,
+                  (unsigned long) section->sh_entsize);

 
          if (do_section_details)
            fputs ("  ", stdout);
 
          if (do_section_details)
            fputs ("  ", stdout);


@@ -5434,7 +6114,7 @@ process_section_headers (FILE * file)
              switch (elf_header.e_machine)
                {
                case EM_386:
              switch (elf_header.e_machine)
                {
                case EM_386:

-               case EM_486:
+               case EM_IAMCU:

                case EM_X86_64:
                case EM_L1OM:
                case EM_K1OM:
                case EM_X86_64:
                case EM_L1OM:
                case EM_K1OM:


@@ -5560,23 +6240,50 @@ process_section_headers (FILE * file)
        }
 
       if (do_section_details)
        }
 
       if (do_section_details)

-       printf ("       %s\n", get_elf_section_flags (section->sh_flags));
+       {
+         printf ("       %s\n", get_elf_section_flags (section->sh_flags));
+         if ((section->sh_flags & SHF_COMPRESSED) != 0)
+           {
+             /* Minimum section size is 12 bytes for 32-bit compression
+                header + 12 bytes for compressed data header.  */
+             unsigned char buf[24];
+
+             assert (sizeof (buf) >= sizeof (Elf64_External_Chdr));
+             if (get_data (&buf, (FILE *) file, section->sh_offset, 1,
+                           sizeof (buf), _("compression header")))
+               {
+                 Elf_Internal_Chdr chdr;
+
+                 (void) get_compression_header (&chdr, buf);
+
+                 if (chdr.ch_type == ELFCOMPRESS_ZLIB)
+                   printf ("       ZLIB, ");
+                 else
+                   printf (_("       [<unknown>: 0x%x], "),
+                           chdr.ch_type);
+                 print_vma (chdr.ch_size, LONG_HEX);
+                 printf (", %lu\n", (unsigned long) chdr.ch_addralign);
+               }
+           }
+       }

     }
 
   if (!do_section_details)
     {
     }
 
   if (!do_section_details)
     {

+      /* The ordering of the letters shown here matches the ordering of the
+        corresponding SHF_xxx values, and hence the order in which these
+        letters will be displayed to the user.  */
+      printf (_("Key to Flags:\n\
+  W (write), A (alloc), X (execute), M (merge), S (strings), I (info),\n\
+  L (link order), O (extra OS processing required), G (group), T (TLS),\n\
+  C (compressed), x (unknown), o (OS specific), E (exclude),\n  "));

       if (elf_header.e_machine == EM_X86_64
          || elf_header.e_machine == EM_L1OM
          || elf_header.e_machine == EM_K1OM)
       if (elf_header.e_machine == EM_X86_64
          || elf_header.e_machine == EM_L1OM
          || elf_header.e_machine == EM_K1OM)

-       printf (_("Key to Flags:\n\
-  W (write), A (alloc), X (execute), M (merge), S (strings), l (large)\n\
-  I (info), L (link order), G (group), T (TLS), E (exclude), x (unknown)\n\
-  O (extra OS processing required) o (OS specific), p (processor specific)\n"));
-      else
-       printf (_("Key to Flags:\n\
-  W (write), A (alloc), X (execute), M (merge), S (strings)\n\
-  I (info), L (link order), G (group), T (TLS), E (exclude), x (unknown)\n\
-  O (extra OS processing required) o (OS specific), p (processor specific)\n"));
+       printf (_("l (large), "));
+      else if (elf_header.e_machine == EM_ARM)
+       printf (_("y (purecode), "));
+      printf ("p (processor specific)\n");

     }
 
   return 1;
     }
 
   return 1;


@@ -5585,19 +6292,32 @@ process_section_headers (FILE * file)
 static const char *
 get_group_flags (unsigned int flags)
 {
 static const char *
 get_group_flags (unsigned int flags)
 {

-  static char buff[32];
-  switch (flags)
-    {
-    case 0:
-      return "";
+  static char buff[128];
+
+  if (flags == 0)
+    return "";
+  else if (flags == GRP_COMDAT)
+    return "COMDAT ";

 
 

-    case GRP_COMDAT:
-      return "COMDAT ";
+  snprintf (buff, 14, _("[0x%x: "), flags);

 
 

-   default:
-      snprintf (buff, sizeof (buff), _("[<unknown>: 0x%x] "), flags);
-      break;
+  flags &= ~ GRP_COMDAT;
+  if (flags & GRP_MASKOS)
+    {
+      strcat (buff, "<OS specific>");
+      flags &= ~ GRP_MASKOS;

     }
     }

+
+  if (flags & GRP_MASKPROC)
+    {
+      strcat (buff, "<PROC specific>");
+      flags &= ~ GRP_MASKPROC;
+    }
+
+  if (flags)
+    strcat (buff, "<unknown>");
+
+  strcat (buff, "]");

   return buff;
 }
 
   return buff;
 }
 


@@ -5762,6 +6482,16 @@ process_section_groups (FILE * file)
                ? strtab + sym->st_name : _("<corrupt>");
            }
 
                ? strtab + sym->st_name : _("<corrupt>");
            }
 

+         /* PR 17531: file: loop.  */
+         if (section->sh_entsize > section->sh_size)
+           {
+             error (_("Section %s has sh_entsize (0x%lx) which is larger than its size (0x%lx)\n"),
+                    printable_section_name (section),
+                    (unsigned long) section->sh_entsize,
+                    (unsigned long) section->sh_size);
+             break;
+           }
+

          start = (unsigned char *) get_data (NULL, file, section->sh_offset,
                                               1, section->sh_size,
                                               _("section data"));
          start = (unsigned char *) get_data (NULL, file, section->sh_offset,
                                               1, section->sh_size,
                                               _("section data"));


@@ -5792,8 +6522,15 @@ process_section_groups (FILE * file)
 
              if (entry >= elf_header.e_shnum)
                {
 
              if (entry >= elf_header.e_shnum)
                {

-                 error (_("section [%5u] in group section [%5u] > maximum section [%5u]\n"),
-                        entry, i, elf_header.e_shnum - 1);
+                 static unsigned num_group_errors = 0;
+
+                 if (num_group_errors ++ < 10)
+                   {
+                     error (_("section [%5u] in group section [%5u] > maximum section [%5u]\n"),
+                            entry, i, elf_header.e_shnum - 1);
+                     if (num_group_errors == 10)
+                       warn (_("Futher error messages about overlarge group section indicies suppressed\n"));
+                   }

                  continue;
                }
 
                  continue;
                }
 


@@ -5801,9 +6538,16 @@ process_section_groups (FILE * file)
                {
                  if (entry)
                    {
                {
                  if (entry)
                    {

-                     error (_("section [%5u] in group section [%5u] already in group section [%5u]\n"),
-                            entry, i,
-                            section_headers_groups [entry]->group_index);
+                     static unsigned num_errs = 0;
+
+                     if (num_errs ++ < 10)
+                       {
+                         error (_("section [%5u] in group section [%5u] already in group section [%5u]\n"),
+                                entry, i,
+                                section_headers_groups [entry]->group_index);
+                         if (num_errs == 10)
+                           warn (_("Further error messages about already contained group sections suppressed\n"));
+                       }

                      continue;
                    }
                  else
                      continue;
                    }
                  else


@@ -6097,7 +6841,8 @@ process_relocs (FILE * file)
                                offset_from_vma (file, rel_offset, rel_size),
                                rel_size,
                                dynamic_symbols, num_dynamic_syms,
                                offset_from_vma (file, rel_offset, rel_size),
                                rel_size,
                                dynamic_symbols, num_dynamic_syms,

-                               dynamic_strings, dynamic_strings_length, is_rela);
+                               dynamic_strings, dynamic_strings_length,
+                               is_rela, 1);

            }
        }
 
            }
        }
 


@@ -6172,14 +6917,16 @@ process_relocs (FILE * file)
                    }
 
                  dump_relocations (file, rel_offset, rel_size,
                    }
 
                  dump_relocations (file, rel_offset, rel_size,

-                                   symtab, nsyms, strtab, strtablen, is_rela);
+                                   symtab, nsyms, strtab, strtablen,
+                                   is_rela,
+                                   symsec->sh_type == SHT_DYNSYM);

                  if (strtab)
                    free (strtab);
                  free (symtab);
                }
              else
                dump_relocations (file, rel_offset, rel_size,
                  if (strtab)
                    free (strtab);
                  free (symtab);
                }
              else
                dump_relocations (file, rel_offset, rel_size,

-                                 NULL, 0, NULL, 0, is_rela);
+                                 NULL, 0, NULL, 0, is_rela, 0);

 
              found = 1;
            }
 
              found = 1;
            }


@@ -6192,71 +6939,53 @@ process_relocs (FILE * file)
   return 1;
 }
 
   return 1;
 }
 

-/* Process the unwind section.  */
-
-#include "unwind-ia64.h"
-

 /* An absolute address consists of a section and an offset.  If the
    section is NULL, the offset itself is the address, otherwise, the
    address equals to LOAD_ADDRESS(section) + offset.  */
 
 struct absaddr
 /* An absolute address consists of a section and an offset.  If the
    section is NULL, the offset itself is the address, otherwise, the
    address equals to LOAD_ADDRESS(section) + offset.  */
 
 struct absaddr

-  {
-    unsigned short section;
-    bfd_vma offset;
-  };
+{
+  unsigned short section;
+  bfd_vma offset;
+};

 
 #define ABSADDR(a) \
   ((a).section \
    ? section_headers [(a).section].sh_addr + (a).offset \
    : (a).offset)
 
 
 #define ABSADDR(a) \
   ((a).section \
    ? section_headers [(a).section].sh_addr + (a).offset \
    : (a).offset)
 

-struct ia64_unw_table_entry
-  {
-    struct absaddr start;
-    struct absaddr end;
-    struct absaddr info;
-  };
-
-struct ia64_unw_aux_info
-  {
-
-    struct ia64_unw_table_entry *table;        /* Unwind table.  */
-    unsigned long table_len;   /* Length of unwind table.  */
-    unsigned char * info;      /* Unwind info.  */
-    unsigned long info_size;   /* Size of unwind info.  */
-    bfd_vma info_addr;         /* starting address of unwind info.  */
-    bfd_vma seg_base;          /* Starting address of segment.  */
-    Elf_Internal_Sym * symtab; /* The symbol table.  */
-    unsigned long nsyms;       /* Number of symbols.  */
-    char * strtab;             /* The string table.  */
-    unsigned long strtab_size; /* Size of string table.  */
-  };
+/* Find the nearest symbol at or below ADDR.  Returns the symbol
+   name, if found, and the offset from the symbol to ADDR.  */

 
 static void
 find_symbol_for_address (Elf_Internal_Sym * symtab,
 
 static void
 find_symbol_for_address (Elf_Internal_Sym * symtab,

-                        unsigned long nsyms,
-                        const char * strtab,
-                        unsigned long strtab_size,
-                        struct absaddr addr,
-                        const char ** symname,
-                        bfd_vma * offset)
+                        unsigned long      nsyms,
+                        const char *       strtab,
+                        unsigned long      strtab_size,
+                        struct absaddr     addr,
+                        const char **      symname,
+                        bfd_vma *          offset)

 {
   bfd_vma dist = 0x100000;
   Elf_Internal_Sym * sym;
 {
   bfd_vma dist = 0x100000;
   Elf_Internal_Sym * sym;

+  Elf_Internal_Sym * beg;
+  Elf_Internal_Sym * end;

   Elf_Internal_Sym * best = NULL;
   Elf_Internal_Sym * best = NULL;

-  unsigned long i;

 
   REMOVE_ARCH_BITS (addr.offset);
 
   REMOVE_ARCH_BITS (addr.offset);

+  beg = symtab;
+  end = symtab + nsyms;

 
 

-  for (i = 0, sym = symtab; i < nsyms; ++i, ++sym)
+  while (beg < end)

     {
     {

-      bfd_vma value = sym->st_value;
+      bfd_vma value;

 
 

+      sym = beg + (end - beg) / 2;
+
+      value = sym->st_value;

       REMOVE_ARCH_BITS (value);
 
       REMOVE_ARCH_BITS (value);
 

-      if (ELF_ST_TYPE (sym->st_info) == STT_FUNC
-         && sym->st_name != 0
+      if (sym->st_name != 0

          && (addr.section == SHN_UNDEF || addr.section == sym->st_shndx)
          && addr.offset >= value
          && addr.offset - value < dist)
          && (addr.section == SHN_UNDEF || addr.section == sym->st_shndx)
          && addr.offset >= value
          && addr.offset - value < dist)


@@ -6266,6 +6995,11 @@ find_symbol_for_address (Elf_Internal_Sym * symtab,
          if (!dist)
            break;
        }
          if (!dist)
            break;
        }

+
+      if (addr.offset < value)
+       end = sym;
+      else
+       beg = sym + 1;

     }
 
   if (best)
     }
 
   if (best)


@@ -6280,21 +7014,66 @@ find_symbol_for_address (Elf_Internal_Sym * symtab,
   *offset = addr.offset;
 }
 
   *offset = addr.offset;
 }
 

+static int
+symcmp (const void *p, const void *q)
+{
+  Elf_Internal_Sym *sp = (Elf_Internal_Sym *) p;
+  Elf_Internal_Sym *sq = (Elf_Internal_Sym *) q;
+
+  return sp->st_value > sq->st_value ? 1 : (sp->st_value < sq->st_value ? -1 : 0);
+}
+
+/* Process the unwind section.  */
+
+#include "unwind-ia64.h"
+
+struct ia64_unw_table_entry
+{
+  struct absaddr start;
+  struct absaddr end;
+  struct absaddr info;
+};
+
+struct ia64_unw_aux_info
+{
+  struct ia64_unw_table_entry *table;  /* Unwind table.  */
+  unsigned long table_len;             /* Length of unwind table.  */
+  unsigned char * info;                        /* Unwind info.  */
+  unsigned long info_size;             /* Size of unwind info.  */
+  bfd_vma info_addr;                   /* Starting address of unwind info.  */
+  bfd_vma seg_base;                    /* Starting address of segment.  */
+  Elf_Internal_Sym * symtab;           /* The symbol table.  */
+  unsigned long nsyms;                 /* Number of symbols.  */
+  Elf_Internal_Sym * funtab;           /* Sorted table of STT_FUNC symbols.  */
+  unsigned long nfuns;                 /* Number of entries in funtab.  */
+  char * strtab;                       /* The string table.  */
+  unsigned long strtab_size;           /* Size of string table.  */
+};
+

 static void
 dump_ia64_unwind (struct ia64_unw_aux_info * aux)
 {
   struct ia64_unw_table_entry * tp;
 static void
 dump_ia64_unwind (struct ia64_unw_aux_info * aux)
 {
   struct ia64_unw_table_entry * tp;

+  unsigned long j, nfuns;

   int in_body;
 
   int in_body;
 

+  aux->funtab = xmalloc (aux->nsyms * sizeof (Elf_Internal_Sym));
+  for (nfuns = 0, j = 0; j < aux->nsyms; j++)
+    if (aux->symtab[j].st_value && ELF_ST_TYPE (aux->symtab[j].st_info) == STT_FUNC)
+      aux->funtab[nfuns++] = aux->symtab[j];
+  aux->nfuns = nfuns;
+  qsort (aux->funtab, aux->nfuns, sizeof (Elf_Internal_Sym), symcmp);
+

   for (tp = aux->table; tp < aux->table + aux->table_len; ++tp)
     {
       bfd_vma stamp;
       bfd_vma offset;
       const unsigned char * dp;
       const unsigned char * head;
   for (tp = aux->table; tp < aux->table + aux->table_len; ++tp)
     {
       bfd_vma stamp;
       bfd_vma offset;
       const unsigned char * dp;
       const unsigned char * head;

+      const unsigned char * end;

       const char * procname;
 
       const char * procname;
 

-      find_symbol_for_address (aux->symtab, aux->nsyms, aux->strtab,
+      find_symbol_for_address (aux->funtab, aux->nfuns, aux->strtab,

                               aux->strtab_size, tp->start, &procname, &offset);
 
       fputs ("\n<", stdout);
                               aux->strtab_size, tp->start, &procname, &offset);
 
       fputs ("\n<", stdout);


@@ -6314,6 +7093,18 @@ dump_ia64_unwind (struct ia64_unw_aux_info * aux)
       printf ("], info at +0x%lx\n",
              (unsigned long) (tp->info.offset - aux->seg_base));
 
       printf ("], info at +0x%lx\n",
              (unsigned long) (tp->info.offset - aux->seg_base));
 

+      /* PR 17531: file: 86232b32.  */
+      if (aux->info == NULL)
+       continue;
+
+      /* PR 17531: file: 0997b4d1.  */
+      if ((ABSADDR (tp->info) - aux->info_addr) >= aux->info_size)
+       {
+         warn (_("Invalid offset %lx in table entry %ld\n"),
+               (long) tp->info.offset, (long) (tp - aux->table));
+         continue;
+       }
+

       head = aux->info + (ABSADDR (tp->info) - aux->info_addr);
       stamp = byte_get ((unsigned char *) head, sizeof (stamp));
 
       head = aux->info + (ABSADDR (tp->info) - aux->info_addr);
       stamp = byte_get ((unsigned char *) head, sizeof (stamp));
 


@@ -6331,12 +7122,18 @@ dump_ia64_unwind (struct ia64_unw_aux_info * aux)
        }
 
       in_body = 0;
        }
 
       in_body = 0;

-      for (dp = head + 8; dp < head + 8 + eh_addr_size * UNW_LENGTH (stamp);)
-       dp = unw_decode (dp, in_body, & in_body);
+      end = head + 8 + eh_addr_size * UNW_LENGTH (stamp);
+      /* PR 17531: file: 16ceda89.  */
+      if (end > aux->info + aux->info_size)
+       end = aux->info + aux->info_size;
+      for (dp = head + 8; dp < end;)
+       dp = unw_decode (dp, in_body, & in_body, end);

     }
     }

+
+  free (aux->funtab);

 }
 
 }
 

-static int
+static bfd_boolean

 slurp_ia64_unwind_table (FILE * file,
                         struct ia64_unw_aux_info * aux,
                         Elf_Internal_Shdr * sec)
 slurp_ia64_unwind_table (FILE * file,
                         struct ia64_unw_aux_info * aux,
                         Elf_Internal_Shdr * sec)


@@ -6352,13 +7149,15 @@ slurp_ia64_unwind_table (FILE * file,
   Elf_Internal_Sym * sym;
   const char * relname;
 
   Elf_Internal_Sym * sym;
   const char * relname;
 

+  aux->table_len = 0;
+

   /* First, find the starting address of the segment that includes
      this section: */
 
   if (elf_header.e_phnum)
     {
       if (! get_program_headers (file))
   /* First, find the starting address of the segment that includes
      this section: */
 
   if (elf_header.e_phnum)
     {
       if (! get_program_headers (file))

-         return 0;
+         return FALSE;

 
       for (seg = program_headers;
           seg < program_headers + elf_header.e_phnum;
 
       for (seg = program_headers;
           seg < program_headers + elf_header.e_phnum;


@@ -6381,12 +7180,14 @@ slurp_ia64_unwind_table (FILE * file,
   table = (unsigned char *) get_data (NULL, file, sec->sh_offset, 1, size,
                                       _("unwind table"));
   if (!table)
   table = (unsigned char *) get_data (NULL, file, sec->sh_offset, 1, size,
                                       _("unwind table"));
   if (!table)

-    return 0;
+    return FALSE;

 
 

+  aux->table_len = size / (3 * eh_addr_size);

   aux->table = (struct ia64_unw_table_entry *)
   aux->table = (struct ia64_unw_table_entry *)

-      xcmalloc (size / (3 * eh_addr_size), sizeof (aux->table[0]));
+    xcmalloc (aux->table_len, sizeof (aux->table[0]));

   tep = aux->table;
   tep = aux->table;

-  for (tp = table; tp < table + size; ++tep)
+
+  for (tp = table; tp <= table + size - (3 * eh_addr_size); ++tep)

     {
       tep->start.section = SHN_UNDEF;
       tep->end.section   = SHN_UNDEF;
     {
       tep->start.section = SHN_UNDEF;
       tep->end.section   = SHN_UNDEF;


@@ -6412,22 +7213,41 @@ slurp_ia64_unwind_table (FILE * file,
 
       if (!slurp_rela_relocs (file, relsec->sh_offset, relsec->sh_size,
                              & rela, & nrelas))
 
       if (!slurp_rela_relocs (file, relsec->sh_offset, relsec->sh_size,
                              & rela, & nrelas))

-       return 0;
+       {
+         free (aux->table);
+         aux->table = NULL;
+         aux->table_len = 0;
+         return FALSE;
+       }

 
       for (rp = rela; rp < rela + nrelas; ++rp)
        {
          relname = elf_ia64_reloc_type (get_reloc_type (rp->r_info));
          sym = aux->symtab + get_reloc_symindex (rp->r_info);
 
 
       for (rp = rela; rp < rela + nrelas; ++rp)
        {
          relname = elf_ia64_reloc_type (get_reloc_type (rp->r_info));
          sym = aux->symtab + get_reloc_symindex (rp->r_info);
 

+         /* PR 17531: file: 9fa67536.  */
+         if (relname == NULL)
+           {
+             warn (_("Skipping unknown relocation type: %u\n"), get_reloc_type (rp->r_info));
+             continue;
+           }
+

          if (! const_strneq (relname, "R_IA64_SEGREL"))
            {
          if (! const_strneq (relname, "R_IA64_SEGREL"))
            {

-             warn (_("Skipping unexpected relocation type %s\n"), relname);
+             warn (_("Skipping unexpected relocation type: %s\n"), relname);

              continue;
            }
 
          i = rp->r_offset / (3 * eh_addr_size);
 
              continue;
            }
 
          i = rp->r_offset / (3 * eh_addr_size);
 

-         switch (rp->r_offset/eh_addr_size % 3)
+         /* PR 17531: file: 5bc8d9bf.  */
+         if (i >= aux->table_len)
+           {
+             warn (_("Skipping reloc with overlarge offset: %lx\n"), i);
+             continue;
+           }
+
+         switch (rp->r_offset / eh_addr_size % 3)

            {
            case 0:
              aux->table[i].start.section = sym->st_shndx;
            {
            case 0:
              aux->table[i].start.section = sym->st_shndx;


@@ -6449,8 +7269,7 @@ slurp_ia64_unwind_table (FILE * file,
       free (rela);
     }
 
       free (rela);
     }
 

-  aux->table_len = size / (3 * eh_addr_size);
-  return 1;
+  return TRUE;

 }
 
 static void
 }
 
 static void


@@ -6587,9 +7406,8 @@ ia64_process_unwind (FILE * file)
                  (unsigned long) unwsec->sh_offset,
                  (unsigned long) (unwsec->sh_size / (3 * eh_addr_size)));
 
                  (unsigned long) unwsec->sh_offset,
                  (unsigned long) (unwsec->sh_size / (3 * eh_addr_size)));
 

-         (void) slurp_ia64_unwind_table (file, & aux, unwsec);
-
-         if (aux.table_len > 0)
+         if (slurp_ia64_unwind_table (file, & aux, unwsec)
+             && aux.table_len > 0)

            dump_ia64_unwind (& aux);
 
          if (aux.table)
            dump_ia64_unwind (& aux);
 
          if (aux.table)


@@ -6611,7 +7429,7 @@ struct hppa_unw_table_entry
   {
     struct absaddr start;
     struct absaddr end;
   {
     struct absaddr start;
     struct absaddr end;

-    unsigned int Cannot_unwind:1;                      /* 0 */
+    unsigned int Cannot_unwind:1;              /* 0 */

     unsigned int Millicode:1;                  /* 1 */
     unsigned int Millicode_save_sr0:1;         /* 2 */
     unsigned int Region_description:2;         /* 3..4 */
     unsigned int Millicode:1;                  /* 1 */
     unsigned int Millicode_save_sr0:1;         /* 2 */
     unsigned int Region_description:2;         /* 3..4 */


@@ -6620,52 +7438,62 @@ struct hppa_unw_table_entry
     unsigned int Entry_FR:4;     /* number saved */    /* 7..10 */
     unsigned int Entry_GR:5;     /* number saved */    /* 11..15 */
     unsigned int Args_stored:1;                        /* 16 */
     unsigned int Entry_FR:4;     /* number saved */    /* 7..10 */
     unsigned int Entry_GR:5;     /* number saved */    /* 11..15 */
     unsigned int Args_stored:1;                        /* 16 */

-    unsigned int Variable_Frame:1;                     /* 17 */
-    unsigned int Separate_Package_Body:1;              /* 18 */
+    unsigned int Variable_Frame:1;             /* 17 */
+    unsigned int Separate_Package_Body:1;      /* 18 */

     unsigned int Frame_Extension_Millicode:1;  /* 19 */
     unsigned int Frame_Extension_Millicode:1;  /* 19 */

-    unsigned int Stack_Overflow_Check:1;               /* 20 */
-    unsigned int Two_Instruction_SP_Increment:1;       /* 21 */
+    unsigned int Stack_Overflow_Check:1;       /* 20 */
+    unsigned int Two_Instruction_SP_Increment:1;/* 21 */

     unsigned int Ada_Region:1;                 /* 22 */
     unsigned int cxx_info:1;                   /* 23 */
     unsigned int Ada_Region:1;                 /* 22 */
     unsigned int cxx_info:1;                   /* 23 */

-    unsigned int cxx_try_catch:1;                      /* 24 */
-    unsigned int sched_entry_seq:1;                    /* 25 */
+    unsigned int cxx_try_catch:1;              /* 24 */
+    unsigned int sched_entry_seq:1;            /* 25 */

     unsigned int reserved2:1;                  /* 26 */
     unsigned int reserved2:1;                  /* 26 */

-    unsigned int Save_SP:1;                            /* 27 */
-    unsigned int Save_RP:1;                            /* 28 */
+    unsigned int Save_SP:1;                    /* 27 */
+    unsigned int Save_RP:1;                    /* 28 */

     unsigned int Save_MRP_in_frame:1;          /* 29 */
     unsigned int extn_ptr_defined:1;           /* 30 */
     unsigned int Save_MRP_in_frame:1;          /* 29 */
     unsigned int extn_ptr_defined:1;           /* 30 */

-    unsigned int Cleanup_defined:1;                    /* 31 */
+    unsigned int Cleanup_defined:1;            /* 31 */

 
 

-    unsigned int MPE_XL_interrupt_marker:1;            /* 0 */
-    unsigned int HP_UX_interrupt_marker:1;             /* 1 */
+    unsigned int MPE_XL_interrupt_marker:1;    /* 0 */
+    unsigned int HP_UX_interrupt_marker:1;     /* 1 */

     unsigned int Large_frame:1;                        /* 2 */
     unsigned int Large_frame:1;                        /* 2 */

-    unsigned int Pseudo_SP_Set:1;                      /* 3 */
+    unsigned int Pseudo_SP_Set:1;              /* 3 */

     unsigned int reserved4:1;                  /* 4 */
     unsigned int Total_frame_size:27;          /* 5..31 */
   };
 
 struct hppa_unw_aux_info
     unsigned int reserved4:1;                  /* 4 */
     unsigned int Total_frame_size:27;          /* 5..31 */
   };
 
 struct hppa_unw_aux_info

-  {
-    struct hppa_unw_table_entry *table;        /* Unwind table.  */
-    unsigned long table_len;   /* Length of unwind table.  */
-    bfd_vma seg_base;          /* Starting address of segment.  */
-    Elf_Internal_Sym * symtab; /* The symbol table.  */
-    unsigned long nsyms;       /* Number of symbols.  */
-    char * strtab;             /* The string table.  */
-    unsigned long strtab_size; /* Size of string table.  */
-  };
+{
+  struct hppa_unw_table_entry * table; /* Unwind table.  */
+  unsigned long table_len;             /* Length of unwind table.  */
+  bfd_vma seg_base;                    /* Starting address of segment.  */
+  Elf_Internal_Sym * symtab;           /* The symbol table.  */
+  unsigned long nsyms;                 /* Number of symbols.  */
+  Elf_Internal_Sym * funtab;           /* Sorted table of STT_FUNC symbols.  */
+  unsigned long nfuns;                 /* Number of entries in funtab.  */
+  char * strtab;                       /* The string table.  */
+  unsigned long strtab_size;           /* Size of string table.  */
+};

 
 static void
 dump_hppa_unwind (struct hppa_unw_aux_info * aux)
 {
   struct hppa_unw_table_entry * tp;
 
 static void
 dump_hppa_unwind (struct hppa_unw_aux_info * aux)
 {
   struct hppa_unw_table_entry * tp;

+  unsigned long j, nfuns;
+
+  aux->funtab = xmalloc (aux->nsyms * sizeof (Elf_Internal_Sym));
+  for (nfuns = 0, j = 0; j < aux->nsyms; j++)
+    if (aux->symtab[j].st_value && ELF_ST_TYPE (aux->symtab[j].st_info) == STT_FUNC)
+      aux->funtab[nfuns++] = aux->symtab[j];
+  aux->nfuns = nfuns;
+  qsort (aux->funtab, aux->nfuns, sizeof (Elf_Internal_Sym), symcmp);

 
   for (tp = aux->table; tp < aux->table + aux->table_len; ++tp)
     {
       bfd_vma offset;
       const char * procname;
 
 
   for (tp = aux->table; tp < aux->table + aux->table_len; ++tp)
     {
       bfd_vma offset;
       const char * procname;
 

-      find_symbol_for_address (aux->symtab, aux->nsyms, aux->strtab,
+      find_symbol_for_address (aux->funtab, aux->nfuns, aux->strtab,

                               aux->strtab_size, tp->start, &procname,
                               &offset);
 
                               aux->strtab_size, tp->start, &procname,
                               &offset);
 


@@ -6719,6 +7547,8 @@ dump_hppa_unwind (struct hppa_unw_aux_info * aux)
     }
 
   printf ("\n");
     }
 
   printf ("\n");

+
+  free (aux->funtab);

 }
 
 static int
 }
 
 static int


@@ -6955,6 +7785,8 @@ struct arm_unw_aux_info
   FILE *              file;            /* The file containing the unwind sections.  */
   Elf_Internal_Sym *  symtab;          /* The file's symbol table.  */
   unsigned long       nsyms;           /* Number of symbols.  */
   FILE *              file;            /* The file containing the unwind sections.  */
   Elf_Internal_Sym *  symtab;          /* The file's symbol table.  */
   unsigned long       nsyms;           /* Number of symbols.  */

+  Elf_Internal_Sym *  funtab;          /* Sorted table of STT_FUNC symbols.  */
+  unsigned long       nfuns;           /* Number of these symbols.  */

   char *              strtab;          /* The file's string table.  */
   unsigned long       strtab_size;     /* Size of string table.  */
 };
   char *              strtab;          /* The file's string table.  */
   unsigned long       strtab_size;     /* Size of string table.  */
 };


@@ -6969,7 +7801,7 @@ arm_print_vma_and_name (struct arm_unw_aux_info *aux,
   if (addr.section == SHN_UNDEF)
     addr.offset = fn;
 
   if (addr.section == SHN_UNDEF)
     addr.offset = fn;
 

-  find_symbol_for_address (aux->symtab, aux->nsyms, aux->strtab,
+  find_symbol_for_address (aux->funtab, aux->nfuns, aux->strtab,

                           aux->strtab_size, addr, &procname,
                           &sym_offset);
 
                           aux->strtab_size, addr, &procname,
                           &sym_offset);
 


@@ -7083,7 +7915,10 @@ get_unwind_section_word (struct arm_unw_aux_info *  aux,
     return FALSE;
 
   /* If the offset is invalid then fail.  */
     return FALSE;
 
   /* If the offset is invalid then fail.  */

-  if (word_offset > sec->sh_size - 4)
+  if (word_offset > (sec->sh_size - 4)
+      /* PR 18879 */
+      || (sec->sh_size < 5 && word_offset >= sec->sh_size)
+      || ((bfd_signed_vma) word_offset) < 0)

     return FALSE;
 
   /* Get the word at the required offset.  */
     return FALSE;
 
   /* Get the word at the required offset.  */


@@ -7264,11 +8099,13 @@ decode_tic6x_unwind_regmask (unsigned int mask)
   printf ("0x%02x ", OP)
 
 static void
   printf ("0x%02x ", OP)
 
 static void

-decode_arm_unwind_bytecode (struct arm_unw_aux_info *aux,
-                           unsigned int word, unsigned int remaining,
-                           unsigned int more_words,
-                           bfd_vma data_offset, Elf_Internal_Shdr *data_sec,
-                           struct arm_section *data_arm_sec)
+decode_arm_unwind_bytecode (struct arm_unw_aux_info *  aux,
+                           unsigned int               word,
+                           unsigned int               remaining,
+                           unsigned int               more_words,
+                           bfd_vma                    data_offset,
+                           Elf_Internal_Shdr *        data_sec,
+                           struct arm_section *       data_arm_sec)

 {
   struct absaddr addr;
 
 {
   struct absaddr addr;
 


@@ -7475,11 +8312,13 @@ decode_arm_unwind_bytecode (struct arm_unw_aux_info *aux,
 }
 
 static void
 }
 
 static void

-decode_tic6x_unwind_bytecode (struct arm_unw_aux_info *aux,
-                           unsigned int word, unsigned int remaining,
-                           unsigned int more_words,
-                           bfd_vma data_offset, Elf_Internal_Shdr *data_sec,
-                           struct arm_section *data_arm_sec)
+decode_tic6x_unwind_bytecode (struct arm_unw_aux_info *  aux,
+                             unsigned int               word,
+                             unsigned int               remaining,
+                             unsigned int               more_words,
+                             bfd_vma                    data_offset,
+                             Elf_Internal_Shdr *        data_sec,
+                             struct arm_section *       data_arm_sec)

 {
   struct absaddr addr;
 
 {
   struct absaddr addr;
 


@@ -7597,7 +8436,7 @@ decode_tic6x_unwind_bytecode (struct arm_unw_aux_info *aux,
              warn (_("Corrupt stack pointer adjustment detected\n"));
              return;
            }
              warn (_("Corrupt stack pointer adjustment detected\n"));
              return;
            }

-         
+

          offset = read_uleb128 (buf, &len, buf + i + 1);
          assert (len == i + 1);
          offset = offset * 8 + 0x408;
          offset = read_uleb128 (buf, &len, buf + i + 1);
          assert (len == i + 1);
          offset = offset * 8 + 0x408;


@@ -7792,11 +8631,19 @@ dump_arm_unwind (struct arm_unw_aux_info *aux, Elf_Internal_Shdr *exidx_sec)
 {
   struct arm_section exidx_arm_sec, extab_arm_sec;
   unsigned int i, exidx_len;
 {
   struct arm_section exidx_arm_sec, extab_arm_sec;
   unsigned int i, exidx_len;

+  unsigned long j, nfuns;

 
   memset (&exidx_arm_sec, 0, sizeof (exidx_arm_sec));
   memset (&extab_arm_sec, 0, sizeof (extab_arm_sec));
   exidx_len = exidx_sec->sh_size / 8;
 
 
   memset (&exidx_arm_sec, 0, sizeof (exidx_arm_sec));
   memset (&extab_arm_sec, 0, sizeof (extab_arm_sec));
   exidx_len = exidx_sec->sh_size / 8;
 

+  aux->funtab = xmalloc (aux->nsyms * sizeof (Elf_Internal_Sym));
+  for (nfuns = 0, j = 0; j < aux->nsyms; j++)
+    if (aux->symtab[j].st_value && ELF_ST_TYPE (aux->symtab[j].st_info) == STT_FUNC)
+      aux->funtab[nfuns++] = aux->symtab[j];
+  aux->nfuns = nfuns;
+  qsort (aux->funtab, aux->nfuns, sizeof (Elf_Internal_Sym), symcmp);
+

   for (i = 0; i < exidx_len; i++)
     {
       unsigned int exidx_fn, exidx_entry;
   for (i = 0; i < exidx_len; i++)
     {
       unsigned int exidx_fn, exidx_entry;


@@ -7810,6 +8657,7 @@ dump_arm_unwind (struct arm_unw_aux_info *aux, Elf_Internal_Shdr *exidx_sec)
          || ! get_unwind_section_word (aux, & exidx_arm_sec, exidx_sec,
                                        8 * i + 4, & exidx_entry, & entry_addr, NULL))
        {
          || ! get_unwind_section_word (aux, & exidx_arm_sec, exidx_sec,
                                        8 * i + 4, & exidx_entry, & entry_addr, NULL))
        {

+         free (aux->funtab);

          arm_free_section (& exidx_arm_sec);
          arm_free_section (& extab_arm_sec);
          return;
          arm_free_section (& exidx_arm_sec);
          arm_free_section (& extab_arm_sec);
          return;


@@ -7853,6 +8701,15 @@ dump_arm_unwind (struct arm_unw_aux_info *aux, Elf_Internal_Shdr *exidx_sec)
            {
              table_sec = section_headers + entry_addr.section;
              table_offset = entry_addr.offset;
            {
              table_sec = section_headers + entry_addr.section;
              table_offset = entry_addr.offset;

+             /* PR 18879 */
+             if (table_offset > table_sec->sh_size
+                 || ((bfd_signed_vma) table_offset) < 0)
+               {
+                 warn (_("Unwind entry contains corrupt offset (0x%lx) into section %s\n"),
+                       (unsigned long) table_offset,
+                       printable_section_name (table_sec));
+                 continue;
+               }

            }
          else
            {
            }
          else
            {


@@ -7873,6 +8730,7 @@ dump_arm_unwind (struct arm_unw_aux_info *aux, Elf_Internal_Shdr *exidx_sec)
 
   printf ("\n");
 
 
   printf ("\n");
 

+  free (aux->funtab);

   arm_free_section (&exidx_arm_sec);
   arm_free_section (&extab_arm_sec);
 }
   arm_free_section (&exidx_arm_sec);
   arm_free_section (&extab_arm_sec);
 }


@@ -8030,14 +8888,18 @@ dynamic_section_mips_val (Elf_Internal_Dyn * entry)
 
     case DT_MIPS_TIME_STAMP:
       {
 
     case DT_MIPS_TIME_STAMP:
       {

-       char timebuf[20];
+       char timebuf[128];

        struct tm * tmp;
        struct tm * tmp;

-

        time_t atime = entry->d_un.d_val;
        time_t atime = entry->d_un.d_val;

+

        tmp = gmtime (&atime);
        tmp = gmtime (&atime);

-       snprintf (timebuf, sizeof (timebuf), "%04u-%02u-%02uT%02u:%02u:%02u",
-                 tmp->tm_year + 1900, tmp->tm_mon + 1, tmp->tm_mday,
-                 tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
+       /* PR 17531: file: 6accc532.  */
+       if (tmp == NULL)
+         snprintf (timebuf, sizeof (timebuf), _("<corrupt>"));
+       else
+         snprintf (timebuf, sizeof (timebuf), "%04u-%02u-%02uT%02u:%02u:%02u",
+                   tmp->tm_year + 1900, tmp->tm_mon + 1, tmp->tm_mday,
+                   tmp->tm_hour, tmp->tm_min, tmp->tm_sec);

        printf (_("Time Stamp: %s"), timebuf);
       }
       break;
        printf (_("Time Stamp: %s"), timebuf);
       }
       break;


@@ -8055,7 +8917,7 @@ dynamic_section_mips_val (Elf_Internal_Dyn * entry)
     case DT_MIPS_DELTA_SYM_NO:
     case DT_MIPS_DELTA_CLASSSYM_NO:
     case DT_MIPS_COMPACT_SIZE:
     case DT_MIPS_DELTA_SYM_NO:
     case DT_MIPS_DELTA_CLASSSYM_NO:
     case DT_MIPS_COMPACT_SIZE:

-      print_vma (entry->d_un.d_ptr, DEC);
+      print_vma (entry->d_un.d_val, DEC);

       break;
 
     default:
       break;
 
     default:


@@ -8224,7 +9086,7 @@ get_32bit_dynamic_section (FILE * file)
      might not have the luxury of section headers.  Look for the DT_NULL
      terminator to determine the number of entries.  */
   for (ext = edyn, dynamic_nent = 0;
      might not have the luxury of section headers.  Look for the DT_NULL
      terminator to determine the number of entries.  */
   for (ext = edyn, dynamic_nent = 0;

-       (char *) ext < (char *) edyn + dynamic_size - sizeof (* entry);
+       (char *) (ext + 1) <= (char *) edyn + dynamic_size;

        ext++)
     {
       dynamic_nent++;
        ext++)
     {
       dynamic_nent++;


@@ -8272,8 +9134,8 @@ get_64bit_dynamic_section (FILE * file)
      might not have the luxury of section headers.  Look for the DT_NULL
      terminator to determine the number of entries.  */
   for (ext = edyn, dynamic_nent = 0;
      might not have the luxury of section headers.  Look for the DT_NULL
      terminator to determine the number of entries.  */
   for (ext = edyn, dynamic_nent = 0;

-       /* PR 17533 file: 033-67080-0.004 - do not read off the end of the buffer.  */
-       (char *) ext < ((char *) edyn) + dynamic_size - sizeof (* ext);
+       /* PR 17533 file: 033-67080-0.004 - do not read past end of buffer.  */
+       (char *) (ext + 1) <= (char *) edyn + dynamic_size;

        ext++)
     {
       dynamic_nent++;
        ext++)
     {
       dynamic_nent++;


@@ -8776,6 +9638,16 @@ process_dynamic_section (FILE * file)
                      printf (" SINGLETON");
                      val ^= DF_1_SINGLETON;
                    }
                      printf (" SINGLETON");
                      val ^= DF_1_SINGLETON;
                    }

+                 if (val & DF_1_STUB)
+                   {
+                     printf (" STUB");
+                     val ^= DF_1_STUB;
+                   }
+                 if (val & DF_1_PIE)
+                   {
+                     printf (" PIE");
+                     val ^= DF_1_PIE;
+                   }

                  if (val != 0)
                    printf (" %lx", val);
                  puts ("");
                  if (val != 0)
                    printf (" %lx", val);
                  puts ("");


@@ -8860,6 +9732,7 @@ process_dynamic_section (FILE * file)
        case DT_SYMENT  :
        case DT_RELENT  :
          dynamic_info[entry->d_tag] = entry->d_un.d_val;
        case DT_SYMENT  :
        case DT_RELENT  :
          dynamic_info[entry->d_tag] = entry->d_un.d_val;

+         /* Fall through.  */

        case DT_PLTPADSZ:
        case DT_MOVEENT :
        case DT_MOVESZ  :
        case DT_PLTPADSZ:
        case DT_MOVEENT :
        case DT_MOVESZ  :


@@ -9133,6 +10006,10 @@ process_version_sections (FILE * file)
                if (j < ent.vd_cnt)
                  printf (_("  Version def aux past end of section\n"));
 
                if (j < ent.vd_cnt)
                  printf (_("  Version def aux past end of section\n"));
 

+               /* PR 17531: file: id:000001,src:000172+005151,op:splice,rep:2.  */
+               if (idx + ent.vd_next <= idx)
+                 break;
+

                idx += ent.vd_next;
              }
 
                idx += ent.vd_next;
              }
 


@@ -9204,7 +10081,6 @@ process_version_sections (FILE * file)
                /* Check for overflow.  */
                if (ent.vn_aux > (size_t) (endbuf - vstart))
                  break;
                /* Check for overflow.  */
                if (ent.vn_aux > (size_t) (endbuf - vstart))
                  break;

-

                vstart += ent.vn_aux;
 
                for (j = 0, isum = idx + ent.vn_aux; j < ent.vn_cnt; ++j)
                vstart += ent.vn_aux;
 
                for (j = 0, isum = idx + ent.vn_aux; j < ent.vn_cnt; ++j)


@@ -9233,9 +10109,14 @@ process_version_sections (FILE * file)
                            get_ver_flags (aux.vna_flags), aux.vna_other);
 
                    /* Check for overflow.  */
                            get_ver_flags (aux.vna_flags), aux.vna_other);
 
                    /* Check for overflow.  */

-                   if (aux.vna_next > (size_t) (endbuf - vstart))
-                     break;
-
+                   if (aux.vna_next > (size_t) (endbuf - vstart)
+                       || (aux.vna_next == 0 && j < ent.vn_cnt - 1))
+                     {
+                       warn (_("Invalid vna_next field of %lx\n"),
+                             aux.vna_next);
+                       j = ent.vn_cnt;
+                       break;
+                     }

                    isum   += aux.vna_next;
                    vstart += aux.vna_next;
                  }
                    isum   += aux.vna_next;
                    vstart += aux.vna_next;
                  }


@@ -9331,8 +10212,8 @@ process_version_sections (FILE * file)
            for (cnt = 0; cnt < total; cnt += 4)
              {
                int j, nn;
            for (cnt = 0; cnt < total; cnt += 4)
              {
                int j, nn;

-               int check_def, check_need;
-               char * name;
+               char *name;
+               char *invalid = _("*invalid*");

 
                printf ("  %03x:", cnt);
 
 
                printf ("  %03x:", cnt);
 


@@ -9359,20 +10240,8 @@ process_version_sections (FILE * file)
                          break;
                        }
 
                          break;
                        }
 

-                     check_def = 1;
-                     check_need = 1;
-                     if (symbols[cnt + j].st_shndx >= elf_header.e_shnum
-                         || section_headers[symbols[cnt + j].st_shndx].sh_type
-                            != SHT_NOBITS)
-                       {
-                         if (symbols[cnt + j].st_shndx == SHN_UNDEF)
-                           check_def = 0;
-                         else
-                           check_need = 0;
-                       }
-
-                     if (check_need
-                         && version_info[DT_VERSIONTAGIDX (DT_VERNEED)])
+                     name = NULL;
+                     if (version_info[DT_VERSIONTAGIDX (DT_VERNEED)])

                        {
                          Elf_Internal_Verneed ivn;
                          unsigned long offset;
                        {
                          Elf_Internal_Verneed ivn;
                          unsigned long offset;


@@ -9421,14 +10290,9 @@ process_version_sections (FILE * file)
                                  ivna.vna_name = BYTE_GET (evna.vna_name);
 
                                  if (ivna.vna_name >= string_sec->sh_size)
                                  ivna.vna_name = BYTE_GET (evna.vna_name);
 
                                  if (ivna.vna_name >= string_sec->sh_size)

-                                   name = _("*invalid*");
+                                   name = invalid;

                                  else
                                    name = strtab + ivna.vna_name;
                                  else
                                    name = strtab + ivna.vna_name;

-                                 nn += printf ("(%s%-*s",
-                                               name,
-                                               12 - (int) strlen (name),
-                                               ")");
-                                 check_def = 0;

                                  break;
                                }
 
                                  break;
                                }
 


@@ -9437,7 +10301,7 @@ process_version_sections (FILE * file)
                          while (ivn.vn_next);
                        }
 
                          while (ivn.vn_next);
                        }
 

-                     if (check_def && data[cnt + j] != 0x8001
+                     if (data[cnt + j] != 0x8001

                          && version_info[DT_VERSIONTAGIDX (DT_VERDEF)])
                        {
                          Elf_Internal_Verdef ivd;
                          && version_info[DT_VERSIONTAGIDX (DT_VERDEF)])
                        {
                          Elf_Internal_Verdef ivd;


@@ -9454,7 +10318,7 @@ process_version_sections (FILE * file)
                                            _("version def")) == NULL)
                                {
                                  ivd.vd_next = 0;
                                            _("version def")) == NULL)
                                {
                                  ivd.vd_next = 0;

-                                 /* PR 17531: file: 046-1082287-0.004.  */ 
+                                 /* PR 17531: file: 046-1082287-0.004.  */

                                  ivd.vd_ndx  = (data[cnt + j] & VERSYM_VERSION) + 1;
                                  break;
                                }
                                  ivd.vd_ndx  = (data[cnt + j] & VERSYM_VERSION) + 1;
                                  break;
                                }


@@ -9485,15 +10349,18 @@ process_version_sections (FILE * file)
                              ivda.vda_name = BYTE_GET (evda.vda_name);
 
                              if (ivda.vda_name >= string_sec->sh_size)
                              ivda.vda_name = BYTE_GET (evda.vda_name);
 
                              if (ivda.vda_name >= string_sec->sh_size)

-                               name = _("*invalid*");
+                               name = invalid;
+                             else if (name != NULL && name != invalid)
+                               name = _("*both*");

                              else
                                name = strtab + ivda.vda_name;
                              else
                                name = strtab + ivda.vda_name;

-                             nn += printf ("(%s%-*s",
-                                           name,
-                                           12 - (int) strlen (name),
-                                           ")");

                            }
                        }
                            }
                        }

+                     if (name != NULL)
+                       nn += printf ("(%s%-*s",
+                                     name,
+                                     12 - (int) strlen (name),
+                                     ")");

 
                      if (nn < 18)
                        printf ("%*c", 18 - nn, ' ');
 
                      if (nn < 18)
                        printf ("%*c", 18 - nn, ' ');


@@ -9612,7 +10479,21 @@ get_symbol_visibility (unsigned int visibility)
     case STV_INTERNAL: return "INTERNAL";
     case STV_HIDDEN:   return "HIDDEN";
     case STV_PROTECTED: return "PROTECTED";
     case STV_INTERNAL: return "INTERNAL";
     case STV_HIDDEN:   return "HIDDEN";
     case STV_PROTECTED: return "PROTECTED";

-    default: abort ();
+    default:
+      error (_("Unrecognized visibility value: %u"), visibility);
+      return _("<unknown>");
+    }
+}
+
+static const char *
+get_solaris_symbol_visibility (unsigned int visibility)
+{
+  switch (visibility)
+    {
+    case 4: return "EXPORTED";
+    case 5: return "SINGLETON";
+    case 6: return "ELIMINATE";
+    default: return get_symbol_visibility (visibility);

     }
 }
 
     }
 }
 


@@ -9667,7 +10548,10 @@ get_ia64_symbol_other (unsigned int other)
               strcat (res, " RSV");
               break;
             default:
               strcat (res, " RSV");
               break;
             default:

-              abort ();
+             warn (_("Unrecognized IA64 VMS ST Function type: %d\n"),
+                   VMS_ST_FUNC_TYPE (other));
+             strcat (res, " <unknown>");
+             break;

             }
           break;
         default:
             }
           break;
         default:


@@ -9688,7 +10572,10 @@ get_ia64_symbol_other (unsigned int other)
           strcat (res, " LNK");
           break;
         default:
           strcat (res, " LNK");
           break;
         default:

-          abort ();
+         warn (_("Unrecognized IA64 VMS ST Linkage: %d\n"),
+               VMS_ST_LINKAGE (other));
+         strcat (res, " <unknown>");
+         break;

         }
 
       if (res[0] != 0)
         }
 
       if (res[0] != 0)


@@ -9733,6 +10620,7 @@ get_symbol_other (unsigned int other)
       result = get_ppc64_symbol_other (other);
       break;
     default:
       result = get_ppc64_symbol_other (other);
       break;
     default:

+      result = NULL;

       break;
     }
 
       break;
     }
 


@@ -9788,41 +10676,54 @@ get_symbol_index_type (unsigned int type)
 }
 
 static bfd_vma *
 }
 
 static bfd_vma *

-get_dynamic_data (FILE * file, size_t number, unsigned int ent_size)
+get_dynamic_data (FILE * file, bfd_size_type number, unsigned int ent_size)

 {
   unsigned char * e_data;
   bfd_vma * i_data;
 
 {
   unsigned char * e_data;
   bfd_vma * i_data;
 

+  /* If the size_t type is smaller than the bfd_size_type, eg because
+     you are building a 32-bit tool on a 64-bit host, then make sure
+     that when (number) is cast to (size_t) no information is lost.  */
+  if (sizeof (size_t) < sizeof (bfd_size_type)
+      && (bfd_size_type) ((size_t) number) != number)
+    {
+      error (_("Size truncation prevents reading %" BFD_VMA_FMT "u"
+              " elements of size %u\n"),
+            number, ent_size);
+      return NULL;
+    }
+

   /* Be kind to memory chekers (eg valgrind, address sanitizer) by not
      attempting to allocate memory when the read is bound to fail.  */
   if (ent_size * number > current_file_size)
     {
   /* Be kind to memory chekers (eg valgrind, address sanitizer) by not
      attempting to allocate memory when the read is bound to fail.  */
   if (ent_size * number > current_file_size)
     {

-      error (_("Invalid number of dynamic entries: %lu\n"),
-            (unsigned long) number);
+      error (_("Invalid number of dynamic entries: %" BFD_VMA_FMT "u\n"),
+            number);

       return NULL;
     }
 
       return NULL;
     }
 

-  e_data = (unsigned char *) cmalloc (number, ent_size);
+  e_data = (unsigned char *) cmalloc ((size_t) number, ent_size);

   if (e_data == NULL)
     {
   if (e_data == NULL)
     {

-      error (_("Out of memory reading %lu dynamic entries\n"),
-            (unsigned long) number);
+      error (_("Out of memory reading %" BFD_VMA_FMT "u dynamic entries\n"),
+            number);

       return NULL;
     }
 
       return NULL;
     }
 

-  if (fread (e_data, ent_size, number, file) != number)
+  if (fread (e_data, ent_size, (size_t) number, file) != number)

     {
     {

-      error (_("Unable to read in %lu bytes of dynamic data\n"),
-            (unsigned long) (number * ent_size));
+      error (_("Unable to read in %" BFD_VMA_FMT "u bytes of dynamic data\n"),
+            number * ent_size);

       free (e_data);
       return NULL;
     }
 
       free (e_data);
       return NULL;
     }
 

-  i_data = (bfd_vma *) cmalloc (number, sizeof (*i_data));
+  i_data = (bfd_vma *) cmalloc ((size_t) number, sizeof (*i_data));

   if (i_data == NULL)
     {
   if (i_data == NULL)
     {

-      error (_("Out of memory allocating space for %lu dynamic entries\n"),
-            (unsigned long) number);
+      error (_("Out of memory allocating space for %" BFD_VMA_FMT "u"
+              " dynamic entries\n"),
+            number);

       free (e_data);
       return NULL;
     }
       free (e_data);
       return NULL;
     }


@@ -9860,13 +10761,22 @@ print_dynamic_symbol (bfd_vma si, unsigned long hn)
 
   printf (" %-7s", get_symbol_type (ELF_ST_TYPE (psym->st_info)));
   printf (" %-6s",  get_symbol_binding (ELF_ST_BIND (psym->st_info)));
 
   printf (" %-7s", get_symbol_type (ELF_ST_TYPE (psym->st_info)));
   printf (" %-6s",  get_symbol_binding (ELF_ST_BIND (psym->st_info)));

-  printf (" %-7s",  get_symbol_visibility (ELF_ST_VISIBILITY (psym->st_other)));
-  /* Check to see if any other bits in the st_other field are set.
-     Note - displaying this information disrupts the layout of the
-     table being generated, but for the moment this case is very
-     rare.  */
-  if (psym->st_other ^ ELF_ST_VISIBILITY (psym->st_other))
-    printf (" [%s] ", get_symbol_other (psym->st_other ^ ELF_ST_VISIBILITY (psym->st_other)));
+
+  if (elf_header.e_ident[EI_OSABI] == ELFOSABI_SOLARIS)
+    printf (" %-7s",  get_solaris_symbol_visibility (psym->st_other));
+  else
+    {
+      unsigned int vis = ELF_ST_VISIBILITY (psym->st_other);
+
+      printf (" %-7s",  get_symbol_visibility (vis));
+      /* Check to see if any other bits in the st_other field are set.
+        Note - displaying this information disrupts the layout of the
+        table being generated, but for the moment this case is very
+        rare.  */
+      if (psym->st_other ^ vis)
+       printf (" [%s] ", get_symbol_other (psym->st_other ^ vis));
+    }
+

   printf (" %3.3s ", get_symbol_index_type (psym->st_shndx));
   if (VALID_DYNAMIC_NAME (psym->st_name))
     print_symbol (25, GET_DYNAMIC_NAME (psym->st_name));
   printf (" %3.3s ", get_symbol_index_type (psym->st_shndx));
   if (VALID_DYNAMIC_NAME (psym->st_name))
     print_symbol (25, GET_DYNAMIC_NAME (psym->st_name));


@@ -9875,54 +10785,216 @@ print_dynamic_symbol (bfd_vma si, unsigned long hn)
   putchar ('\n');
 }
 
   putchar ('\n');
 }
 

-/* Dump the symbol table.  */
-static int
-process_symbol_table (FILE * file)
+static const char *
+get_symbol_version_string (FILE *                       file,
+                          bfd_boolean                  is_dynsym,
+                          const char *                 strtab,
+                          unsigned long int            strtab_size,
+                          unsigned int                 si,
+                          Elf_Internal_Sym *           psym,
+                          enum versioned_symbol_info * sym_info,
+                          unsigned short *             vna_other)

 {
 {

-  Elf_Internal_Shdr * section;
-  bfd_size_type nbuckets = 0;
-  bfd_size_type nchains = 0;
-  bfd_vma * buckets = NULL;
-  bfd_vma * chains = NULL;
-  bfd_vma ngnubuckets = 0;
-  bfd_vma * gnubuckets = NULL;
-  bfd_vma * gnuchains = NULL;
-  bfd_vma gnusymidx = 0;
-  bfd_size_type ngnuchains = 0;
+  unsigned char data[2];
+  unsigned short vers_data;
+  unsigned long offset;

 
 

-  if (!do_syms && !do_dyn_syms && !do_histogram)
-    return 1;
+  if (!is_dynsym
+      || version_info[DT_VERSIONTAGIDX (DT_VERSYM)] == 0)
+    return NULL;

 
 

-  if (dynamic_info[DT_HASH]
-      && (do_histogram
-         || (do_using_dynamic
-             && !do_dyn_syms
-             && dynamic_strings != NULL)))
+  offset = offset_from_vma (file, version_info[DT_VERSIONTAGIDX (DT_VERSYM)],
+                           sizeof data + si * sizeof (vers_data));
+
+  if (get_data (&data, file, offset + si * sizeof (vers_data),
+               sizeof (data), 1, _("version data")) == NULL)
+    return NULL;
+
+  vers_data = byte_get (data, 2);
+
+  if ((vers_data & VERSYM_HIDDEN) == 0 && vers_data <= 1)
+    return NULL;
+
+  /* Usually we'd only see verdef for defined symbols, and verneed for
+     undefined symbols.  However, symbols defined by the linker in
+     .dynbss for variables copied from a shared library in order to
+     avoid text relocations are defined yet have verneed.  We could
+     use a heuristic to detect the special case, for example, check
+     for verneed first on symbols defined in SHT_NOBITS sections, but
+     it is simpler and more reliable to just look for both verdef and
+     verneed.  .dynbss might not be mapped to a SHT_NOBITS section.  */
+
+  if (psym->st_shndx != SHN_UNDEF
+      && vers_data != 0x8001
+      && version_info[DT_VERSIONTAGIDX (DT_VERDEF)])

     {
     {

-      unsigned char nb[8];
-      unsigned char nc[8];
-      unsigned int hash_ent_size = 4;
+      Elf_Internal_Verdef ivd;
+      Elf_Internal_Verdaux ivda;
+      Elf_External_Verdaux evda;
+      unsigned long off;

 
 

-      if ((elf_header.e_machine == EM_ALPHA
-          || elf_header.e_machine == EM_S390
-          || elf_header.e_machine == EM_S390_OLD)
-         && elf_header.e_ident[EI_CLASS] == ELFCLASS64)
-       hash_ent_size = 8;
+      off = offset_from_vma (file,
+                            version_info[DT_VERSIONTAGIDX (DT_VERDEF)],
+                            sizeof (Elf_External_Verdef));

 
 

-      if (fseek (file,
-                (archive_file_offset
-                 + offset_from_vma (file, dynamic_info[DT_HASH],
-                                    sizeof nb + sizeof nc)),
-                SEEK_SET))
+      do

        {
        {

-         error (_("Unable to seek to start of dynamic information\n"));
-         goto no_hash;
-       }
+         Elf_External_Verdef evd;

 
 

-      if (fread (nb, hash_ent_size, 1, file) != 1)
-       {
-         error (_("Failed to read in number of buckets\n"));
-         goto no_hash;
+         if (get_data (&evd, file, off, sizeof (evd), 1,
+                       _("version def")) == NULL)
+           {
+             ivd.vd_ndx = 0;
+             ivd.vd_aux = 0;
+             ivd.vd_next = 0;
+           }
+         else
+           {
+             ivd.vd_ndx = BYTE_GET (evd.vd_ndx);
+             ivd.vd_aux = BYTE_GET (evd.vd_aux);
+             ivd.vd_next = BYTE_GET (evd.vd_next);
+           }
+
+         off += ivd.vd_next;
+       }
+      while (ivd.vd_ndx != (vers_data & VERSYM_VERSION) && ivd.vd_next != 0);
+
+      if (ivd.vd_ndx == (vers_data & VERSYM_VERSION))
+       {
+         off -= ivd.vd_next;
+         off += ivd.vd_aux;
+
+         if (get_data (&evda, file, off, sizeof (evda), 1,
+                       _("version def aux")) != NULL)
+           {
+             ivda.vda_name = BYTE_GET (evda.vda_name);
+
+             if (psym->st_name != ivda.vda_name)
+               {
+                 *sym_info = ((vers_data & VERSYM_HIDDEN) != 0
+                              ? symbol_hidden : symbol_public);
+                 return (ivda.vda_name < strtab_size
+                         ? strtab + ivda.vda_name : _("<corrupt>"));
+               }
+           }
+       }
+    }
+
+  if (version_info[DT_VERSIONTAGIDX (DT_VERNEED)])
+    {
+      Elf_External_Verneed evn;
+      Elf_Internal_Verneed ivn;
+      Elf_Internal_Vernaux ivna;
+
+      offset = offset_from_vma (file,
+                               version_info[DT_VERSIONTAGIDX (DT_VERNEED)],
+                               sizeof evn);
+      do
+       {
+         unsigned long vna_off;
+
+         if (get_data (&evn, file, offset, sizeof (evn), 1,
+                       _("version need")) == NULL)
+           {
+             ivna.vna_next = 0;
+             ivna.vna_other = 0;
+             ivna.vna_name = 0;
+             break;
+           }
+
+         ivn.vn_aux  = BYTE_GET (evn.vn_aux);
+         ivn.vn_next = BYTE_GET (evn.vn_next);
+
+         vna_off = offset + ivn.vn_aux;
+
+         do
+           {
+             Elf_External_Vernaux evna;
+
+             if (get_data (&evna, file, vna_off, sizeof (evna), 1,
+                           _("version need aux (3)")) == NULL)
+               {
+                 ivna.vna_next = 0;
+                 ivna.vna_other = 0;
+                 ivna.vna_name = 0;
+               }
+             else
+               {
+                 ivna.vna_other = BYTE_GET (evna.vna_other);
+                 ivna.vna_next  = BYTE_GET (evna.vna_next);
+                 ivna.vna_name  = BYTE_GET (evna.vna_name);
+               }
+
+             vna_off += ivna.vna_next;
+           }
+         while (ivna.vna_other != vers_data && ivna.vna_next != 0);
+
+         if (ivna.vna_other == vers_data)
+           break;
+
+         offset += ivn.vn_next;
+       }
+      while (ivn.vn_next != 0);
+
+      if (ivna.vna_other == vers_data)
+       {
+         *sym_info = symbol_undefined;
+         *vna_other = ivna.vna_other;
+         return (ivna.vna_name < strtab_size
+                 ? strtab + ivna.vna_name : _("<corrupt>"));
+       }
+    }
+  return NULL;
+}
+
+/* Dump the symbol table.  */
+static int
+process_symbol_table (FILE * file)
+{
+  Elf_Internal_Shdr * section;
+  bfd_size_type nbuckets = 0;
+  bfd_size_type nchains = 0;
+  bfd_vma * buckets = NULL;
+  bfd_vma * chains = NULL;
+  bfd_vma ngnubuckets = 0;
+  bfd_vma * gnubuckets = NULL;
+  bfd_vma * gnuchains = NULL;
+  bfd_vma gnusymidx = 0;
+  bfd_size_type ngnuchains = 0;
+
+  if (!do_syms && !do_dyn_syms && !do_histogram)
+    return 1;
+
+  if (dynamic_info[DT_HASH]
+      && (do_histogram
+         || (do_using_dynamic
+             && !do_dyn_syms
+             && dynamic_strings != NULL)))
+    {
+      unsigned char nb[8];
+      unsigned char nc[8];
+      unsigned int hash_ent_size = 4;
+
+      if ((elf_header.e_machine == EM_ALPHA
+          || elf_header.e_machine == EM_S390
+          || elf_header.e_machine == EM_S390_OLD)
+         && elf_header.e_ident[EI_CLASS] == ELFCLASS64)
+       hash_ent_size = 8;
+
+      if (fseek (file,
+                (archive_file_offset
+                 + offset_from_vma (file, dynamic_info[DT_HASH],
+                                    sizeof nb + sizeof nc)),
+                SEEK_SET))
+       {
+         error (_("Unable to seek to start of dynamic information\n"));
+         goto no_hash;
+       }
+
+      if (fread (nb, hash_ent_size, 1, file) != 1)
+       {
+         error (_("Failed to read in number of buckets\n"));
+         goto no_hash;

        }
 
       if (fread (nc, hash_ent_size, 1, file) != 1)
        }
 
       if (fread (nc, hash_ent_size, 1, file) != 1)


@@ -10175,182 +11247,58 @@ process_symbol_table (FILE * file)
 
          for (si = 0, psym = symtab; si < num_syms; si++, psym++)
            {
 
          for (si = 0, psym = symtab; si < num_syms; si++, psym++)
            {

+             const char *version_string;
+             enum versioned_symbol_info sym_info;
+             unsigned short vna_other;
+

              printf ("%6d: ", si);
              print_vma (psym->st_value, LONG_HEX);
              putchar (' ');
              print_vma (psym->st_size, DEC_5);
              printf (" %-7s", get_symbol_type (ELF_ST_TYPE (psym->st_info)));
              printf (" %-6s", get_symbol_binding (ELF_ST_BIND (psym->st_info)));
              printf ("%6d: ", si);
              print_vma (psym->st_value, LONG_HEX);
              putchar (' ');
              print_vma (psym->st_size, DEC_5);
              printf (" %-7s", get_symbol_type (ELF_ST_TYPE (psym->st_info)));
              printf (" %-6s", get_symbol_binding (ELF_ST_BIND (psym->st_info)));

-             printf (" %-7s", get_symbol_visibility (ELF_ST_VISIBILITY (psym->st_other)));
-             /* Check to see if any other bits in the st_other field are set.
-                Note - displaying this information disrupts the layout of the
-                table being generated, but for the moment this case is very rare.  */
-             if (psym->st_other ^ ELF_ST_VISIBILITY (psym->st_other))
-               printf (" [%s] ", get_symbol_other (psym->st_other ^ ELF_ST_VISIBILITY (psym->st_other)));
+             if (elf_header.e_ident[EI_OSABI] == ELFOSABI_SOLARIS)
+               printf (" %-7s",  get_solaris_symbol_visibility (psym->st_other));
+             else
+               {
+                 unsigned int vis = ELF_ST_VISIBILITY (psym->st_other);
+
+                 printf (" %-7s", get_symbol_visibility (vis));
+                 /* Check to see if any other bits in the st_other field are set.
+                    Note - displaying this information disrupts the layout of the
+                    table being generated, but for the moment this case is very rare.  */
+                 if (psym->st_other ^ vis)
+                   printf (" [%s] ", get_symbol_other (psym->st_other ^ vis));
+               }

              printf (" %4s ", get_symbol_index_type (psym->st_shndx));
              print_symbol (25, psym->st_name < strtab_size
                            ? strtab + psym->st_name : _("<corrupt>"));
 
              printf (" %4s ", get_symbol_index_type (psym->st_shndx));
              print_symbol (25, psym->st_name < strtab_size
                            ? strtab + psym->st_name : _("<corrupt>"));
 

-             if (section->sh_type == SHT_DYNSYM
-                 && version_info[DT_VERSIONTAGIDX (DT_VERSYM)] != 0)
+             version_string
+               = get_symbol_version_string (file,
+                                            section->sh_type == SHT_DYNSYM,
+                                            strtab, strtab_size, si,
+                                            psym, &sym_info, &vna_other);
+             if (version_string)

                {
                {

-                 unsigned char data[2];
-                 unsigned short vers_data;
-                 unsigned long offset;
-                 int is_nobits;
-                 int check_def;
-
-                 offset = offset_from_vma
-                   (file, version_info[DT_VERSIONTAGIDX (DT_VERSYM)],
-                    sizeof data + si * sizeof (vers_data));
-
-                 if (get_data (&data, file, offset + si * sizeof (vers_data),
-                               sizeof (data), 1, _("version data")) == NULL)
-                   break;
-
-                 vers_data = byte_get (data, 2);
-
-                 is_nobits = (psym->st_shndx < elf_header.e_shnum
-                              && section_headers[psym->st_shndx].sh_type
-                                 == SHT_NOBITS);
-
-                 check_def = (psym->st_shndx != SHN_UNDEF);
-
-                 if ((vers_data & VERSYM_HIDDEN) || vers_data > 1)
-                   {
-                     if (version_info[DT_VERSIONTAGIDX (DT_VERNEED)]
-                         && (is_nobits || ! check_def))
-                       {
-                         Elf_External_Verneed evn;
-                         Elf_Internal_Verneed ivn;
-                         Elf_Internal_Vernaux ivna;
-
-                         /* We must test both.  */
-                         offset = offset_from_vma
-                           (file, version_info[DT_VERSIONTAGIDX (DT_VERNEED)],
-                            sizeof evn);
-
-                         do
-                           {
-                             unsigned long vna_off;
-
-                             if (get_data (&evn, file, offset, sizeof (evn), 1,
-                                           _("version need")) == NULL)
-                               {
-                                 ivna.vna_next = 0;
-                                 ivna.vna_other = 0;
-                                 ivna.vna_name = 0;
-                                 break;
-                               }
-
-                             ivn.vn_aux  = BYTE_GET (evn.vn_aux);
-                             ivn.vn_next = BYTE_GET (evn.vn_next);
-
-                             vna_off = offset + ivn.vn_aux;
-
-                             do
-                               {
-                                 Elf_External_Vernaux evna;
-
-                                 if (get_data (&evna, file, vna_off,
-                                               sizeof (evna), 1,
-                                               _("version need aux (3)")) == NULL)
-                                   {
-                                     ivna.vna_next = 0;
-                                     ivna.vna_other = 0;
-                                     ivna.vna_name = 0;
-                                   }
-                                 else
-                                   {
-                                     ivna.vna_other = BYTE_GET (evna.vna_other);
-                                     ivna.vna_next  = BYTE_GET (evna.vna_next);
-                                     ivna.vna_name  = BYTE_GET (evna.vna_name);
-                                   }
-
-                                 vna_off += ivna.vna_next;
-                               }
-                             while (ivna.vna_other != vers_data
-                                    && ivna.vna_next != 0);
-
-                             if (ivna.vna_other == vers_data)
-                               break;
-
-                             offset += ivn.vn_next;
-                           }
-                         while (ivn.vn_next != 0);
-
-                         if (ivna.vna_other == vers_data)
-                           {
-                             printf ("@%s (%d)",
-                                     ivna.vna_name < strtab_size
-                                     ? strtab + ivna.vna_name : _("<corrupt>"),
-                                     ivna.vna_other);
-                             check_def = 0;
-                           }
-                         else if (! is_nobits)
-                           error (_("bad dynamic symbol\n"));
-                         else
-                           check_def = 1;
-                       }
-
-                     if (check_def)
-                       {
-                         if (vers_data != 0x8001
-                             && version_info[DT_VERSIONTAGIDX (DT_VERDEF)])
-                           {
-                             Elf_Internal_Verdef ivd;
-                             Elf_Internal_Verdaux ivda;
-                             Elf_External_Verdaux evda;
-                             unsigned long off;
-
-                             off = offset_from_vma
-                               (file,
-                                version_info[DT_VERSIONTAGIDX (DT_VERDEF)],
-                                sizeof (Elf_External_Verdef));
-
-                             do
-                               {
-                                 Elf_External_Verdef evd;
-
-                                 if (get_data (&evd, file, off, sizeof (evd),
-                                               1, _("version def")) == NULL)
-                                   {
-                                     ivd.vd_ndx = 0;
-                                     ivd.vd_aux = 0;
-                                     ivd.vd_next = 0;
-                                   }
-                                 else
-                                   {
-                                     ivd.vd_ndx = BYTE_GET (evd.vd_ndx);
-                                     ivd.vd_aux = BYTE_GET (evd.vd_aux);
-                                     ivd.vd_next = BYTE_GET (evd.vd_next);
-                                   }
-
-                                 off += ivd.vd_next;
-                               }
-                             while (ivd.vd_ndx != (vers_data & VERSYM_VERSION)
-                                    && ivd.vd_next != 0);
-
-                             off -= ivd.vd_next;
-                             off += ivd.vd_aux;
-
-                             if (get_data (&evda, file, off, sizeof (evda),
-                                           1, _("version def aux")) == NULL)
-                               break;
-
-                             ivda.vda_name = BYTE_GET (evda.vda_name);
-
-                             if (psym->st_name != ivda.vda_name)
-                               printf ((vers_data & VERSYM_HIDDEN)
-                                       ? "@%s" : "@@%s",
-                                       ivda.vda_name < strtab_size
-                                       ? strtab + ivda.vda_name : _("<corrupt>"));
-                           }
-                       }
-                   }
+                 if (sym_info == symbol_undefined)
+                   printf ("@%s (%d)", version_string, vna_other);
+                 else
+                   printf (sym_info == symbol_hidden ? "@%s" : "@@%s",
+                           version_string);

                }
 
              putchar ('\n');
                }
 
              putchar ('\n');

+
+             if (ELF_ST_BIND (psym->st_info) == STB_LOCAL
+                 && si >= section->sh_info
+                 /* Irix 5 and 6 MIPS binaries are known to ignore this requirement.  */
+                 && elf_header.e_machine != EM_MIPS
+                 /* Solaris binaries have been found to violate this requirement as
+                    well.  Not sure if this is a bug or an ABI requirement.  */
+                 && elf_header.e_ident[EI_OSABI] != ELFOSABI_SOLARIS)
+               warn (_("local symbol %u found at index >= %s's sh_info value of %u\n"),
+                     si, printable_section_name (section), section->sh_info);

            }
 
          free (symtab);
            }
 
          free (symtab);


@@ -10371,6 +11319,7 @@ process_symbol_table (FILE * file)
       unsigned long maxlength = 0;
       unsigned long nzero_counts = 0;
       unsigned long nsyms = 0;
       unsigned long maxlength = 0;
       unsigned long nzero_counts = 0;
       unsigned long nsyms = 0;

+      unsigned long chained;

 
       printf (_("\nHistogram for bucket list length (total of %lu buckets):\n"),
              (unsigned long) nbuckets);
 
       printf (_("\nHistogram for bucket list length (total of %lu buckets):\n"),
              (unsigned long) nbuckets);


@@ -10385,21 +11334,23 @@ process_symbol_table (FILE * file)
       printf (_(" Length  Number     %% of total  Coverage\n"));
       for (hn = 0; hn < nbuckets; ++hn)
        {
       printf (_(" Length  Number     %% of total  Coverage\n"));
       for (hn = 0; hn < nbuckets; ++hn)
        {

-         for (si = buckets[hn]; si > 0 && si < nchains; si = chains[si])
+         for (si = buckets[hn], chained = 0;
+              si > 0 && si < nchains && si < nbuckets && chained <= nchains;
+              si = chains[si], ++chained)

            {
              ++nsyms;
              if (maxlength < ++lengths[hn])
                ++maxlength;
            {
              ++nsyms;
              if (maxlength < ++lengths[hn])
                ++maxlength;

-
-             /* PR binutils/17531: A corrupt binary could contain broken
-                histogram data.  Do not go into an infinite loop trying
-                to process it.  */
-             if (chains[si] == si)
-               {
-                 error (_("histogram chain links to itself\n"));
-                 break;
-               }

            }
            }

+
+           /* PR binutils/17531: A corrupt binary could contain broken
+              histogram data.  Do not go into an infinite loop trying
+              to process it.  */
+           if (chained > nchains)
+             {
+               error (_("histogram chain is corrupt\n"));
+               break;
+             }

        }
 
       counts = (unsigned long *) calloc (maxlength + 1, sizeof (*counts));
        }
 
       counts = (unsigned long *) calloc (maxlength + 1, sizeof (*counts));


@@ -10599,6 +11550,7 @@ target_specific_reloc_handling (Elf_Internal_Rela * reloc,
          case 10: /* R_MSP430_SYM_DIFF */
            if (uses_msp430x_relocs ())
              break;
          case 10: /* R_MSP430_SYM_DIFF */
            if (uses_msp430x_relocs ())
              break;

+           /* Fall through.  */

          case 21: /* R_MSP430X_SYM_DIFF */
            saved_sym = symtab + get_reloc_symindex (reloc->r_info);
            return TRUE;
          case 21: /* R_MSP430X_SYM_DIFF */
            saved_sym = symtab + get_reloc_symindex (reloc->r_info);
            return TRUE;


@@ -10678,6 +11630,42 @@ target_specific_reloc_handling (Elf_Internal_Rela * reloc,
          }
        break;
       }
          }
        break;
       }

+
+    case EM_RL78:
+      {
+       static bfd_vma saved_sym1 = 0;
+       static bfd_vma saved_sym2 = 0;
+       static bfd_vma value;
+
+       switch (reloc_type)
+         {
+         case 0x80: /* R_RL78_SYM.  */
+           saved_sym1 = saved_sym2;
+           saved_sym2 = symtab[get_reloc_symindex (reloc->r_info)].st_value;
+           saved_sym2 += reloc->r_addend;
+           return TRUE;
+
+         case 0x83: /* R_RL78_OPsub.  */
+           value = saved_sym1 - saved_sym2;
+           saved_sym2 = saved_sym1 = 0;
+           return TRUE;
+           break;
+
+         case 0x41: /* R_RL78_ABS32.  */
+           byte_put (start + reloc->r_offset, value, 4);
+           value = 0;
+           return TRUE;
+
+         case 0x43: /* R_RL78_ABS16.  */
+           byte_put (start + reloc->r_offset, value, 2);
+           value = 0;
+           return TRUE;
+
+         default:
+           break;
+         }
+       break;
+      }

     }
 
   return FALSE;
     }
 
   return FALSE;


@@ -10697,10 +11685,11 @@ target_specific_reloc_handling (Elf_Internal_Rela * reloc,
 static bfd_boolean
 is_32bit_abs_reloc (unsigned int reloc_type)
 {
 static bfd_boolean
 is_32bit_abs_reloc (unsigned int reloc_type)
 {

+  /* Please keep this table alpha-sorted for ease of visual lookup.  */

   switch (elf_header.e_machine)
     {
     case EM_386:
   switch (elf_header.e_machine)
     {
     case EM_386:

-    case EM_486:
+    case EM_IAMCU:

       return reloc_type == 1; /* R_386_32.  */
     case EM_68K:
       return reloc_type == 1; /* R_68K_32.  */
       return reloc_type == 1; /* R_386_32.  */
     case EM_68K:
       return reloc_type == 1; /* R_68K_32.  */


@@ -10710,17 +11699,20 @@ is_32bit_abs_reloc (unsigned int reloc_type)
       return reloc_type == 2; /* R_960_32.  */
     case EM_AARCH64:
       return reloc_type == 258; /* R_AARCH64_ABS32 */
       return reloc_type == 2; /* R_960_32.  */
     case EM_AARCH64:
       return reloc_type == 258; /* R_AARCH64_ABS32 */

+    case EM_ADAPTEVA_EPIPHANY:
+      return reloc_type == 3;

     case EM_ALPHA:
       return reloc_type == 1; /* R_ALPHA_REFLONG.  */
     case EM_ARC:
       return reloc_type == 1; /* R_ARC_32.  */
     case EM_ALPHA:
       return reloc_type == 1; /* R_ALPHA_REFLONG.  */
     case EM_ARC:
       return reloc_type == 1; /* R_ARC_32.  */

+    case EM_ARC_COMPACT:
+    case EM_ARC_COMPACT2:
+      return reloc_type == 4; /* R_ARC_32.  */

     case EM_ARM:
       return reloc_type == 2; /* R_ARM_ABS32 */
     case EM_AVR_OLD:
     case EM_AVR:
       return reloc_type == 1;
     case EM_ARM:
       return reloc_type == 2; /* R_ARM_ABS32 */
     case EM_AVR_OLD:
     case EM_AVR:
       return reloc_type == 1;

-    case EM_ADAPTEVA_EPIPHANY:
-      return reloc_type == 3;

     case EM_BLACKFIN:
       return reloc_type == 0x12; /* R_byte4_data.  */
     case EM_CRIS:
     case EM_BLACKFIN:
       return reloc_type == 0x12; /* R_byte4_data.  */
     case EM_CRIS:


@@ -10742,12 +11734,15 @@ is_32bit_abs_reloc (unsigned int reloc_type)
     case EM_CYGNUS_FR30:
     case EM_FR30:
       return reloc_type == 3; /* R_FR30_32.  */
     case EM_CYGNUS_FR30:
     case EM_FR30:
       return reloc_type == 3; /* R_FR30_32.  */

+    case EM_FT32:
+      return reloc_type == 1; /* R_FT32_32.  */

     case EM_H8S:
     case EM_H8_300:
     case EM_H8_300H:
       return reloc_type == 1; /* R_H8_DIR32.  */
     case EM_IA_64:
     case EM_H8S:
     case EM_H8_300:
     case EM_H8_300H:
       return reloc_type == 1; /* R_H8_DIR32.  */
     case EM_IA_64:

-      return reloc_type == 0x65; /* R_IA64_SECREL32LSB.  */
+      return reloc_type == 0x65 /* R_IA64_SECREL32LSB.  */
+       || reloc_type == 0x25;  /* R_IA64_DIR32LSB.  */

     case EM_IP2K_OLD:
     case EM_IP2K:
       return reloc_type == 2; /* R_IP2K_32.  */
     case EM_IP2K_OLD:
     case EM_IP2K:
       return reloc_type == 2; /* R_IP2K_32.  */


@@ -10760,6 +11755,9 @@ is_32bit_abs_reloc (unsigned int reloc_type)
       return reloc_type == 3; /* R_M32C_32.  */
     case EM_M32R:
       return reloc_type == 34; /* R_M32R_32_RELA.  */
       return reloc_type == 3; /* R_M32C_32.  */
     case EM_M32R:
       return reloc_type == 34; /* R_M32R_32_RELA.  */

+    case EM_68HC11:
+    case EM_68HC12:
+      return reloc_type == 6; /* R_M68HC11_32.  */

     case EM_MCORE:
       return reloc_type == 1; /* R_MCORE_ADDR32.  */
     case EM_CYGNUS_MEP:
     case EM_MCORE:
       return reloc_type == 1; /* R_MCORE_ADDR32.  */
     case EM_CYGNUS_MEP:


@@ -10803,6 +11801,8 @@ is_32bit_abs_reloc (unsigned int reloc_type)
       return reloc_type == 1; /* R_PPC64_ADDR32.  */
     case EM_PPC:
       return reloc_type == 1; /* R_PPC_ADDR32.  */
       return reloc_type == 1; /* R_PPC64_ADDR32.  */
     case EM_PPC:
       return reloc_type == 1; /* R_PPC_ADDR32.  */

+    case EM_RISCV:
+      return reloc_type == 1; /* R_RISCV_32.  */

     case EM_RL78:
       return reloc_type == 1; /* R_RL78_DIR32.  */
     case EM_RX:
     case EM_RL78:
       return reloc_type == 1; /* R_RL78_DIR32.  */
     case EM_RX:


@@ -10836,6 +11836,8 @@ is_32bit_abs_reloc (unsigned int reloc_type)
       return reloc_type == 0x33; /* R_V810_WORD.  */
     case EM_VAX:
       return reloc_type == 1; /* R_VAX_32.  */
       return reloc_type == 0x33; /* R_V810_WORD.  */
     case EM_VAX:
       return reloc_type == 1; /* R_VAX_32.  */

+    case EM_VISIUM:
+      return reloc_type == 3;  /* R_VISIUM_32. */

     case EM_X86_64:
     case EM_L1OM:
     case EM_K1OM:
     case EM_X86_64:
     case EM_L1OM:
     case EM_K1OM:


@@ -10851,9 +11853,16 @@ is_32bit_abs_reloc (unsigned int reloc_type)
     case EM_XTENSA:
       return reloc_type == 1; /* R_XTENSA_32.  */
     default:
     case EM_XTENSA:
       return reloc_type == 1; /* R_XTENSA_32.  */
     default:

-      error (_("Missing knowledge of 32-bit reloc types used in DWARF sections of machine number %d\n"),
-            elf_header.e_machine);
-      abort ();
+      {
+       static unsigned int prev_warn = 0;
+
+       /* Avoid repeating the same warning multiple times.  */
+       if (prev_warn != elf_header.e_machine)
+         error (_("Missing knowledge of 32-bit reloc types used in DWARF sections of machine number %d\n"),
+                elf_header.e_machine);
+       prev_warn = elf_header.e_machine;
+       return FALSE;
+      }

     }
 }
 
     }
 }
 


@@ -10864,9 +11873,10 @@ static bfd_boolean
 is_32bit_pcrel_reloc (unsigned int reloc_type)
 {
   switch (elf_header.e_machine)
 is_32bit_pcrel_reloc (unsigned int reloc_type)
 {
   switch (elf_header.e_machine)

+  /* Please keep this table alpha-sorted for ease of visual lookup.  */

     {
     case EM_386:
     {
     case EM_386:

-    case EM_486:
+    case EM_IAMCU:

       return reloc_type == 2;  /* R_386_PC32.  */
     case EM_68K:
       return reloc_type == 4;  /* R_68K_PC32.  */
       return reloc_type == 2;  /* R_386_PC32.  */
     case EM_68K:
       return reloc_type == 4;  /* R_68K_PC32.  */


@@ -10876,8 +11886,14 @@ is_32bit_pcrel_reloc (unsigned int reloc_type)
       return reloc_type == 6;
     case EM_ALPHA:
       return reloc_type == 10; /* R_ALPHA_SREL32.  */
       return reloc_type == 6;
     case EM_ALPHA:
       return reloc_type == 10; /* R_ALPHA_SREL32.  */

+    case EM_ARC_COMPACT:
+    case EM_ARC_COMPACT2:
+      return reloc_type == 49; /* R_ARC_32_PCREL.  */

     case EM_ARM:
       return reloc_type == 3;  /* R_ARM_REL32 */
     case EM_ARM:
       return reloc_type == 3;  /* R_ARM_REL32 */

+    case EM_AVR_OLD:
+    case EM_AVR:
+      return reloc_type == 36; /* R_AVR_32_PCREL.  */

     case EM_MICROBLAZE:
       return reloc_type == 2;  /* R_MICROBLAZE_32_PCREL.  */
     case EM_OR1K:
     case EM_MICROBLAZE:
       return reloc_type == 2;  /* R_MICROBLAZE_32_PCREL.  */
     case EM_OR1K:


@@ -10903,6 +11919,8 @@ is_32bit_pcrel_reloc (unsigned int reloc_type)
       return reloc_type == 6; /* R_TILEGX_32_PCREL.  */
     case EM_TILEPRO:
       return reloc_type == 4; /* R_TILEPRO_32_PCREL.  */
       return reloc_type == 6; /* R_TILEGX_32_PCREL.  */
     case EM_TILEPRO:
       return reloc_type == 4; /* R_TILEPRO_32_PCREL.  */

+    case EM_VISIUM:
+      return reloc_type == 6;  /* R_VISIUM_32_PCREL */

     case EM_X86_64:
     case EM_L1OM:
     case EM_K1OM:
     case EM_X86_64:
     case EM_L1OM:
     case EM_K1OM:


@@ -10938,6 +11956,8 @@ is_64bit_abs_reloc (unsigned int reloc_type)
       return reloc_type == 80; /* R_PARISC_DIR64.  */
     case EM_PPC64:
       return reloc_type == 38; /* R_PPC64_ADDR64.  */
       return reloc_type == 80; /* R_PARISC_DIR64.  */
     case EM_PPC64:
       return reloc_type == 38; /* R_PPC64_ADDR64.  */

+    case EM_RISCV:
+      return reloc_type == 2; /* R_RISCV_64.  */

     case EM_SPARC32PLUS:
     case EM_SPARCV9:
     case EM_SPARC:
     case EM_SPARC32PLUS:
     case EM_SPARCV9:
     case EM_SPARC:


@@ -11005,6 +12025,8 @@ is_24bit_abs_reloc (unsigned int reloc_type)
     case EM_CYGNUS_MN10200:
     case EM_MN10200:
       return reloc_type == 4; /* R_MN10200_24.  */
     case EM_CYGNUS_MN10200:
     case EM_MN10200:
       return reloc_type == 4; /* R_MN10200_24.  */

+    case EM_FT32:
+      return reloc_type == 5; /* R_FT32_20.  */

     default:
       return FALSE;
     }
     default:
       return FALSE;
     }


@@ -11016,13 +12038,18 @@ is_24bit_abs_reloc (unsigned int reloc_type)
 static bfd_boolean
 is_16bit_abs_reloc (unsigned int reloc_type)
 {
 static bfd_boolean
 is_16bit_abs_reloc (unsigned int reloc_type)
 {

+  /* Please keep this table alpha-sorted for ease of visual lookup.  */

   switch (elf_header.e_machine)
     {
   switch (elf_header.e_machine)
     {

+    case EM_ARC:
+    case EM_ARC_COMPACT:
+    case EM_ARC_COMPACT2:
+      return reloc_type == 2; /* R_ARC_16.  */
+    case EM_ADAPTEVA_EPIPHANY:
+      return reloc_type == 5;

     case EM_AVR_OLD:
     case EM_AVR:
       return reloc_type == 4; /* R_AVR_16.  */
     case EM_AVR_OLD:
     case EM_AVR:
       return reloc_type == 4; /* R_AVR_16.  */

-    case EM_ADAPTEVA_EPIPHANY:
-      return reloc_type == 5;

     case EM_CYGNUS_D10V:
     case EM_D10V:
       return reloc_type == 3; /* R_D10V_16.  */
     case EM_CYGNUS_D10V:
     case EM_D10V:
       return reloc_type == 3; /* R_D10V_16.  */


@@ -11036,9 +12063,16 @@ is_16bit_abs_reloc (unsigned int reloc_type)
     case EM_M32C_OLD:
     case EM_M32C:
       return reloc_type == 1; /* R_M32C_16 */
     case EM_M32C_OLD:
     case EM_M32C:
       return reloc_type == 1; /* R_M32C_16 */

+    case EM_CYGNUS_MN10200:
+    case EM_MN10200:
+      return reloc_type == 2; /* R_MN10200_16.  */
+    case EM_CYGNUS_MN10300:
+    case EM_MN10300:
+      return reloc_type == 2; /* R_MN10300_16.  */

     case EM_MSP430:
       if (uses_msp430x_relocs ())
        return reloc_type == 2; /* R_MSP430_ABS16.  */
     case EM_MSP430:
       if (uses_msp430x_relocs ())
        return reloc_type == 2; /* R_MSP430_ABS16.  */

+      /* Fall through.  */

     case EM_MSP430_OLD:
       return reloc_type == 5; /* R_MSP430_16_BYTE.  */
     case EM_NDS32:
     case EM_MSP430_OLD:
       return reloc_type == 5; /* R_MSP430_16_BYTE.  */
     case EM_NDS32:


@@ -11051,15 +12085,11 @@ is_16bit_abs_reloc (unsigned int reloc_type)
       return reloc_type == 2; /* R_OR1K_16.  */
     case EM_TI_C6000:
       return reloc_type == 2; /* R_C6000_ABS16.  */
       return reloc_type == 2; /* R_OR1K_16.  */
     case EM_TI_C6000:
       return reloc_type == 2; /* R_C6000_ABS16.  */

+    case EM_VISIUM:
+      return reloc_type == 2; /* R_VISIUM_16. */

     case EM_XC16X:
     case EM_C166:
       return reloc_type == 2; /* R_XC16C_ABS_16.  */
     case EM_XC16X:
     case EM_C166:
       return reloc_type == 2; /* R_XC16C_ABS_16.  */

-    case EM_CYGNUS_MN10200:
-    case EM_MN10200:
-      return reloc_type == 2; /* R_MN10200_16.  */
-    case EM_CYGNUS_MN10300:
-    case EM_MN10300:
-      return reloc_type == 2; /* R_MN10300_16.  */

     case EM_XGATE:
       return reloc_type == 3; /* R_XGATE_16.  */
     default:
     case EM_XGATE:
       return reloc_type == 3; /* R_XGATE_16.  */
     default:


@@ -11075,40 +12105,54 @@ is_none_reloc (unsigned int reloc_type)
 {
   switch (elf_header.e_machine)
     {
 {
   switch (elf_header.e_machine)
     {

-    case EM_68K:     /* R_68K_NONE.  */

     case EM_386:     /* R_386_NONE.  */
     case EM_386:     /* R_386_NONE.  */

-    case EM_SPARC32PLUS:
-    case EM_SPARCV9:
-    case EM_SPARC:   /* R_SPARC_NONE.  */
-    case EM_MIPS:    /* R_MIPS_NONE.  */
-    case EM_PARISC:  /* R_PARISC_NONE.  */
-    case EM_ALPHA:   /* R_ALPHA_NONE.  */
+    case EM_68K:     /* R_68K_NONE.  */

     case EM_ADAPTEVA_EPIPHANY:
     case EM_ADAPTEVA_EPIPHANY:

-    case EM_PPC:     /* R_PPC_NONE.  */
-    case EM_PPC64:   /* R_PPC64_NONE.  */
+    case EM_ALPHA:   /* R_ALPHA_NONE.  */
+    case EM_ALTERA_NIOS2: /* R_NIOS2_NONE.  */
+    case EM_ARC:     /* R_ARC_NONE.  */
+    case EM_ARC_COMPACT2: /* R_ARC_NONE.  */
+    case EM_ARC_COMPACT: /* R_ARC_NONE.  */

     case EM_ARM:     /* R_ARM_NONE.  */
     case EM_ARM:     /* R_ARM_NONE.  */

-    case EM_IA_64:   /* R_IA64_NONE.  */
-    case EM_SH:      /* R_SH_NONE.  */
-    case EM_S390_OLD:
-    case EM_S390:    /* R_390_NONE.  */
+    case EM_C166:    /* R_XC16X_NONE.  */

     case EM_CRIS:    /* R_CRIS_NONE.  */
     case EM_CRIS:    /* R_CRIS_NONE.  */

-    case EM_X86_64:  /* R_X86_64_NONE.  */
-    case EM_L1OM:    /* R_X86_64_NONE.  */
+    case EM_FT32:    /* R_FT32_NONE.  */
+    case EM_IA_64:   /* R_IA64_NONE.  */

     case EM_K1OM:    /* R_X86_64_NONE.  */
     case EM_K1OM:    /* R_X86_64_NONE.  */

+    case EM_L1OM:    /* R_X86_64_NONE.  */
+    case EM_M32R:    /* R_M32R_NONE.  */
+    case EM_MIPS:    /* R_MIPS_NONE.  */

     case EM_MN10300: /* R_MN10300_NONE.  */
     case EM_MOXIE:   /* R_MOXIE_NONE.  */
     case EM_MN10300: /* R_MN10300_NONE.  */
     case EM_MOXIE:   /* R_MOXIE_NONE.  */

-    case EM_M32R:    /* R_M32R_NONE.  */
-    case EM_TI_C6000:/* R_C6000_NONE.  */
+    case EM_NIOS32:  /* R_NIOS_NONE.  */
+    case EM_OR1K:    /* R_OR1K_NONE. */
+    case EM_PARISC:  /* R_PARISC_NONE.  */
+    case EM_PPC64:   /* R_PPC64_NONE.  */
+    case EM_PPC:     /* R_PPC_NONE.  */
+    case EM_RISCV:   /* R_RISCV_NONE.  */
+    case EM_S390:    /* R_390_NONE.  */
+    case EM_S390_OLD:
+    case EM_SH:      /* R_SH_NONE.  */
+    case EM_SPARC32PLUS:
+    case EM_SPARC:   /* R_SPARC_NONE.  */
+    case EM_SPARCV9:

     case EM_TILEGX:  /* R_TILEGX_NONE.  */
     case EM_TILEPRO: /* R_TILEPRO_NONE.  */
     case EM_TILEGX:  /* R_TILEGX_NONE.  */
     case EM_TILEPRO: /* R_TILEPRO_NONE.  */

+    case EM_TI_C6000:/* R_C6000_NONE.  */
+    case EM_X86_64:  /* R_X86_64_NONE.  */

     case EM_XC16X:
     case EM_XC16X:

-    case EM_C166:    /* R_XC16X_NONE.  */
-    case EM_ALTERA_NIOS2: /* R_NIOS2_NONE.  */
-    case EM_NIOS32:  /* R_NIOS_NONE.  */
-    case EM_OR1K:    /* R_OR1K_NONE. */

       return reloc_type == 0;
       return reloc_type == 0;

+

     case EM_AARCH64:
       return reloc_type == 0 || reloc_type == 256;
     case EM_AARCH64:
       return reloc_type == 0 || reloc_type == 256;

+    case EM_AVR_OLD:
+    case EM_AVR:
+      return (reloc_type == 0 /* R_AVR_NONE.  */
+             || reloc_type == 30 /* R_AVR_DIFF8.  */
+             || reloc_type == 31 /* R_AVR_DIFF16.  */
+             || reloc_type == 32 /* R_AVR_DIFF32.  */);
+    case EM_METAG:
+      return reloc_type == 3; /* R_METAG_NONE.  */

     case EM_NDS32:
       return (reloc_type == 0       /* R_XTENSA_NONE.  */
              || reloc_type == 204  /* R_NDS32_DIFF8.  */
     case EM_NDS32:
       return (reloc_type == 0       /* R_XTENSA_NONE.  */
              || reloc_type == 204  /* R_NDS32_DIFF8.  */


@@ -11121,24 +12165,54 @@ is_none_reloc (unsigned int reloc_type)
              || reloc_type == 17  /* R_XTENSA_DIFF8.  */
              || reloc_type == 18  /* R_XTENSA_DIFF16.  */
              || reloc_type == 19  /* R_XTENSA_DIFF32.  */);
              || reloc_type == 17  /* R_XTENSA_DIFF8.  */
              || reloc_type == 18  /* R_XTENSA_DIFF16.  */
              || reloc_type == 19  /* R_XTENSA_DIFF32.  */);

-    case EM_METAG:
-      return reloc_type == 3; /* R_METAG_NONE.  */

     }
   return FALSE;
 }
 
     }
   return FALSE;
 }
 

+/* Returns TRUE if there is a relocation against
+   section NAME at OFFSET bytes.  */
+
+bfd_boolean
+reloc_at (struct dwarf_section * dsec, dwarf_vma offset)
+{
+  Elf_Internal_Rela * relocs;
+  Elf_Internal_Rela * rp;
+
+  if (dsec == NULL || dsec->reloc_info == NULL)
+    return FALSE;
+
+  relocs = (Elf_Internal_Rela *) dsec->reloc_info;
+
+  for (rp = relocs; rp < relocs + dsec->num_relocs; ++rp)
+    if (rp->r_offset == offset)
+      return TRUE;
+
+   return FALSE;
+}
+

 /* Apply relocations to a section.
    Note: So far support has been added only for those relocations
    which can be found in debug sections.
 /* Apply relocations to a section.
    Note: So far support has been added only for those relocations
    which can be found in debug sections.

+   If RELOCS_RETURN is non-NULL then returns in it a pointer to the
+   loaded relocs.  It is then the caller's responsibility to free them.

    FIXME: Add support for more relocations ?  */
 
 static void
    FIXME: Add support for more relocations ?  */
 
 static void

-apply_relocations (void * file,
-                  Elf_Internal_Shdr * section,
-                  unsigned char * start)
+apply_relocations (void *                     file,
+                  const Elf_Internal_Shdr *  section,
+                  unsigned char *            start,
+                  bfd_size_type              size,
+                  void **                    relocs_return,
+                  unsigned long *            num_relocs_return)

 {
   Elf_Internal_Shdr * relsec;
 {
   Elf_Internal_Shdr * relsec;

-  unsigned char * end = start + section->sh_size;
+  unsigned char * end = start + size;
+
+  if (relocs_return != NULL)
+    {
+      * (Elf_Internal_Rela **) relocs_return = NULL;
+      * num_relocs_return = 0;
+    }

 
   if (elf_header.e_type != ET_REL)
     return;
 
   if (elf_header.e_type != ET_REL)
     return;


@@ -11184,6 +12258,9 @@ apply_relocations (void * file,
        is_rela = FALSE;
 
       symsec = section_headers + relsec->sh_link;
        is_rela = FALSE;
 
       symsec = section_headers + relsec->sh_link;

+      if (symsec->sh_type != SHT_SYMTAB
+         && symsec->sh_type != SHT_DYNSYM)
+       return;

       symtab = GET_ELF_SYMBOLS ((FILE *) file, symsec, & num_syms);
 
       for (rp = relocs; rp < relocs + num_relocs; ++rp)
       symtab = GET_ELF_SYMBOLS ((FILE *) file, symsec, & num_syms);
 
       for (rp = relocs; rp < relocs + num_relocs; ++rp)


@@ -11212,8 +12289,11 @@ apply_relocations (void * file,
            reloc_size = 2;
          else
            {
            reloc_size = 2;
          else
            {

-             warn (_("unable to apply unsupported reloc type %d to section %s\n"),
-                   reloc_type, printable_section_name (section));
+             static unsigned int prev_reloc = 0;
+             if (reloc_type != prev_reloc)
+               warn (_("unable to apply unsupported reloc type %d to section %s\n"),
+                     reloc_type, printable_section_name (section));
+             prev_reloc = reloc_type;

              continue;
            }
 
              continue;
            }
 


@@ -11249,6 +12329,7 @@ apply_relocations (void * file,
             referencing a global array.  For an example of this see
             the _clz.o binary in libgcc.a.  */
          if (sym != symtab
             referencing a global array.  For an example of this see
             the _clz.o binary in libgcc.a.  */
          if (sym != symtab

+             && ELF_ST_TYPE (sym->st_info) != STT_COMMON

              && ELF_ST_TYPE (sym->st_info) > STT_SECTION)
            {
              warn (_("skipping unexpected symbol type %s in %ld'th relocation in section %s\n"),
              && ELF_ST_TYPE (sym->st_info) > STT_SECTION)
            {
              warn (_("skipping unexpected symbol type %s in %ld'th relocation in section %s\n"),


@@ -11288,7 +12369,15 @@ apply_relocations (void * file,
        }
 
       free (symtab);
        }
 
       free (symtab);

-      free (relocs);
+
+      if (relocs_return)
+       {
+         * (Elf_Internal_Rela **) relocs_return = relocs;
+         * num_relocs_return = num_relocs;
+       }
+      else
+       free (relocs);
+

       break;
     }
 }
       break;
     }
 }


@@ -11326,23 +12415,129 @@ get_section_contents (Elf_Internal_Shdr * section, FILE * file)
                              _("section contents"));
 }
 
                              _("section contents"));
 }
 

+/* Uncompresses a section that was compressed using zlib, in place.  */
+
+static bfd_boolean
+uncompress_section_contents (unsigned char **buffer,
+                            dwarf_size_type uncompressed_size,
+                            dwarf_size_type *size)
+{
+  dwarf_size_type compressed_size = *size;
+  unsigned char * compressed_buffer = *buffer;
+  unsigned char * uncompressed_buffer;
+  z_stream strm;
+  int rc;
+
+  /* It is possible the section consists of several compressed
+     buffers concatenated together, so we uncompress in a loop.  */
+  /* PR 18313: The state field in the z_stream structure is supposed
+     to be invisible to the user (ie us), but some compilers will
+     still complain about it being used without initialisation.  So
+     we first zero the entire z_stream structure and then set the fields
+     that we need.  */
+  memset (& strm, 0, sizeof strm);
+  strm.avail_in = compressed_size;
+  strm.next_in = (Bytef *) compressed_buffer;
+  strm.avail_out = uncompressed_size;
+  uncompressed_buffer = (unsigned char *) xmalloc (uncompressed_size);
+
+  rc = inflateInit (& strm);
+  while (strm.avail_in > 0)
+    {
+      if (rc != Z_OK)
+        goto fail;
+      strm.next_out = ((Bytef *) uncompressed_buffer
+                       + (uncompressed_size - strm.avail_out));
+      rc = inflate (&strm, Z_FINISH);
+      if (rc != Z_STREAM_END)
+        goto fail;
+      rc = inflateReset (& strm);
+    }
+  rc = inflateEnd (& strm);
+  if (rc != Z_OK
+      || strm.avail_out != 0)
+    goto fail;
+
+  *buffer = uncompressed_buffer;
+  *size = uncompressed_size;
+  return TRUE;
+
+ fail:
+  free (uncompressed_buffer);
+  /* Indicate decompression failure.  */
+  *buffer = NULL;
+  return FALSE;
+}

 
 static void
 dump_section_as_strings (Elf_Internal_Shdr * section, FILE * file)
 {
 
 static void
 dump_section_as_strings (Elf_Internal_Shdr * section, FILE * file)
 {

-  Elf_Internal_Shdr * relsec;
-  bfd_size_type num_bytes;
-  char * data;
-  char * end;
-  char * start;
-  bfd_boolean some_strings_shown;
-
-  start = get_section_contents (section, file);
+  Elf_Internal_Shdr *  relsec;
+  bfd_size_type        num_bytes;
+  unsigned char *      data;
+  unsigned char *      end;
+  unsigned char *      real_start;
+  unsigned char *      start;
+  bfd_boolean          some_strings_shown;
+
+  real_start = start = (unsigned char *) get_section_contents (section,
+                                                              file);

   if (start == NULL)
     return;
   if (start == NULL)
     return;

+  num_bytes = section->sh_size;

 
   printf (_("\nString dump of section '%s':\n"), printable_section_name (section));
 
 
   printf (_("\nString dump of section '%s':\n"), printable_section_name (section));
 

+  if (decompress_dumps)
+    {
+      dwarf_size_type new_size = num_bytes;
+      dwarf_size_type uncompressed_size = 0;
+
+      if ((section->sh_flags & SHF_COMPRESSED) != 0)
+       {
+         Elf_Internal_Chdr chdr;
+         unsigned int compression_header_size
+           = get_compression_header (& chdr, (unsigned char *) start);
+
+         if (chdr.ch_type != ELFCOMPRESS_ZLIB)
+           {
+             warn (_("section '%s' has unsupported compress type: %d\n"),
+                   printable_section_name (section), chdr.ch_type);
+             return;
+           }
+         else if (chdr.ch_addralign != section->sh_addralign)
+           {
+             warn (_("compressed section '%s' is corrupted\n"),
+                   printable_section_name (section));
+             return;
+           }
+         uncompressed_size = chdr.ch_size;
+         start += compression_header_size;
+         new_size -= compression_header_size;
+       }
+      else if (new_size > 12 && streq ((char *) start, "ZLIB"))
+       {
+         /* Read the zlib header.  In this case, it should be "ZLIB"
+            followed by the uncompressed section size, 8 bytes in
+            big-endian order.  */
+         uncompressed_size = start[4]; uncompressed_size <<= 8;
+         uncompressed_size += start[5]; uncompressed_size <<= 8;
+         uncompressed_size += start[6]; uncompressed_size <<= 8;
+         uncompressed_size += start[7]; uncompressed_size <<= 8;
+         uncompressed_size += start[8]; uncompressed_size <<= 8;
+         uncompressed_size += start[9]; uncompressed_size <<= 8;
+         uncompressed_size += start[10]; uncompressed_size <<= 8;
+         uncompressed_size += start[11];
+         start += 12;
+         new_size -= 12;
+       }
+
+      if (uncompressed_size
+         && uncompress_section_contents (& start,
+                                         uncompressed_size, & new_size))
+       num_bytes = new_size;
+    }
+

   /* If the section being dumped has relocations against it the user might
      be expecting these relocations to have been applied.  Check for this
      case and issue a warning message in order to avoid confusion.
   /* If the section being dumped has relocations against it the user might
      be expecting these relocations to have been applied.  Check for this
      case and issue a warning message in order to avoid confusion.


@@ -11363,7 +12558,6 @@ dump_section_as_strings (Elf_Internal_Shdr * section, FILE * file)
       break;
     }
 
       break;
     }
 

-  num_bytes = section->sh_size;

   data = start;
   end  = start + num_bytes;
   some_strings_shown = FALSE;
   data = start;
   end  = start + num_bytes;
   some_strings_shown = FALSE;


@@ -11387,9 +12581,9 @@ dump_section_as_strings (Elf_Internal_Shdr * section, FILE * file)
 #endif
          if (maxlen > 0)
            {
 #endif
          if (maxlen > 0)
            {

-             print_symbol ((int) maxlen, data);
+             print_symbol ((int) maxlen, (const char *) data);

              putchar ('\n');
              putchar ('\n');

-             data += strnlen (data, maxlen);
+             data += strnlen ((const char *) data, maxlen);

            }
          else
            {
            }
          else
            {


@@ -11403,7 +12597,7 @@ dump_section_as_strings (Elf_Internal_Shdr * section, FILE * file)
   if (! some_strings_shown)
     printf (_("  No strings found in this section."));
 
   if (! some_strings_shown)
     printf (_("  No strings found in this section."));
 

-  free (start);
+  free (real_start);

 
   putchar ('\n');
 }
 
   putchar ('\n');
 }


@@ -11414,20 +12608,73 @@ dump_section_as_bytes (Elf_Internal_Shdr * section,
                       bfd_boolean relocate)
 {
   Elf_Internal_Shdr * relsec;
                       bfd_boolean relocate)
 {
   Elf_Internal_Shdr * relsec;

-  bfd_size_type bytes;
-  bfd_vma addr;
-  unsigned char * data;
-  unsigned char * start;
-
-  start = (unsigned char *) get_section_contents (section, file);
+  bfd_size_type       bytes;
+  bfd_size_type       section_size;
+  bfd_vma             addr;
+  unsigned char *     data;
+  unsigned char *     real_start;
+  unsigned char *     start;
+
+  real_start = start = (unsigned char *) get_section_contents (section, file);

   if (start == NULL)
     return;
   if (start == NULL)
     return;

+  section_size = section->sh_size;

 
   printf (_("\nHex dump of section '%s':\n"), printable_section_name (section));
 
 
   printf (_("\nHex dump of section '%s':\n"), printable_section_name (section));
 

+  if (decompress_dumps)
+    {
+      dwarf_size_type new_size = section_size;
+      dwarf_size_type uncompressed_size = 0;
+
+      if ((section->sh_flags & SHF_COMPRESSED) != 0)
+       {
+         Elf_Internal_Chdr chdr;
+         unsigned int compression_header_size
+           = get_compression_header (& chdr, start);
+
+         if (chdr.ch_type != ELFCOMPRESS_ZLIB)
+           {
+             warn (_("section '%s' has unsupported compress type: %d\n"),
+                   printable_section_name (section), chdr.ch_type);
+             return;
+           }
+         else if (chdr.ch_addralign != section->sh_addralign)
+           {
+             warn (_("compressed section '%s' is corrupted\n"),
+                   printable_section_name (section));
+             return;
+           }
+         uncompressed_size = chdr.ch_size;
+         start += compression_header_size;
+         new_size -= compression_header_size;
+       }
+      else if (new_size > 12 && streq ((char *) start, "ZLIB"))
+       {
+         /* Read the zlib header.  In this case, it should be "ZLIB"
+            followed by the uncompressed section size, 8 bytes in
+            big-endian order.  */
+         uncompressed_size = start[4]; uncompressed_size <<= 8;
+         uncompressed_size += start[5]; uncompressed_size <<= 8;
+         uncompressed_size += start[6]; uncompressed_size <<= 8;
+         uncompressed_size += start[7]; uncompressed_size <<= 8;
+         uncompressed_size += start[8]; uncompressed_size <<= 8;
+         uncompressed_size += start[9]; uncompressed_size <<= 8;
+         uncompressed_size += start[10]; uncompressed_size <<= 8;
+         uncompressed_size += start[11];
+         start += 12;
+         new_size -= 12;
+       }
+
+      if (uncompressed_size
+         && uncompress_section_contents (& start, uncompressed_size,
+                                         & new_size))
+       section_size = new_size;
+    }
+

   if (relocate)
     {
   if (relocate)
     {

-      apply_relocations (file, section, start);
+      apply_relocations (file, section, start, section_size, NULL, NULL);

     }
   else
     {
     }
   else
     {


@@ -11453,7 +12700,7 @@ dump_section_as_bytes (Elf_Internal_Shdr * section,
     }
 
   addr = section->sh_addr;
     }
 
   addr = section->sh_addr;

-  bytes = section->sh_size;
+  bytes = section_size;

   data = start;
 
   while (bytes)
   data = start;
 
   while (bytes)


@@ -11493,86 +12740,14 @@ dump_section_as_bytes (Elf_Internal_Shdr * section,
       bytes -= lbytes;
     }
 
       bytes -= lbytes;
     }
 

-  free (start);
+  free (real_start);

 
   putchar ('\n');
 }
 
 
   putchar ('\n');
 }
 

-/* Uncompresses a section that was compressed using zlib, in place.  */
-
-static int
-uncompress_section_contents (unsigned char **buffer ATTRIBUTE_UNUSED,
-                            dwarf_size_type *size ATTRIBUTE_UNUSED)
-{
-#ifndef HAVE_ZLIB_H
-  return FALSE;
-#else
-  dwarf_size_type compressed_size = *size;
-  unsigned char * compressed_buffer = *buffer;
-  dwarf_size_type uncompressed_size;
-  unsigned char * uncompressed_buffer;
-  z_stream strm;
-  int rc;
-  dwarf_size_type header_size = 12;
-
-  /* Read the zlib header.  In this case, it should be "ZLIB" followed
-     by the uncompressed section size, 8 bytes in big-endian order.  */
-  if (compressed_size < header_size
-      || ! streq ((char *) compressed_buffer, "ZLIB"))
-    return 0;
-
-  uncompressed_size = compressed_buffer[4]; uncompressed_size <<= 8;
-  uncompressed_size += compressed_buffer[5]; uncompressed_size <<= 8;
-  uncompressed_size += compressed_buffer[6]; uncompressed_size <<= 8;
-  uncompressed_size += compressed_buffer[7]; uncompressed_size <<= 8;
-  uncompressed_size += compressed_buffer[8]; uncompressed_size <<= 8;
-  uncompressed_size += compressed_buffer[9]; uncompressed_size <<= 8;
-  uncompressed_size += compressed_buffer[10]; uncompressed_size <<= 8;
-  uncompressed_size += compressed_buffer[11];
-
-  /* It is possible the section consists of several compressed
-     buffers concatenated together, so we uncompress in a loop.  */
-  strm.zalloc = NULL;
-  strm.zfree = NULL;
-  strm.opaque = NULL;
-  strm.avail_in = compressed_size - header_size;
-  strm.next_in = (Bytef *) compressed_buffer + header_size;
-  strm.avail_out = uncompressed_size;
-  uncompressed_buffer = (unsigned char *) xmalloc (uncompressed_size);
-
-  rc = inflateInit (& strm);
-  while (strm.avail_in > 0)
-    {
-      if (rc != Z_OK)
-        goto fail;
-      strm.next_out = ((Bytef *) uncompressed_buffer
-                       + (uncompressed_size - strm.avail_out));
-      rc = inflate (&strm, Z_FINISH);
-      if (rc != Z_STREAM_END)
-        goto fail;
-      rc = inflateReset (& strm);
-    }
-  rc = inflateEnd (& strm);
-  if (rc != Z_OK
-      || strm.avail_out != 0)
-    goto fail;
-
-  free (compressed_buffer);
-  *buffer = uncompressed_buffer;
-  *size = uncompressed_size;
-  return 1;
-
- fail:
-  free (uncompressed_buffer);
-  /* Indicate decompression failure.  */
-  *buffer = NULL;
-  return 0;
-#endif  /* HAVE_ZLIB_H */
-}
-

 static int
 load_specific_debug_section (enum dwarf_section_display_enum debug,
 static int
 load_specific_debug_section (enum dwarf_section_display_enum debug,

-                            Elf_Internal_Shdr * sec, void * file)
+                            const Elf_Internal_Shdr * sec, void * file)

 {
   struct dwarf_section * section = &debug_displays [debug].section;
   char buf [64];
 {
   struct dwarf_section * section = &debug_displays [debug].section;
   char buf [64];


@@ -11583,6 +12758,7 @@ load_specific_debug_section (enum dwarf_section_display_enum debug,
 
   snprintf (buf, sizeof (buf), _("%s section data"), section->name);
   section->address = sec->sh_addr;
 
   snprintf (buf, sizeof (buf), _("%s section data"), section->name);
   section->address = sec->sh_addr;

+  section->user_data = NULL;

   section->start = (unsigned char *) get_data (NULL, (FILE *) file,
                                                sec->sh_offset, 1,
                                                sec->sh_size, buf);
   section->start = (unsigned char *) get_data (NULL, (FILE *) file,
                                                sec->sh_offset, 1,
                                                sec->sh_size, buf);


@@ -11590,16 +12766,82 @@ load_specific_debug_section (enum dwarf_section_display_enum debug,
     section->size = 0;
   else
     {
     section->size = 0;
   else
     {

-      section->size = sec->sh_size;
-      if (uncompress_section_contents (&section->start, &section->size))
-       sec->sh_size = section->size;
+      unsigned char *start = section->start;
+      dwarf_size_type size = sec->sh_size;
+      dwarf_size_type uncompressed_size = 0;
+
+      if ((sec->sh_flags & SHF_COMPRESSED) != 0)
+       {
+         Elf_Internal_Chdr chdr;
+         unsigned int compression_header_size;
+
+         if (size < (is_32bit_elf
+                     ? sizeof (Elf32_External_Chdr)
+                     : sizeof (Elf64_External_Chdr)))
+           {
+             warn (_("compressed section %s is too small to contain a compression header"),
+                   section->name);
+             return 0;
+           }
+
+         compression_header_size = get_compression_header (&chdr, start);
+
+         if (chdr.ch_type != ELFCOMPRESS_ZLIB)
+           {
+             warn (_("section '%s' has unsupported compress type: %d\n"),
+                   section->name, chdr.ch_type);
+             return 0;
+           }
+         else if (chdr.ch_addralign != sec->sh_addralign)
+           {
+             warn (_("compressed section '%s' is corrupted\n"),
+                   section->name);
+             return 0;
+           }
+         uncompressed_size = chdr.ch_size;
+         start += compression_header_size;
+         size -= compression_header_size;
+       }
+      else if (size > 12 && streq ((char *) start, "ZLIB"))
+       {
+         /* Read the zlib header.  In this case, it should be "ZLIB"
+            followed by the uncompressed section size, 8 bytes in
+            big-endian order.  */
+         uncompressed_size = start[4]; uncompressed_size <<= 8;
+         uncompressed_size += start[5]; uncompressed_size <<= 8;
+         uncompressed_size += start[6]; uncompressed_size <<= 8;
+         uncompressed_size += start[7]; uncompressed_size <<= 8;
+         uncompressed_size += start[8]; uncompressed_size <<= 8;
+         uncompressed_size += start[9]; uncompressed_size <<= 8;
+         uncompressed_size += start[10]; uncompressed_size <<= 8;
+         uncompressed_size += start[11];
+         start += 12;
+         size -= 12;
+       }
+
+      if (uncompressed_size
+         && uncompress_section_contents (&start, uncompressed_size,
+                                         &size))
+       {
+         /* Free the compressed buffer, update the section buffer
+            and the section size if uncompress is successful.  */
+         free (section->start);
+         section->start = start;
+       }
+      section->size = size;

     }
 
   if (section->start == NULL)
     return 0;
 
   if (debug_displays [debug].relocate)
     }
 
   if (section->start == NULL)
     return 0;
 
   if (debug_displays [debug].relocate)

-    apply_relocations ((FILE *) file, sec, section->start);
+    apply_relocations ((FILE *) file, sec, section->start, section->size,
+                      & section->reloc_info, & section->num_relocs);
+  else
+    {
+      section->reloc_info = NULL;
+      section->num_relocs = 0;
+    }

 
   return 1;
 }
 
   return 1;
 }


@@ -11881,16 +13123,18 @@ typedef struct
 
 static const char * arm_attr_tag_CPU_arch[] =
   {"Pre-v4", "v4", "v4T", "v5T", "v5TE", "v5TEJ", "v6", "v6KZ", "v6T2",
 
 static const char * arm_attr_tag_CPU_arch[] =
   {"Pre-v4", "v4", "v4T", "v5T", "v5TE", "v5TEJ", "v6", "v6KZ", "v6T2",

-   "v6K", "v7", "v6-M", "v6S-M", "v7E-M", "v8"};
+   "v6K", "v7", "v6-M", "v6S-M", "v7E-M", "v8", "", "v8-M.baseline",
+   "v8-M.mainline"};

 static const char * arm_attr_tag_ARM_ISA_use[] = {"No", "Yes"};
 static const char * arm_attr_tag_THUMB_ISA_use[] =
 static const char * arm_attr_tag_ARM_ISA_use[] = {"No", "Yes"};
 static const char * arm_attr_tag_THUMB_ISA_use[] =

-  {"No", "Thumb-1", "Thumb-2"};
+  {"No", "Thumb-1", "Thumb-2", "Yes"};

 static const char * arm_attr_tag_FP_arch[] =
   {"No", "VFPv1", "VFPv2", "VFPv3", "VFPv3-D16", "VFPv4", "VFPv4-D16",
    "FP for ARMv8", "FPv5/FP-D16 for ARMv8"};
 static const char * arm_attr_tag_WMMX_arch[] = {"No", "WMMXv1", "WMMXv2"};
 static const char * arm_attr_tag_Advanced_SIMD_arch[] =
 static const char * arm_attr_tag_FP_arch[] =
   {"No", "VFPv1", "VFPv2", "VFPv3", "VFPv3-D16", "VFPv4", "VFPv4-D16",
    "FP for ARMv8", "FPv5/FP-D16 for ARMv8"};
 static const char * arm_attr_tag_WMMX_arch[] = {"No", "WMMXv1", "WMMXv2"};
 static const char * arm_attr_tag_Advanced_SIMD_arch[] =

-  {"No", "NEONv1", "NEONv1 with Fused-MAC", "NEON for ARMv8"};
+  {"No", "NEONv1", "NEONv1 with Fused-MAC", "NEON for ARMv8",
+   "NEON for ARMv8.1"};

 static const char * arm_attr_tag_PCS_config[] =
   {"None", "Bare platform", "Linux application", "Linux DSO", "PalmOS 2004",
    "PalmOS (reserved)", "SymbianOS 2004", "SymbianOS (reserved)"};
 static const char * arm_attr_tag_PCS_config[] =
   {"None", "Bare platform", "Linux application", "Linux DSO", "PalmOS 2004",
    "PalmOS (reserved)", "SymbianOS 2004", "SymbianOS (reserved)"};


@@ -11914,9 +13158,9 @@ static const char * arm_attr_tag_ABI_FP_number_model[] =
 static const char * arm_attr_tag_ABI_enum_size[] =
   {"Unused", "small", "int", "forced to int"};
 static const char * arm_attr_tag_ABI_HardFP_use[] =
 static const char * arm_attr_tag_ABI_enum_size[] =
   {"Unused", "small", "int", "forced to int"};
 static const char * arm_attr_tag_ABI_HardFP_use[] =

-  {"As Tag_FP_arch", "SP only", "DP only", "SP and DP"};
+  {"As Tag_FP_arch", "SP only", "Reserved", "Deprecated"};

 static const char * arm_attr_tag_ABI_VFP_args[] =
 static const char * arm_attr_tag_ABI_VFP_args[] =

-  {"AAPCS", "VFP registers", "custom"};
+  {"AAPCS", "VFP registers", "custom", "compatible"};

 static const char * arm_attr_tag_ABI_WMMX_args[] =
   {"AAPCS", "WMMX registers", "custom"};
 static const char * arm_attr_tag_ABI_optimization_goals[] =
 static const char * arm_attr_tag_ABI_WMMX_args[] =
   {"AAPCS", "WMMX registers", "custom"};
 static const char * arm_attr_tag_ABI_optimization_goals[] =


@@ -11930,6 +13174,8 @@ static const char * arm_attr_tag_FP_HP_extension[] =
   {"Not Allowed", "Allowed"};
 static const char * arm_attr_tag_ABI_FP_16bit_format[] =
   {"None", "IEEE 754", "Alternative Format"};
   {"Not Allowed", "Allowed"};
 static const char * arm_attr_tag_ABI_FP_16bit_format[] =
   {"None", "IEEE 754", "Alternative Format"};

+static const char * arm_attr_tag_DSP_extension[] =
+  {"Follow architecture", "Allowed"};

 static const char * arm_attr_tag_MPextension_use[] =
   {"Not Allowed", "Allowed"};
 static const char * arm_attr_tag_DIV_use[] =
 static const char * arm_attr_tag_MPextension_use[] =
   {"Not Allowed", "Allowed"};
 static const char * arm_attr_tag_DIV_use[] =


@@ -11980,6 +13226,7 @@ static arm_attr_public_tag arm_attr_public_tags[] =
   LOOKUP(38, ABI_FP_16bit_format),
   LOOKUP(42, MPextension_use),
   LOOKUP(44, DIV_use),
   LOOKUP(38, ABI_FP_16bit_format),
   LOOKUP(42, MPextension_use),
   LOOKUP(44, DIV_use),

+  LOOKUP(46, DSP_extension),

   {64, "nodefaults", 0, NULL},
   {65, "also_compatible_with", 0, NULL},
   LOOKUP(66, T2EE_use),
   {64, "nodefaults", 0, NULL},
   {65, "also_compatible_with", 0, NULL},
   LOOKUP(66, T2EE_use),


@@ -12119,7 +13366,8 @@ display_arm_attribute (unsigned char * p,
              break;
 
            default:
              break;
 
            default:

-             abort ();
+             printf (_("<unknown: %d>\n"), tag);
+             break;

            }
          return p;
 
            }
          return p;
 


@@ -12200,53 +13448,147 @@ display_power_gnu_attribute (unsigned char * p,
                             const unsigned char * const end)
 {
   unsigned int len;
                             const unsigned char * const end)
 {
   unsigned int len;

-  int val;
+  unsigned int val;

 
   if (tag == Tag_GNU_Power_ABI_FP)
     {
       val = read_uleb128 (p, &len, end);
       p += len;
       printf ("  Tag_GNU_Power_ABI_FP: ");
 
   if (tag == Tag_GNU_Power_ABI_FP)
     {
       val = read_uleb128 (p, &len, end);
       p += len;
       printf ("  Tag_GNU_Power_ABI_FP: ");

+      if (len == 0)
+       {
+         printf (_("<corrupt>\n"));
+         return p;
+       }
+
+      if (val > 15)
+       printf ("(%#x), ", val);
+
+      switch (val & 3)
+       {
+       case 0:
+         printf (_("unspecified hard/soft float, "));
+         break;
+       case 1:
+         printf (_("hard float, "));
+         break;
+       case 2:
+         printf (_("soft float, "));
+         break;
+       case 3:
+         printf (_("single-precision hard float, "));
+         break;
+       }
+
+      switch (val & 0xC)
+       {
+       case 0:
+         printf (_("unspecified long double\n"));
+         break;
+       case 4:
+         printf (_("128-bit IBM long double\n"));
+         break;
+       case 8:
+         printf (_("64-bit long double\n"));
+         break;
+       case 12:
+         printf (_("128-bit IEEE long double\n"));
+         break;
+       }
+      return p;
+    }
+
+  if (tag == Tag_GNU_Power_ABI_Vector)
+    {
+      val = read_uleb128 (p, &len, end);
+      p += len;
+      printf ("  Tag_GNU_Power_ABI_Vector: ");
+      if (len == 0)
+       {
+         printf (_("<corrupt>\n"));
+         return p;
+       }
+
+      if (val > 3)
+       printf ("(%#x), ", val);
+
+      switch (val & 3)
+       {
+       case 0:
+         printf (_("unspecified\n"));
+         break;
+       case 1:
+         printf (_("generic\n"));
+         break;
+       case 2:
+         printf ("AltiVec\n");
+         break;
+       case 3:
+         printf ("SPE\n");
+         break;
+       }
+      return p;
+    }
+
+  if (tag == Tag_GNU_Power_ABI_Struct_Return)
+    {
+      val = read_uleb128 (p, &len, end);
+      p += len;
+      printf ("  Tag_GNU_Power_ABI_Struct_Return: ");
+      if (len == 0)
+       {
+         printf (_("<corrupt>\n"));
+         return p;
+       }

 
 

-      switch (val)
+      if (val > 2)
+       printf ("(%#x), ", val);
+
+      switch (val & 3)

        {
        case 0:
        {
        case 0:

-         printf (_("Hard or soft float\n"));
+         printf (_("unspecified\n"));

          break;
        case 1:
          break;
        case 1:

-         printf (_("Hard float\n"));
+         printf ("r3/r4\n");

          break;
        case 2:
          break;
        case 2:

-         printf (_("Soft float\n"));
+         printf (_("memory\n"));

          break;
        case 3:
          break;
        case 3:

-         printf (_("Single-precision hard float\n"));
-         break;
-       default:
-         printf ("??? (%d)\n", val);
+         printf ("???\n");

          break;
        }
       return p;
          break;
        }
       return p;

-   }
+    }

 
 

-  if (tag == Tag_GNU_Power_ABI_Vector)
+  return display_tag_value (tag & 1, p, end);
+}
+
+static unsigned char *
+display_s390_gnu_attribute (unsigned char * p,
+                           int tag,
+                           const unsigned char * const end)
+{
+  unsigned int len;
+  int val;
+
+  if (tag == Tag_GNU_S390_ABI_Vector)

     {
       val = read_uleb128 (p, &len, end);
       p += len;
     {
       val = read_uleb128 (p, &len, end);
       p += len;

-      printf ("  Tag_GNU_Power_ABI_Vector: ");
+      printf ("  Tag_GNU_S390_ABI_Vector: ");
+

       switch (val)
        {
        case 0:
       switch (val)
        {
        case 0:

-         printf (_("Any\n"));
+         printf (_("any\n"));

          break;
        case 1:
          break;
        case 1:

-         printf (_("Generic\n"));
+         printf (_("software\n"));

          break;
        case 2:
          break;
        case 2:

-         printf ("AltiVec\n");
-         break;
-       case 3:
-         printf ("SPE\n");
+         printf (_("hardware\n"));

          break;
        default:
          printf ("??? (%d)\n", val);
          break;
        default:
          printf ("??? (%d)\n", val);


@@ -12255,35 +13597,6 @@ display_power_gnu_attribute (unsigned char * p,
       return p;
    }
 
       return p;
    }
 

-  if (tag == Tag_GNU_Power_ABI_Struct_Return)
-    {
-      if (p == end)
-       {
-         warn (_("corrupt Tag_GNU_Power_ABI_Struct_Return\n"));
-         return p;
-       }
-
-      val = read_uleb128 (p, &len, end);
-      p += len;
-      printf ("  Tag_GNU_Power_ABI_Struct_Return: ");
-      switch (val)
-       {
-       case 0:
-         printf (_("Any\n"));
-         break;
-       case 1:
-         printf ("r3/r4\n");
-         break;
-       case 2:
-         printf (_("Memory\n"));
-         break;
-       default:
-         printf ("??? (%d)\n", val);
-         break;
-       }
-      return p;
-    }
-

   return display_tag_value (tag & 1, p, end);
 }
 
   return display_tag_value (tag & 1, p, end);
 }
 


@@ -12424,6 +13737,9 @@ print_mips_fp_abi_value (int val)
     case Val_GNU_MIPS_ABI_FP_64A:
       printf (_("Hard float compat (32-bit CPU, 64-bit FPU)\n"));
       break;
     case Val_GNU_MIPS_ABI_FP_64A:
       printf (_("Hard float compat (32-bit CPU, 64-bit FPU)\n"));
       break;

+    case Val_GNU_MIPS_ABI_FP_NAN2008:
+      printf (_("NaN 2008 compatibility\n"));
+      break;

     default:
       printf ("??? (%d)\n", val);
       break;
     default:
       printf ("??? (%d)\n", val);
       break;


@@ -12991,6 +14307,7 @@ process_attributes (FILE * file,
                      goto do_numlist;
                    case 3:
                      printf (_("Symbol Attributes:"));
                      goto do_numlist;
                    case 3:
                      printf (_("Symbol Attributes:"));

+                     /* Fall through.  */

                    do_numlist:
                      for (;;)
                        {
                    do_numlist:
                      for (;;)
                        {


@@ -13057,6 +14374,13 @@ process_power_specific (FILE * file)
                             display_power_gnu_attribute);
 }
 
                             display_power_gnu_attribute);
 }
 

+static int
+process_s390_specific (FILE * file)
+{
+  return process_attributes (file, NULL, SHT_GNU_ATTRIBUTES, NULL,
+                            display_s390_gnu_attribute);
+}
+

 static int
 process_sparc_specific (FILE * file)
 {
 static int
 process_sparc_specific (FILE * file)
 {


@@ -13080,10 +14404,12 @@ process_msp430x_specific (FILE * file)
 
 /* DATA points to the contents of a MIPS GOT that starts at VMA PLTGOT.
    Print the Address, Access and Initial fields of an entry at VMA ADDR
 
 /* DATA points to the contents of a MIPS GOT that starts at VMA PLTGOT.
    Print the Address, Access and Initial fields of an entry at VMA ADDR

-   and return the VMA of the next entry.  */
+   and return the VMA of the next entry, or -1 if there was a problem.
+   Does not read from DATA_END or beyond.  */

 
 static bfd_vma
 
 static bfd_vma

-print_mips_got_entry (unsigned char * data, bfd_vma pltgot, bfd_vma addr)
+print_mips_got_entry (unsigned char * data, bfd_vma pltgot, bfd_vma addr,
+                     unsigned char * data_end)

 {
   printf ("  ");
   print_vma (addr, LONG_HEX);
 {
   printf ("  ");
   print_vma (addr, LONG_HEX);


@@ -13098,9 +14424,19 @@ print_mips_got_entry (unsigned char * data, bfd_vma pltgot, bfd_vma addr)
   else
     {
       bfd_vma entry;
   else
     {
       bfd_vma entry;

+      unsigned char * from = data + addr - pltgot;

 
 

-      entry = byte_get (data + addr - pltgot, is_32bit_elf ? 4 : 8);
-      print_vma (entry, LONG_HEX);
+      if (from + (is_32bit_elf ? 4 : 8) > data_end)
+       {
+         warn (_("MIPS GOT entry extends beyond the end of available data\n"));
+         printf ("%*s", is_32bit_elf ? 8 : 16, _("<corrupt>"));
+         return (bfd_vma) -1;
+       }
+      else
+       {
+         entry = byte_get (data + addr - pltgot, is_32bit_elf ? 4 : 8);
+         print_vma (entry, LONG_HEX);
+       }

     }
   return addr + (is_32bit_elf ? 4 : 8);
 }
     }
   return addr + (is_32bit_elf ? 4 : 8);
 }


@@ -13134,6 +14470,8 @@ print_mips_ases (unsigned int mask)
     fputs ("\n\tDSP ASE", stdout);
   if (mask & AFL_ASE_DSPR2)
     fputs ("\n\tDSP R2 ASE", stdout);
     fputs ("\n\tDSP ASE", stdout);
   if (mask & AFL_ASE_DSPR2)
     fputs ("\n\tDSP R2 ASE", stdout);

+  if (mask & AFL_ASE_DSPR3)
+    fputs ("\n\tDSP R3 ASE", stdout);

   if (mask & AFL_ASE_EVA)
     fputs ("\n\tEnhanced VA Scheme", stdout);
   if (mask & AFL_ASE_MCU)
   if (mask & AFL_ASE_EVA)
     fputs ("\n\tEnhanced VA Scheme", stdout);
   if (mask & AFL_ASE_MCU)


@@ -13393,7 +14731,7 @@ process_mips_specific (FILE * file)
            {
              Elf32_Lib liblist;
              time_t atime;
            {
              Elf32_Lib liblist;
              time_t atime;

-             char timebuf[20];
+             char timebuf[128];

              struct tm * tmp;
 
              liblist.l_name = BYTE_GET (elib[cnt].l_name);
              struct tm * tmp;
 
              liblist.l_name = BYTE_GET (elib[cnt].l_name);


@@ -13465,7 +14803,7 @@ process_mips_specific (FILE * file)
 
       /* Find the section header so that we get the size.  */
       sect = find_section_by_type (SHT_MIPS_OPTIONS);
 
       /* Find the section header so that we get the size.  */
       sect = find_section_by_type (SHT_MIPS_OPTIONS);

-      /* PR 17533 file: 012-277276-0.004.  */ 
+      /* PR 17533 file: 012-277276-0.004.  */

       if (sect == NULL)
        {
          error (_("No MIPS_OPTIONS header found\n"));
       if (sect == NULL)
        {
          error (_("No MIPS_OPTIONS header found\n"));


@@ -13480,14 +14818,14 @@ process_mips_specific (FILE * file)
               cmalloc ((sect->sh_size / sizeof (eopt)), sizeof (* iopt));
          if (iopt == NULL)
            {
               cmalloc ((sect->sh_size / sizeof (eopt)), sizeof (* iopt));
          if (iopt == NULL)
            {

-             error (_("Out of memory allocatinf space for MIPS options\n"));
+             error (_("Out of memory allocating space for MIPS options\n"));

              return 0;
            }
 
          offset = cnt = 0;
          option = iopt;
 
              return 0;
            }
 
          offset = cnt = 0;
          option = iopt;
 

-         while (offset < sect->sh_size)
+         while (offset <= sect->sh_size - sizeof (* eopt))

            {
              Elf_External_Options * eoption;
 
            {
              Elf_External_Options * eoption;
 


@@ -13498,6 +14836,13 @@ process_mips_specific (FILE * file)
              option->section = BYTE_GET (eoption->section);
              option->info = BYTE_GET (eoption->info);
 
              option->section = BYTE_GET (eoption->section);
              option->info = BYTE_GET (eoption->info);
 

+             /* PR 17531: file: ffa0fa3b.  */
+             if (option->size < sizeof (* eopt)
+                 || offset + option->size > sect->sh_size)
+               {
+                 error (_("Invalid size (%u) for MIPS option\n"), option->size);
+                 return 0;
+               }

              offset += option->size;
 
              ++option;
              offset += option->size;
 
              ++option;


@@ -13508,6 +14853,7 @@ process_mips_specific (FILE * file)
                  printable_section_name (sect), cnt);
 
          option = iopt;
                  printable_section_name (sect), cnt);
 
          option = iopt;

+         offset = 0;

 
          while (cnt-- > 0)
            {
 
          while (cnt-- > 0)
            {


@@ -13644,13 +14990,18 @@ process_mips_specific (FILE * file)
 
              len = sizeof (* eopt);
              while (len < option->size)
 
              len = sizeof (* eopt);
              while (len < option->size)

-               if (((char *) option)[len] >= ' '
-                   && ((char *) option)[len] < 0x7f)
-                 printf ("%c", ((char *) option)[len++]);
-               else
-                 printf ("\\%03o", ((char *) option)[len++]);
+               {
+                 unsigned char datum = * ((unsigned char *) eopt + offset + len);

 
 

+                 if (ISPRINT (datum))
+                   printf ("%c", datum);
+                 else
+                   printf ("\\%03o", datum);
+                 len ++;
+               }

              fputs ("\n", stdout);
              fputs ("\n", stdout);

+
+             offset += option->size;

              ++option;
            }
 
              ++option;
            }
 


@@ -13740,6 +15091,7 @@ process_mips_specific (FILE * file)
       bfd_vma ent, local_end, global_end;
       size_t i, offset;
       unsigned char * data;
       bfd_vma ent, local_end, global_end;
       size_t i, offset;
       unsigned char * data;

+      unsigned char * data_end;

       int addr_size;
 
       ent = pltgot;
       int addr_size;
 
       ent = pltgot;


@@ -13750,18 +15102,25 @@ process_mips_specific (FILE * file)
       if (symtabno < gotsym)
        {
          error (_("The GOT symbol offset (%lu) is greater than the symbol table size (%lu)\n"),
       if (symtabno < gotsym)
        {
          error (_("The GOT symbol offset (%lu) is greater than the symbol table size (%lu)\n"),

-                (long) gotsym, (long) symtabno);
+                (unsigned long) gotsym, (unsigned long) symtabno);

          return 0;
        }
          return 0;
        }

- 
+

       global_end = local_end + (symtabno - gotsym) * addr_size;
       global_end = local_end + (symtabno - gotsym) * addr_size;

-      assert (global_end >= local_end);
+      /* PR 17531: file: 54c91a34.  */
+      if (global_end < local_end)
+       {
+         error (_("Too many GOT symbols: %lu\n"), (unsigned long) symtabno);
+         return 0;
+       }
+

       offset = offset_from_vma (file, pltgot, global_end - pltgot);
       data = (unsigned char *) get_data (NULL, file, offset,
                                          global_end - pltgot, 1,
                                         _("Global Offset Table data"));
       if (data == NULL)
        return 0;
       offset = offset_from_vma (file, pltgot, global_end - pltgot);
       data = (unsigned char *) get_data (NULL, file, offset,
                                          global_end - pltgot, 1,
                                         _("Global Offset Table data"));
       if (data == NULL)
        return 0;

+      data_end = data + (global_end - pltgot);

 
       printf (_("\nPrimary GOT:\n"));
       printf (_(" Canonical gp value: "));
 
       printf (_("\nPrimary GOT:\n"));
       printf (_(" Canonical gp value: "));


@@ -13772,14 +15131,18 @@ process_mips_specific (FILE * file)
       printf (_("  %*s %10s %*s Purpose\n"),
              addr_size * 2, _("Address"), _("Access"),
              addr_size * 2, _("Initial"));
       printf (_("  %*s %10s %*s Purpose\n"),
              addr_size * 2, _("Address"), _("Access"),
              addr_size * 2, _("Initial"));

-      ent = print_mips_got_entry (data, pltgot, ent);
+      ent = print_mips_got_entry (data, pltgot, ent, data_end);

       printf (_(" Lazy resolver\n"));
       printf (_(" Lazy resolver\n"));

+      if (ent == (bfd_vma) -1)
+       goto got_print_fail;

       if (data
          && (byte_get (data + ent - pltgot, addr_size)
              >> (addr_size * 8 - 1)) != 0)
        {
       if (data
          && (byte_get (data + ent - pltgot, addr_size)
              >> (addr_size * 8 - 1)) != 0)
        {

-         ent = print_mips_got_entry (data, pltgot, ent);
+         ent = print_mips_got_entry (data, pltgot, ent, data_end);

          printf (_(" Module pointer (GNU extension)\n"));
          printf (_(" Module pointer (GNU extension)\n"));

+         if (ent == (bfd_vma) -1)
+           goto got_print_fail;

        }
       printf ("\n");
 
        }
       printf ("\n");
 


@@ -13791,8 +15154,10 @@ process_mips_specific (FILE * file)
                  addr_size * 2, _("Initial"));
          while (ent < local_end)
            {
                  addr_size * 2, _("Initial"));
          while (ent < local_end)
            {

-             ent = print_mips_got_entry (data, pltgot, ent);
+             ent = print_mips_got_entry (data, pltgot, ent, data_end);

              printf ("\n");
              printf ("\n");

+             if (ent == (bfd_vma) -1)
+               goto got_print_fail;

            }
          printf ("\n");
        }
            }
          printf ("\n");
        }


@@ -13815,7 +15180,7 @@ process_mips_specific (FILE * file)
 
          for (i = gotsym; i < symtabno; i++)
            {
 
          for (i = gotsym; i < symtabno; i++)
            {

-             ent = print_mips_got_entry (data, pltgot, ent);
+             ent = print_mips_got_entry (data, pltgot, ent, data_end);

              printf (" ");
 
              if (dynamic_symbols == NULL)
              printf (" ");
 
              if (dynamic_symbols == NULL)


@@ -13839,10 +15204,13 @@ process_mips_specific (FILE * file)
                        (unsigned long) i);
 
              printf ("\n");
                        (unsigned long) i);
 
              printf ("\n");

+             if (ent == (bfd_vma) -1)
+               break;

            }
          printf ("\n");
        }
 
            }
          printf ("\n");
        }
 

+    got_print_fail:

       if (data)
        free (data);
     }
       if (data)
        free (data);
     }


@@ -14017,7 +15385,7 @@ process_gnu_liblist (FILE * file)
            {
              Elf32_Lib liblist;
              time_t atime;
            {
              Elf32_Lib liblist;
              time_t atime;

-             char timebuf[20];
+             char timebuf[128];

              struct tm * tmp;
 
              liblist.l_name = BYTE_GET (elib[cnt].l_name);
              struct tm * tmp;
 
              liblist.l_name = BYTE_GET (elib[cnt].l_name);


@@ -14099,6 +15467,10 @@ get_note_type (unsigned e_type)
        return _("NT_S390_SYSTEM_CALL (s390 system call restart data)");
       case NT_S390_TDB:
        return _("NT_S390_TDB (s390 transaction diagnostic block)");
        return _("NT_S390_SYSTEM_CALL (s390 system call restart data)");
       case NT_S390_TDB:
        return _("NT_S390_TDB (s390 transaction diagnostic block)");

+      case NT_S390_VXRS_LOW:
+       return _("NT_S390_VXRS_LOW (s390 vector registers 0-15 upper half)");
+      case NT_S390_VXRS_HIGH:
+       return _("NT_S390_VXRS_HIGH (s390 vector registers 16-31)");

       case NT_ARM_VFP:
        return _("NT_ARM_VFP (arm VFP registers)");
       case NT_ARM_TLS:
       case NT_ARM_VFP:
        return _("NT_ARM_VFP (arm VFP registers)");
       case NT_ARM_TLS:


@@ -14196,7 +15568,7 @@ print_core_note (Elf_Internal_Note *pnote)
          (int) (4 + 2 * addr_size), _("End"),
          (int) (4 + 2 * addr_size), _("Page Offset"));
   filenames = descdata + count * 3 * addr_size;
          (int) (4 + 2 * addr_size), _("End"),
          (int) (4 + 2 * addr_size), _("Page Offset"));
   filenames = descdata + count * 3 * addr_size;

-  while (--count > 0)
+  while (count-- > 0)

     {
       bfd_vma start, end, file_ofs;
 
     {
       bfd_vma start, end, file_ofs;
 


@@ -14230,8 +15602,7 @@ print_core_note (Elf_Internal_Note *pnote)
 static const char *
 get_gnu_elf_note_type (unsigned e_type)
 {
 static const char *
 get_gnu_elf_note_type (unsigned e_type)
 {

-  static char buff[64];
-
+  /* NB/ Keep this switch statement in sync with print_gnu_note ().  */

   switch (e_type)
     {
     case NT_GNU_ABI_TAG:
   switch (e_type)
     {
     case NT_GNU_ABI_TAG:


@@ -14243,16 +15614,19 @@ get_gnu_elf_note_type (unsigned e_type)
     case NT_GNU_GOLD_VERSION:
       return _("NT_GNU_GOLD_VERSION (gold version)");
     default:
     case NT_GNU_GOLD_VERSION:
       return _("NT_GNU_GOLD_VERSION (gold version)");
     default:

-      break;
-    }
+      {
+       static char buff[64];

 
 

-  snprintf (buff, sizeof (buff), _("Unknown note type: (0x%08x)"), e_type);
-  return buff;
+       snprintf (buff, sizeof (buff), _("Unknown note type: (0x%08x)"), e_type);
+       return buff;
+      }
+    }

 }
 
 static int
 print_gnu_note (Elf_Internal_Note *pnote)
 {
 }
 
 static int
 print_gnu_note (Elf_Internal_Note *pnote)
 {

+  /* NB/ Keep this switch statement in sync with get_gnu_elf_note_type ().  */

   switch (pnote->type)
     {
     case NT_GNU_BUILD_ID:
   switch (pnote->type)
     {
     case NT_GNU_BUILD_ID:


@@ -14300,6 +15674,12 @@ print_gnu_note (Elf_Internal_Note *pnote)
          case GNU_ABI_TAG_NETBSD:
            osname = "NetBSD";
            break;
          case GNU_ABI_TAG_NETBSD:
            osname = "NetBSD";
            break;

+         case GNU_ABI_TAG_SYLLABLE:
+           osname = "Syllable";
+           break;
+         case GNU_ABI_TAG_NACL:
+           osname = "NaCl";
+           break;

          default:
            osname = "Unknown";
            break;
          default:
            osname = "Unknown";
            break;


@@ -14320,11 +15700,189 @@ print_gnu_note (Elf_Internal_Note *pnote)
        printf ("\n");
       }
       break;
        printf ("\n");
       }
       break;

+
+    case NT_GNU_HWCAP:
+      {
+       unsigned long num_entries, mask;
+
+       /* Hardware capabilities information.  Word 0 is the number of entries.
+          Word 1 is a bitmask of enabled entries.  The rest of the descriptor
+          is a series of entries, where each entry is a single byte followed
+          by a nul terminated string.  The byte gives the bit number to test
+          if enabled in the bitmask.  */
+       printf (_("      Hardware Capabilities: "));
+       if (pnote->descsz < 8)
+         {
+           printf (_("<corrupt GNU_HWCAP>\n"));
+           break;
+         }
+       num_entries = byte_get ((unsigned char *) pnote->descdata, 4);
+       mask = byte_get ((unsigned char *) pnote->descdata + 4, 4);
+       printf (_("num entries: %ld, enabled mask: %lx\n"), num_entries, mask);
+       /* FIXME: Add code to display the entries... */
+      }
+      break;
+
+    default:
+      /* Handle unrecognised types.  An error message should have already been
+        created by get_gnu_elf_note_type(), so all that we need to do is to
+        display the data.  */
+      {
+       unsigned long i;
+
+       printf (_("    Description data: "));
+       for (i = 0; i < pnote->descsz; ++i)
+         printf ("%02x ", pnote->descdata[i] & 0xff);
+       printf ("\n");
+      }
+      break;
+    }
+
+  return 1;
+}
+
+static const char *
+get_v850_elf_note_type (enum v850_notes n_type)
+{
+  static char buff[64];
+
+  switch (n_type)
+    {
+    case V850_NOTE_ALIGNMENT:  return _("Alignment of 8-byte objects");
+    case V850_NOTE_DATA_SIZE:  return _("Sizeof double and long double");
+    case V850_NOTE_FPU_INFO:   return _("Type of FPU support needed");
+    case V850_NOTE_SIMD_INFO:  return _("Use of SIMD instructions");
+    case V850_NOTE_CACHE_INFO: return _("Use of cache");
+    case V850_NOTE_MMU_INFO:   return _("Use of MMU");
+    default:
+      snprintf (buff, sizeof (buff), _("Unknown note type: (0x%08x)"), n_type);
+      return buff;
+    }
+}
+
+static int
+print_v850_note (Elf_Internal_Note * pnote)
+{
+  unsigned int val;
+
+  if (pnote->descsz != 4)
+    return 0;
+  val = byte_get ((unsigned char *) pnote->descdata, pnote->descsz);
+
+  if (val == 0)
+    {
+      printf (_("not set\n"));
+      return 1;
+    }
+
+  switch (pnote->type)
+    {
+    case V850_NOTE_ALIGNMENT:
+      switch (val)
+       {
+       case EF_RH850_DATA_ALIGN4: printf (_("4-byte\n")); return 1;
+       case EF_RH850_DATA_ALIGN8: printf (_("8-byte\n")); return 1;
+       }
+      break;
+
+    case V850_NOTE_DATA_SIZE:
+      switch (val)
+       {
+       case EF_RH850_DOUBLE32: printf (_("4-bytes\n")); return 1;
+       case EF_RH850_DOUBLE64: printf (_("8-bytes\n")); return 1;
+       }
+      break;
+
+    case V850_NOTE_FPU_INFO:
+      switch (val)
+       {
+       case EF_RH850_FPU20: printf (_("FPU-2.0\n")); return 1;
+       case EF_RH850_FPU30: printf (_("FPU-3.0\n")); return 1;
+       }
+      break;
+
+    case V850_NOTE_MMU_INFO:
+    case V850_NOTE_CACHE_INFO:
+    case V850_NOTE_SIMD_INFO:
+      if (val == EF_RH850_SIMD)
+       {
+         printf (_("yes\n"));
+         return 1;
+       }
+      break;
+
+    default:
+      /* An 'unknown note type' message will already have been displayed.  */
+      break;
+    }
+
+  printf (_("unknown value: %x\n"), val);
+  return 0;
+}
+
+static int
+process_netbsd_elf_note (Elf_Internal_Note * pnote)
+{
+  unsigned int version;
+
+  switch (pnote->type)
+    {
+    case NT_NETBSD_IDENT:
+      version = byte_get ((unsigned char *) pnote->descdata, sizeof (version));
+      if ((version / 10000) % 100)
+        printf ("  NetBSD\t\t0x%08lx\tIDENT %u (%u.%u%s%c)\n", pnote->descsz,
+               version, version / 100000000, (version / 1000000) % 100,
+               (version / 10000) % 100 > 26 ? "Z" : "",
+               'A' + (version / 10000) % 26);
+      else
+       printf ("  NetBSD\t\t0x%08lx\tIDENT %u (%u.%u.%u)\n", pnote->descsz,
+               version, version / 100000000, (version / 1000000) % 100,
+               (version / 100) % 100);
+      return 1;
+
+    case NT_NETBSD_MARCH:
+      printf ("  NetBSD\t0x%08lx\tMARCH <%s>\n", pnote->descsz,
+             pnote->descdata);
+      return 1;
+
+    default:
+      break;

     }
 
     }
 

+  printf ("  NetBSD\t0x%08lx\tUnknown note type: (0x%08lx)\n", pnote->descsz,
+         pnote->type);

   return 1;
 }
 
   return 1;
 }
 

+static const char *
+get_freebsd_elfcore_note_type (unsigned e_type)
+{
+  switch (e_type)
+    {
+    case NT_FREEBSD_THRMISC:
+      return _("NT_THRMISC (thrmisc structure)");
+    case NT_FREEBSD_PROCSTAT_PROC:
+      return _("NT_PROCSTAT_PROC (proc data)");
+    case NT_FREEBSD_PROCSTAT_FILES:
+      return _("NT_PROCSTAT_FILES (files data)");
+    case NT_FREEBSD_PROCSTAT_VMMAP:
+      return _("NT_PROCSTAT_VMMAP (vmmap data)");
+    case NT_FREEBSD_PROCSTAT_GROUPS:
+      return _("NT_PROCSTAT_GROUPS (groups data)");
+    case NT_FREEBSD_PROCSTAT_UMASK:
+      return _("NT_PROCSTAT_UMASK (umask data)");
+    case NT_FREEBSD_PROCSTAT_RLIMIT:
+      return _("NT_PROCSTAT_RLIMIT (rlimit data)");
+    case NT_FREEBSD_PROCSTAT_OSREL:
+      return _("NT_PROCSTAT_OSREL (osreldate data)");
+    case NT_FREEBSD_PROCSTAT_PSSTRINGS:
+      return _("NT_PROCSTAT_PSSTRINGS (ps_strings data)");
+    case NT_FREEBSD_PROCSTAT_AUXV:
+      return _("NT_PROCSTAT_AUXV (auxv data)");
+    }
+  return get_note_type (e_type);
+}
+

 static const char *
 get_netbsd_elfcore_note_type (unsigned e_type)
 {
 static const char *
 get_netbsd_elfcore_note_type (unsigned e_type)
 {


@@ -14507,7 +16065,7 @@ print_ia64_vms_note (Elf_Internal_Note * pnote)
     case NT_VMS_FPMODE:
       printf (_("   Floating Point mode: "));
       printf ("0x%016" BFD_VMA_FMT "x\n",
     case NT_VMS_FPMODE:
       printf (_("   Floating Point mode: "));
       printf ("0x%016" BFD_VMA_FMT "x\n",

-              (bfd_vma)byte_get ((unsigned char *)pnote->descdata, 8));
+              (bfd_vma) byte_get ((unsigned char *)pnote->descdata, 8));

       break;
     case NT_VMS_LINKTIME:
       printf (_("   Link time: "));
       break;
     case NT_VMS_LINKTIME:
       printf (_("   Link time: "));


@@ -14530,9 +16088,9 @@ print_ia64_vms_note (Elf_Internal_Note * pnote)
         ((bfd_int64_t) byte_get ((unsigned char *)pnote->descdata + 8, 8));
       printf (_("\n   Link flags  : "));
       printf ("0x%016" BFD_VMA_FMT "x\n",
         ((bfd_int64_t) byte_get ((unsigned char *)pnote->descdata + 8, 8));
       printf (_("\n   Link flags  : "));
       printf ("0x%016" BFD_VMA_FMT "x\n",

-              (bfd_vma)byte_get ((unsigned char *)pnote->descdata + 16, 8));
+              (bfd_vma) byte_get ((unsigned char *)pnote->descdata + 16, 8));

       printf (_("   Header flags: 0x%08x\n"),
       printf (_("   Header flags: 0x%08x\n"),

-              (unsigned)byte_get ((unsigned char *)pnote->descdata + 24, 4));
+              (unsigned) byte_get ((unsigned char *)pnote->descdata + 24, 4));

       printf (_("   Image id    : %s\n"), pnote->descdata + 32);
       break;
 #endif
       printf (_("   Image id    : %s\n"), pnote->descdata + 32);
       break;
 #endif


@@ -14560,7 +16118,9 @@ print_ia64_vms_note (Elf_Internal_Note * pnote)
 
    If the value of namesz is zero, there is no name present.  */
 static int
 
    If the value of namesz is zero, there is no name present.  */
 static int

-process_note (Elf_Internal_Note * pnote)
+process_note (Elf_Internal_Note * pnote,
+             FILE * file ATTRIBUTE_UNUSED,
+             Elf_Internal_Shdr * section ATTRIBUTE_UNUSED)

 {
   const char * name = pnote->namesz ? pnote->namedata : "(NONE)";
   const char * nt;
 {
   const char * name = pnote->namesz ? pnote->namedata : "(NONE)";
   const char * nt;


@@ -14574,10 +16134,18 @@ process_note (Elf_Internal_Note * pnote)
     /* GNU-specific object file notes.  */
     nt = get_gnu_elf_note_type (pnote->type);
 
     /* GNU-specific object file notes.  */
     nt = get_gnu_elf_note_type (pnote->type);
 

+  else if (const_strneq (pnote->namedata, "FreeBSD"))
+    /* FreeBSD-specific core file notes.  */
+    nt = get_freebsd_elfcore_note_type (pnote->type);
+

   else if (const_strneq (pnote->namedata, "NetBSD-CORE"))
     /* NetBSD-specific core file notes.  */
     nt = get_netbsd_elfcore_note_type (pnote->type);
 
   else if (const_strneq (pnote->namedata, "NetBSD-CORE"))
     /* NetBSD-specific core file notes.  */
     nt = get_netbsd_elfcore_note_type (pnote->type);
 

+  else if (const_strneq (pnote->namedata, "NetBSD"))
+    /* NetBSD-specific core file notes.  */
+    return process_netbsd_elf_note (pnote);
+

   else if (strneq (pnote->namedata, "SPU/", 4))
     {
       /* SPU-specific core file notes.  */
   else if (strneq (pnote->namedata, "SPU/", 4))
     {
       /* SPU-specific core file notes.  */


@@ -14597,7 +16165,9 @@ process_note (Elf_Internal_Note * pnote)
        note type strings.  */
     nt = get_note_type (pnote->type);
 
        note type strings.  */
     nt = get_note_type (pnote->type);
 

-  printf ("  %-20s 0x%08lx\t%s\n", name, pnote->descsz, nt);
+  printf ("  ");
+  print_symbol (-20, name);
+  printf (" 0x%08lx\t%s\n", pnote->descsz, nt);

 
   if (const_strneq (pnote->namedata, "IPF/VMS"))
     return print_ia64_vms_note (pnote);
 
   if (const_strneq (pnote->namedata, "IPF/VMS"))
     return print_ia64_vms_note (pnote);


@@ -14607,39 +16177,64 @@ process_note (Elf_Internal_Note * pnote)
     return print_stapsdt_note (pnote);
   else if (const_strneq (pnote->namedata, "CORE"))
     return print_core_note (pnote);
     return print_stapsdt_note (pnote);
   else if (const_strneq (pnote->namedata, "CORE"))
     return print_core_note (pnote);

-  else
-    return 1;
-}

 
 

+  else if (pnote->descsz)
+    {
+      unsigned long i;
+
+      printf (_("   description data: "));
+      for (i = 0; i < pnote->descsz; i++)
+       printf ("%02x ", pnote->descdata[i]);
+      printf ("\n");
+    }
+
+  return 1;
+}

 
 static int
 
 static int

-process_corefile_note_segment (FILE * file, bfd_vma offset, bfd_vma length)
+process_notes_at (FILE *              file,
+                 Elf_Internal_Shdr * section,
+                 bfd_vma             offset,
+                 bfd_vma             length)

 {
   Elf_External_Note * pnotes;
   Elf_External_Note * external;
 {
   Elf_External_Note * pnotes;
   Elf_External_Note * external;

+  char * end;

   int res = 1;
 
   if (length <= 0)
     return 0;
 
   int res = 1;
 
   if (length <= 0)
     return 0;
 

-  pnotes = (Elf_External_Note *) get_data (NULL, file, offset, 1, length,
-                                          _("notes"));
+  if (section)
+    {
+      pnotes = (Elf_External_Note *) get_section_contents (section, file);
+      if (pnotes)
+       apply_relocations (file, section, (unsigned char *) pnotes, length, NULL, NULL);
+    }
+  else
+    pnotes = (Elf_External_Note *) get_data (NULL, file, offset, 1, length,
+                                            _("notes"));

   if (pnotes == NULL)
     return 0;
 
   external = pnotes;
 
   if (pnotes == NULL)
     return 0;
 
   external = pnotes;
 

-  printf (_("\nDisplaying notes found at file offset 0x%08lx with length 0x%08lx:\n"),
-         (unsigned long) offset, (unsigned long) length);
+  if (section)
+    printf (_("\nDisplaying notes found in: %s\n"), printable_section_name (section));
+  else
+    printf (_("\nDisplaying notes found at file offset 0x%08lx with length 0x%08lx:\n"),
+           (unsigned long) offset, (unsigned long) length);
+

   printf (_("  %-20s %10s\tDescription\n"), _("Owner"), _("Data size"));
 
   printf (_("  %-20s %10s\tDescription\n"), _("Owner"), _("Data size"));
 

-  while ((char *) external < (char *) pnotes + length)
+  end = (char *) pnotes + length;
+  while ((char *) external < end)

     {
       Elf_Internal_Note inote;
       size_t min_notesz;
       char *next;
       char * temp = NULL;
     {
       Elf_Internal_Note inote;
       size_t min_notesz;
       char *next;
       char * temp = NULL;

-      size_t data_remaining = ((char *) pnotes + length) - (char *) external;
+      size_t data_remaining = end - (char *) external;

 
       if (!is_ia64_vms ())
        {
 
       if (!is_ia64_vms ())
        {


@@ -14657,6 +16252,14 @@ process_corefile_note_segment (FILE * file, bfd_vma offset, bfd_vma length)
          inote.namedata = external->name;
          inote.descsz   = BYTE_GET (external->descsz);
          inote.descdata = inote.namedata + align_power (inote.namesz, 2);
          inote.namedata = external->name;
          inote.descsz   = BYTE_GET (external->descsz);
          inote.descdata = inote.namedata + align_power (inote.namesz, 2);

+         /* PR 17531: file: 3443835e.  */
+         if (inote.descdata < (char *) pnotes || inote.descdata > end)
+           {
+             warn (_("Corrupt note: name size is too big: %lx\n"), inote.namesz);
+             inote.descdata = inote.namedata;
+             inote.namesz   = 0;
+           }
+

          inote.descpos  = offset + (inote.descdata - (char *) pnotes);
          next = inote.descdata + align_power (inote.descsz, 2);
        }
          inote.descpos  = offset + (inote.descdata - (char *) pnotes);
          next = inote.descdata + align_power (inote.descsz, 2);
        }


@@ -14686,6 +16289,9 @@ process_corefile_note_segment (FILE * file, bfd_vma offset, bfd_vma length)
 
       if (inote.descdata < (char *) external + min_notesz
          || next < (char *) external + min_notesz
 
       if (inote.descdata < (char *) external + min_notesz
          || next < (char *) external + min_notesz

+         /* PR binutils/17531: file: id:000000,sig:11,src:006986,op:havoc,rep:4.  */
+         || inote.namedata + inote.namesz < inote.namedata
+         || inote.descdata + inote.descsz < inote.descdata

          || data_remaining < (size_t)(next - (char *) external))
        {
          warn (_("note with invalid namesz and/or descsz found at offset 0x%lx\n"),
          || data_remaining < (size_t)(next - (char *) external))
        {
          warn (_("note with invalid namesz and/or descsz found at offset 0x%lx\n"),


@@ -14704,7 +16310,6 @@ process_corefile_note_segment (FILE * file, bfd_vma offset, bfd_vma length)
       if (inote.namedata[inote.namesz - 1] != '\0')
        {
          temp = (char *) malloc (inote.namesz + 1);
       if (inote.namedata[inote.namesz - 1] != '\0')
        {
          temp = (char *) malloc (inote.namesz + 1);

-

          if (temp == NULL)
            {
              error (_("Out of memory allocating space for inote name\n"));
          if (temp == NULL)
            {
              error (_("Out of memory allocating space for inote name\n"));


@@ -14719,7 +16324,7 @@ process_corefile_note_segment (FILE * file, bfd_vma offset, bfd_vma length)
          inote.namedata = temp;
        }
 
          inote.namedata = temp;
        }
 

-      res &= process_note (& inote);
+      res &= process_note (& inote, file, section);

 
       if (temp != NULL)
        {
 
       if (temp != NULL)
        {


@@ -14748,11 +16353,92 @@ process_corefile_note_segments (FILE * file)
        i++, segment++)
     {
       if (segment->p_type == PT_NOTE)
        i++, segment++)
     {
       if (segment->p_type == PT_NOTE)

-       res &= process_corefile_note_segment (file,
-                                             (bfd_vma) segment->p_offset,
-                                             (bfd_vma) segment->p_filesz);
+       res &= process_notes_at (file, NULL,
+                                (bfd_vma) segment->p_offset,
+                                (bfd_vma) segment->p_filesz);
+    }
+
+  return res;
+}
+
+static int
+process_v850_notes (FILE * file, bfd_vma offset, bfd_vma length)
+{
+  Elf_External_Note * pnotes;
+  Elf_External_Note * external;
+  char * end;
+  int res = 1;
+
+  if (length <= 0)
+    return 0;
+
+  pnotes = (Elf_External_Note *) get_data (NULL, file, offset, 1, length,
+                                           _("v850 notes"));
+  if (pnotes == NULL)
+    return 0;
+
+  external = pnotes;
+  end = (char*) pnotes + length;
+
+  printf (_("\nDisplaying contents of Renesas V850 notes section at offset 0x%lx with length 0x%lx:\n"),
+         (unsigned long) offset, (unsigned long) length);
+
+  while ((char *) external + sizeof (Elf_External_Note) < end)
+    {
+      Elf_External_Note * next;
+      Elf_Internal_Note inote;
+
+      inote.type     = BYTE_GET (external->type);
+      inote.namesz   = BYTE_GET (external->namesz);
+      inote.namedata = external->name;
+      inote.descsz   = BYTE_GET (external->descsz);
+      inote.descdata = inote.namedata + align_power (inote.namesz, 2);
+      inote.descpos  = offset + (inote.descdata - (char *) pnotes);
+
+      if (inote.descdata < (char *) pnotes || inote.descdata >= end)
+       {
+         warn (_("Corrupt note: name size is too big: %lx\n"), inote.namesz);
+         inote.descdata = inote.namedata;
+         inote.namesz   = 0;
+       }
+
+      next = (Elf_External_Note *) (inote.descdata + align_power (inote.descsz, 2));
+
+      if (   ((char *) next > end)
+         || ((char *) next <  (char *) pnotes))
+       {
+         warn (_("corrupt descsz found in note at offset 0x%lx\n"),
+               (unsigned long) ((char *) external - (char *) pnotes));
+         warn (_(" type: 0x%lx, namesize: 0x%lx, descsize: 0x%lx\n"),
+               inote.type, inote.namesz, inote.descsz);
+         break;
+       }
+
+      external = next;
+
+      /* Prevent out-of-bounds indexing.  */
+      if (   inote.namedata + inote.namesz > end
+         || inote.namedata + inote.namesz < inote.namedata)
+        {
+          warn (_("corrupt namesz found in note at offset 0x%lx\n"),
+                (unsigned long) ((char *) external - (char *) pnotes));
+          warn (_(" type: 0x%lx, namesize: 0x%lx, descsize: 0x%lx\n"),
+                inote.type, inote.namesz, inote.descsz);
+          break;
+        }
+
+      printf ("  %s: ", get_v850_elf_note_type (inote.type));
+
+      if (! print_v850_note (& inote))
+       {
+         res = 0;
+         printf ("<corrupt sizes: namesz: %lx, descsz: %lx>\n",
+                 inote.namesz, inote.descsz);
+       }

     }
 
     }
 

+  free (pnotes);
+

   return res;
 }
 
   return res;
 }
 


@@ -14767,13 +16453,26 @@ process_note_sections (FILE * file)
   for (i = 0, section = section_headers;
        i < elf_header.e_shnum && section != NULL;
        i++, section++)
   for (i = 0, section = section_headers;
        i < elf_header.e_shnum && section != NULL;
        i++, section++)

-    if (section->sh_type == SHT_NOTE)
-      {
-       res &= process_corefile_note_segment (file,
-                                             (bfd_vma) section->sh_offset,
-                                             (bfd_vma) section->sh_size);
-       n++;
-      }
+    {
+      if (section->sh_type == SHT_NOTE)
+       {
+         res &= process_notes_at (file, section,
+                                  (bfd_vma) section->sh_offset,
+                                  (bfd_vma) section->sh_size);
+         n++;
+       }
+
+      if ((   elf_header.e_machine == EM_V800
+          || elf_header.e_machine == EM_V850
+          || elf_header.e_machine == EM_CYGNUS_V850)
+         && section->sh_type == SHT_RENESAS_INFO)
+       {
+         res &= process_v850_notes (file,
+                                    (bfd_vma) section->sh_offset,
+                                    (bfd_vma) section->sh_size);
+         n++;
+       }
+    }

 
   if (n == 0)
     /* Try processing NOTE segments instead.  */
 
   if (n == 0)
     /* Try processing NOTE segments instead.  */


@@ -14818,8 +16517,13 @@ process_arch_specific (FILE * file)
       return process_nds32_specific (file);
       break;
     case EM_PPC:
       return process_nds32_specific (file);
       break;
     case EM_PPC:

+    case EM_PPC64:

       return process_power_specific (file);
       break;
       return process_power_specific (file);
       break;

+    case EM_S390:
+    case EM_S390_OLD:
+      return process_s390_specific (file);
+      break;

     case EM_SPARC:
     case EM_SPARC32PLUS:
     case EM_SPARCV9:
     case EM_SPARC:
     case EM_SPARC32PLUS:
     case EM_SPARCV9:


@@ -14846,8 +16550,8 @@ get_file_header (FILE * file)
   /* Determine how to read the rest of the header.  */
   switch (elf_header.e_ident[EI_DATA])
     {
   /* Determine how to read the rest of the header.  */
   switch (elf_header.e_ident[EI_DATA])
     {

-    default: /* fall through */
-    case ELFDATANONE: /* fall through */
+    default:
+    case ELFDATANONE:

     case ELFDATA2LSB:
       byte_get = byte_get_little_endian;
       byte_put = byte_put_little_endian;
     case ELFDATA2LSB:
       byte_get = byte_get_little_endian;
       byte_put = byte_put_little_endian;


@@ -15129,11 +16833,11 @@ process_archive (char * file_name, FILE * file, bfd_boolean is_thin_archive)
        error (_("%s: unable to dump the index as none was found\n"), file_name);
       else
        {
        error (_("%s: unable to dump the index as none was found\n"), file_name);
       else
        {

-         unsigned int i, l;
+         unsigned long i, l;

          unsigned long current_pos;
 
          unsigned long current_pos;
 

-         printf (_("Index of archive %s: (%ld entries, 0x%lx bytes in the symbol table)\n"),
-                 file_name, (long) arch.index_num, arch.sym_size);
+         printf (_("Index of archive %s: (%lu entries, 0x%lx bytes in the symbol table)\n"),
+                 file_name, (unsigned long) arch.index_num, arch.sym_size);

          current_pos = ftell (file);
 
          for (i = l = 0; i < arch.index_num; i++)
          current_pos = ftell (file);
 
          for (i = l = 0; i < arch.index_num; i++)


@@ -15164,8 +16868,9 @@ process_archive (char * file_name, FILE * file, bfd_boolean is_thin_archive)
                         file_name);
                  break;
                }
                         file_name);
                  break;
                }

-             printf ("\t%s\n", arch.sym_table + l);
-             l += strlen (arch.sym_table + l) + 1;
+             /* PR 17531: file: 0b6630b2.  */
+             printf ("\t%.*s\n", (int) (arch.sym_size - l), arch.sym_table + l);
+             l += strnlen (arch.sym_table + l, arch.sym_size - l) + 1;

            }
 
          if (arch.uses_64bit_indicies)
            }
 
          if (arch.uses_64bit_indicies)


@@ -15442,6 +17147,11 @@ main (int argc, char ** argv)
 
   if (optind < (argc - 1))
     show_name = 1;
 
   if (optind < (argc - 1))
     show_name = 1;

+  else if (optind >= argc)
+    {
+      warn (_("Nothing to do.\n"));
+      usage (stderr);
+    }

 
   err = 0;
   while (optind < argc)
 
   err = 0;
   while (optind < argc)