From: Maciej W. Rozycki <macro@mips.com>
Date: Wed, 4 Apr 2018 01:00:49 +0000 (+0100)
Subject: PR binutils/22875: HPPA/ELF: Also fail with relocation placeholders
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8ee55178c22326c3624ad5872dc5382341ddcd2c;p=binutils-gdb.git

PR binutils/22875: HPPA/ELF: Also fail with relocation placeholders

Do not consider R_PARISC_UNIMPLEMENTED placeholder relocation entries of
the `elf_hppa_howto_table' table valid in `info_to_howto' HPPA handlers.
Instead issue an unsupported relocation type error and return a NULL
howto as with relocations whose number is R_PARISC_UNIMPLEMENTED or
beyond.

	bfd/
	* elf-hppa.h (elf_hppa_info_to_howto): Also return
	unsuccessfully for unimplemented relocations.
	(elf_hppa_info_to_howto_rel): Likewise.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index ea2a5abb96d..8921ab02b86 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2018-04-04  Maciej W. Rozycki  <macro@mips.com>
+
+	* elf-hppa.h (elf_hppa_info_to_howto): Also return
+	unsuccessfully for unimplemented relocations.
+	(elf_hppa_info_to_howto_rel): Likewise.
+
 2018-04-04  Maciej W. Rozycki  <macro@mips.com>
 
 	* elf32-i860.c (lookup_howto): Add `abfd' parameter.  Set the
diff --git a/bfd/elf-hppa.h b/bfd/elf-hppa.h
index 59c0c4fa63e..f23f7882fd6 100644
--- a/bfd/elf-hppa.h
+++ b/bfd/elf-hppa.h
@@ -1026,8 +1026,15 @@ elf_hppa_info_to_howto (bfd *abfd,
 			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;
 
-  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,
       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,8 +1054,15 @@ 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;
 
-  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"),
@@ -1056,8 +1070,7 @@ elf_hppa_info_to_howto_rel (bfd *abfd,
       bfd_set_error (bfd_error_bad_value);
       return FALSE;
     }
-
-  bfd_reloc->howto = &elf_hppa_howto_table[r_type];
+  bfd_reloc->howto = howto;
   return TRUE;
 }