x86: correctly handle KMOVD with VEX.W set outside of 64-bit mode

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

diff --git a/binutils/readelf.c b/binutils/readelf.c
index 41f55ee4ede12a5926556c5d48ed065395ecc01a..39744009ab7c97b8ecaf483c1868b151a4e702ec 100644 (file)
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -6299,14 +6299,21 @@ process_section_headers (Filedata * filedata)
       /* Check the sh_link field.  */
       switch (section->sh_type)
        {
+       case SHT_REL:
+       case SHT_RELA:
+         if (section->sh_link == 0
+             && (filedata->file_header.e_type == ET_EXEC
+                 || filedata->file_header.e_type == ET_DYN))
+           /* A dynamic relocation section where all entries use a
+              zero symbol index need not specify a symtab section.  */
+           break;
+         /* Fall through.  */
        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
+         if (section->sh_link == 0
              || section->sh_link >= filedata->file_header.e_shnum
              || (filedata->section_headers[section->sh_link].sh_type != SHT_SYMTAB
                  && filedata->section_headers[section->sh_link].sh_type != SHT_DYNSYM))
@@ -6320,7 +6327,7 @@ process_section_headers (Filedata * filedata)
        case SHT_GNU_verneed:
        case SHT_GNU_verdef:
        case SHT_GNU_LIBLIST:
-         if (section->sh_link < 1
+         if (section->sh_link == 0
              || section->sh_link >= filedata->file_header.e_shnum
              || filedata->section_headers[section->sh_link].sh_type != SHT_STRTAB)
            warn (_("[%2u]: Link field (%u) should index a string section.\n"),
@@ -6353,7 +6360,13 @@ process_section_headers (Filedata * filedata)
        {
        case SHT_REL:
        case SHT_RELA:
-         if (section->sh_info < 1
+         if (section->sh_info == 0
+             && (filedata->file_header.e_type == ET_EXEC
+                 || filedata->file_header.e_type == ET_DYN))
+           /* Dynamic relocations apply to segments, so they do not
+              need to specify the section they relocate.  */
+           break;
+         if (section->sh_info == 0
              || section->sh_info >= filedata->file_header.e_shnum
              || (filedata->section_headers[section->sh_info].sh_type != SHT_PROGBITS
                  && filedata->section_headers[section->sh_info].sh_type != SHT_NOBITS
@@ -6363,21 +6376,8 @@ process_section_headers (Filedata * filedata)
                  && filedata->section_headers[section->sh_info].sh_type != SHT_PREINIT_ARRAY
                  /* FIXME: Are other section types valid ?  */
                  && filedata->section_headers[section->sh_info].sh_type < SHT_LOOS))
-           {
-             if (section->sh_info == 0
-                 && (filedata->file_header.e_type == ET_EXEC
-                     || filedata->file_header.e_type == ET_DYN
-                     /* These next two tests may be redundant, but
-                        they have been left in for paranoia's sake.  */
-                     || streq (SECTION_NAME (section), ".rel.dyn")
-                     || streq (SECTION_NAME (section), ".rela.dyn")))
-               /* Dynamic relocations apply to segments, not sections, so
-                  they do not need an sh_info value.  */
-               ;
-             else
-               warn (_("[%2u]: Info field (%u) should index a relocatable section.\n"),
-                     i, section->sh_info);
-           }
+           warn (_("[%2u]: Info field (%u) should index a relocatable section.\n"),
+                 i, section->sh_info);
          break;
 
        case SHT_DYNAMIC:
@@ -12386,7 +12386,8 @@ is_32bit_abs_reloc (Filedata * filedata, unsigned int reloc_type)
     case EM_68HC12:
       return reloc_type == 6; /* R_M68HC11_32.  */
     case EM_S12Z:
-      return reloc_type == 6; /* R_S12Z_EXT32.  */
+      return reloc_type == 7 || /* R_S12Z_EXT32 */
+       reloc_type == 6;        /* R_S12Z_CW32.  */
     case EM_MCORE:
       return reloc_type == 1; /* R_MCORE_ADDR32.  */
     case EM_CYGNUS_MEP:
@@ -15221,7 +15222,7 @@ display_raw_attribute (unsigned char * p, unsigned char const * const end)
   unsigned long addr = 0;
   size_t bytes = end - p;
 
-  assert (end > p);
+  assert (end >= p);
   while (bytes)
     {
       int j;