This is the mail archive of the binutils-cvs@sourceware.org mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[binutils-gdb] PR binutils/22875: MIPS: Remove duplicate unsupported relocation processing


https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=75def2abc3dafb52418405905cd49e9c107c2640

commit 75def2abc3dafb52418405905cd49e9c107c2640
Author: Maciej W. Rozycki <macro@mips.com>
Date:   Thu Mar 29 14:09:48 2018 +0100

    PR binutils/22875: MIPS: Remove duplicate unsupported relocation processing
    
    Remove a duplicate `unsupported relocation type' message and the setting
    of the `bfd_error_bad_value' error from `mips_elf32_rtype_to_howto',
    added with commit f3185997ac09 ("PR 22875: Stop strip corrupting unknown
    relocs"), <https://sourceware.org/ml/binutils/2018-02/msg00445.html>.
    This message is already produced and the `bfd_error_bad_value' error set
    by `mips_elf32_rtype_to_howto' before a NULL howto is returned, so there
    is no need to repeat these actions here.
    
    	bfd/
    	* elf32-mips.c (mips_info_to_howto_rel): Remove the calls to
    	`_bfd_error_handler' and to set the `bfd_error_bad_value' error.

Diff:
---
 bfd/ChangeLog    | 5 +++++
 bfd/elf32-mips.c | 8 ++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 2154559..925310e 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2018-03-29  Maciej W. Rozycki  <macro@mips.com>
+
+	* elf32-mips.c (mips_info_to_howto_rel): Remove the calls to
+	`_bfd_error_handler' and to set the `bfd_error_bad_value' error.
+
 2018-03-28  Maciej W. Rozycki  <macro@mips.com>
 
 	* elf-hppa.h (elf_hppa_info_to_howto_rel): Remove
diff --git a/bfd/elf32-mips.c b/bfd/elf32-mips.c
index 3767677..c3c96a4 100644
--- a/bfd/elf32-mips.c
+++ b/bfd/elf32-mips.c
@@ -2239,13 +2239,9 @@ mips_info_to_howto_rel (bfd *abfd, arelent *cache_ptr, Elf_Internal_Rela *dst)
 
   r_type = ELF32_R_TYPE (dst->r_info);
   cache_ptr->howto = mips_elf32_rtype_to_howto (abfd, r_type, FALSE);
+
   if (cache_ptr->howto == NULL)
-    {
-      /* xgettext:c-format */
-      _bfd_error_handler (_("%pB: unsupported relocation type %#x"), abfd, r_type);
-      bfd_set_error (bfd_error_bad_value);
-      return FALSE;
-    }
+    return FALSE;
 
   /* The addend for a GPREL16 or LITERAL relocation comes from the GP
      value for the object file.  We get the addend now, rather than


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]