x86: drop NoRex64 from {,v}pmov{s,z}x*

[deliverable/binutils-gdb.git] / bfd / elf-hppa.h

diff --git a/bfd/elf-hppa.h b/bfd/elf-hppa.h
index 75b4e2694497b4db13f4f7ce36f3fd0229da75ed..5eac12996d1b8b9049db3f0fe5a5800b475247c5 100644 (file)
--- a/bfd/elf-hppa.h
+++ b/bfd/elf-hppa.h
@@ -1021,13 +1021,20 @@ _bfd_elf_hppa_gen_reloc_type (bfd *abfd,
 /* Translate from an elf into field into a howto relocation pointer.  */
 
 static bfd_boolean
-elf_hppa_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED,
+elf_hppa_info_to_howto (bfd *abfd,
                        arelent *bfd_reloc,
                        Elf_Internal_Rela *elf_reloc)
 {
   unsigned int r_type = ELF32_R_TYPE (elf_reloc->r_info);
+  unsigned int type = r_type;
+  reloc_howto_type *howto = NULL;
 
-  if (r_type >= (unsigned int) R_PARISC_UNIMPLEMENTED)
+  if (r_type < (unsigned int) R_PARISC_UNIMPLEMENTED)
+    {
+      howto = &elf_hppa_howto_table[r_type];
+      type = howto->type;
+    }
+  if (type >= (unsigned int) R_PARISC_UNIMPLEMENTED)
     {
       /* xgettext:c-format */
       _bfd_error_handler (_("%pB: unsupported relocation type %#x"),
@@ -1035,7 +1042,7 @@ elf_hppa_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED,
       bfd_set_error (bfd_error_bad_value);
       return FALSE;
     }
-  bfd_reloc->howto = &elf_hppa_howto_table[r_type];
+  bfd_reloc->howto = howto;
   return TRUE;
 }
 
@@ -1047,16 +1054,23 @@ elf_hppa_info_to_howto_rel (bfd *abfd,
                            Elf_Internal_Rela *elf_reloc)
 {
   unsigned int r_type = ELF_R_TYPE (elf_reloc->r_info);
+  unsigned int type = r_type;
+  reloc_howto_type *howto = NULL;
 
-  if (r_type >= (unsigned int) R_PARISC_UNIMPLEMENTED)
+  if (r_type < (unsigned int) R_PARISC_UNIMPLEMENTED)
+    {
+      howto = &elf_hppa_howto_table[r_type];
+      type = howto->type;
+    }
+  if (type >= (unsigned int) R_PARISC_UNIMPLEMENTED)
     {
       /* xgettext:c-format */
-      _bfd_error_handler (_("%pB: invalid relocation type %d"), abfd, r_type);
+      _bfd_error_handler (_("%pB: unsupported relocation type %#x"),
+                         abfd, r_type);
       bfd_set_error (bfd_error_bad_value);
       return FALSE;
     }
-
-  bfd_reloc->howto = &elf_hppa_howto_table[r_type];
+  bfd_reloc->howto = howto;
   return TRUE;
 }