Use standardized error message for unrecognized relocs.

bfd	* aout-cris.c (swap_ext_reloc_out): Standadize error/warning
	message.
	* elf-hppa.h (elf_hppa_info_to_howto_rel): Likewise.
	* elf32-i386.c (elf_i386_reloc_type_lookup): Likewise.
	* elf32-xtensa.c (elf_xtensa_reloc_type_lookup): Likewise.
	* elf64-ppc.c (ppc64_elf_reloc_type_lookup): Likewise.
	* elf64-s390.c (elf_s390_reloc_type_lookup): Likewise.
	* elf64-sh64.c (sh_elf64_info_to_howto): Likewise.
	* elfxx-ia64.c (ia64_elf_reloc_type_lookup): Likewise.
	* elfxx-sparc.c (_bfd_sparc_elf_reloc_type_lookup): Likewise.
	* elfxx-tilegx.c (tilegx_reloc_type_lookup): Likewise.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 42dfaed13552e0dc05bbb177f83187c842d2ead1..5c2a888cd00723c9409461acca8762357937d566 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,17 @@
 2018-02-27  Nick Clifton  <nickc@redhat.com>
 
+       * aout-cris.c (swap_ext_reloc_out): Standadize error/warning
+       message.
+       * elf-hppa.h (elf_hppa_info_to_howto_rel): Likewise.
+       * elf32-i386.c (elf_i386_reloc_type_lookup): Likewise.
+       * elf32-xtensa.c (elf_xtensa_reloc_type_lookup): Likewise.
+       * elf64-ppc.c (ppc64_elf_reloc_type_lookup): Likewise.
+       * elf64-s390.c (elf_s390_reloc_type_lookup): Likewise.
+       * elf64-sh64.c (sh_elf64_info_to_howto): Likewise.
+       * elfxx-ia64.c (ia64_elf_reloc_type_lookup): Likewise.
+       * elfxx-sparc.c (_bfd_sparc_elf_reloc_type_lookup): Likewise.
+       * elfxx-tilegx.c (tilegx_reloc_type_lookup): Likewise.
+
        PR 22875
        * elf-bfd.h (struct elf_backend_data): Change the return type of
        the elf_info_to_howto and elf_info_to_howto_rel function pointers

diff --git a/bfd/aout-cris.c b/bfd/aout-cris.c
index 6a3480e0bd59b4bc5395d3ecaa3ea6609a25abca..2b150cd8b54d919bc888210356a6fb2e041bf7a7 100644 (file)
--- a/bfd/aout-cris.c
+++ b/bfd/aout-cris.c
@@ -197,7 +197,7 @@ MY (swap_ext_reloc_out) (bfd *abfd,
   if (r_type > 2)
     {
       /* xgettext:c-format */
-      _bfd_error_handler (_("%pB: invalid relocation type exported: %d"),
+      _bfd_error_handler (_("%pB: unsupported relocation type exported: %#x"),
                          abfd, r_type);
 
       bfd_set_error (bfd_error_wrong_format);
@@ -241,7 +241,7 @@ MY (swap_ext_reloc_in) (bfd *abfd,
   if (r_type > 2)
     {
       /* xgettext:c-format */
-      _bfd_error_handler (_("%pB: invalid relocation type imported: %d"),
+      _bfd_error_handler (_("%pB: unsupported relocation type imported: %#x"),
                          abfd, r_type);
 
       bfd_set_error (bfd_error_wrong_format);

diff --git a/bfd/elf-hppa.h b/bfd/elf-hppa.h
index 75b4e2694497b4db13f4f7ce36f3fd0229da75ed..95ac96c7345edb25537c26e9746cf0df313cf6a7 100644 (file)
--- a/bfd/elf-hppa.h
+++ b/bfd/elf-hppa.h
@@ -1051,7 +1051,7 @@ elf_hppa_info_to_howto_rel (bfd *abfd,
   if (r_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;
     }

diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
index 5163e2468f0d047ee5d926d63a41b4a91207ad4e..61a14097b060ef5f508980d2bc6242db3d2b2db4 100644 (file)
--- a/bfd/elf32-i386.c
+++ b/bfd/elf32-i386.c
@@ -348,7 +348,7 @@ elf_i386_reloc_type_lookup (bfd *abfd,
     default:
       TRACE ("Unknown");
       /* xgettext:c-format */
-      _bfd_error_handler (_("%pB: invalid Alpha reloc number: %d"),
+      _bfd_error_handler (_("%pB: unsupported relocation type: %#x"),
                          abfd, (int) code);
       bfd_set_error (bfd_error_bad_value);
       return NULL;

diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
index 02effe71adb805643e809f89b28934cab172c5cb..cd087968f71ae1a8224fd6ca9c8423f0fae241a1 100644 (file)
--- a/bfd/elf32-xtensa.c
+++ b/bfd/elf32-xtensa.c
@@ -451,7 +451,7 @@ elf_xtensa_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
     }
 
   /* xgettext:c-format */
-  _bfd_error_handler (_("%pB: invalid relocation type %d"), abfd, (int) code);
+  _bfd_error_handler (_("%pB: unsupported relocation type %#x"), abfd, (int) code);
   bfd_set_error (bfd_error_bad_value);
   TRACE ("Unknown");
   return NULL;

diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
index a79a6b637d0369c0205229f29564971aec93552f..44237bca6637452a012dad49adb444ca73bb86fe 100644 (file)
--- a/bfd/elf64-ppc.c
+++ b/bfd/elf64-ppc.c
@@ -2245,7 +2245,7 @@ ppc64_elf_reloc_type_lookup (bfd *abfd,
     {
     default:
       /* xgettext:c-format */
-      _bfd_error_handler (_("%pB: invalid relocation type %d"), abfd, (int) code);
+      _bfd_error_handler (_("%pB: unsupported relocation type %#x"), abfd, (int) code);
       bfd_set_error (bfd_error_bad_value);
       return NULL;
 

diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c
index 5c320a52d6419e5ae7a4cd9505b615d599968f2a..9eca0351523244ea2a87929ee21c78bac9f243cd 100644 (file)
--- a/bfd/elf64-s390.c
+++ b/bfd/elf64-s390.c
@@ -325,7 +325,7 @@ elf_s390_reloc_type_lookup (bfd *abfd,
     }
 
   /* xgettext:c-format */
-  _bfd_error_handler (_("%pB: invalid relocation type %d"), abfd, (int) code);
+  _bfd_error_handler (_("%pB: unsupported relocation type %#x"), abfd, (int) code);
   bfd_set_error (bfd_error_bad_value);
   return NULL;
 }

diff --git a/bfd/elf64-sh64.c b/bfd/elf64-sh64.c
index d8dca7f2c263b28618f79c9759312c7e6536e5ca..b771759c8602205df81740b04148c3377a5be25e 100644 (file)
--- a/bfd/elf64-sh64.c
+++ b/bfd/elf64-sh64.c
@@ -1411,7 +1411,7 @@ sh_elf64_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED, arelent *cache_ptr,
   if (r > (unsigned int) R_SH_64_PCREL)
     {
       /* xgettext:c-format */
-      _bfd_error_handler (_("%pB: invalid relocation type %d"), abfd, r);
+      _bfd_error_handler (_("%pB: unsupported relocation type %#x"), abfd, r);
       bfd_set_error (bfd_error_bad_value);
       return FALSE;
     }

diff --git a/bfd/elfxx-ia64.c b/bfd/elfxx-ia64.c
index 8f532722da24cab2eb48b884d7641688d2118e37..290dcd8e5395fd79531b27a1e2e7efcab1f3e33f 100644 (file)
--- a/bfd/elfxx-ia64.c
+++ b/bfd/elfxx-ia64.c
@@ -322,7 +322,7 @@ ia64_elf_reloc_type_lookup (bfd *abfd,
 
     default:
       /* xgettext:c-format */
-      _bfd_error_handler (_("%pB: invalid BFD relocation type %d"),
+      _bfd_error_handler (_("%pB: unsupported relocation type %#x"),
                          abfd, (int) bfd_code);
       bfd_set_error (bfd_error_bad_value);
       return NULL;

diff --git a/bfd/elfxx-sparc.c b/bfd/elfxx-sparc.c
index 4108aa619a80d6a5b4ba09e69642fa71ee9ee215..30e7bd3c31a1c4b9bd31e4365e875fb9e5334e38 100644 (file)
--- a/bfd/elfxx-sparc.c
+++ b/bfd/elfxx-sparc.c
@@ -586,7 +586,7 @@ _bfd_sparc_elf_reloc_type_lookup (bfd *abfd,
       break;
     }
   /* xgettext:c-format */
-  _bfd_error_handler (_("%pB: invalid BFD relocation type %d"), abfd, (int) code);
+  _bfd_error_handler (_("%pB: unsupported relocation type %#x"), abfd, (int) code);
   bfd_set_error (bfd_error_bad_value);
   return NULL;
 }

diff --git a/bfd/elfxx-tilegx.c b/bfd/elfxx-tilegx.c
index 2b7bf58b6bad8e62be1822d067e163cd212dbc6a..f029cd25266a5ad71c012e0f7965ea3aa06832f4 100644 (file)
--- a/bfd/elfxx-tilegx.c
+++ b/bfd/elfxx-tilegx.c
@@ -909,7 +909,7 @@ tilegx_reloc_type_lookup (bfd * abfd,
     }
 
   /* xgettext:c-format */
-  _bfd_error_handler (_("%pB: invalid BFD relocation type %d"),
+  _bfd_error_handler (_("%pB: unsupported relocation type %#x"),
                      abfd, (int) code);
   bfd_set_error (bfd_error_bad_value);
   return NULL;