correct ft32 reloc range test

[deliverable/binutils-gdb.git] / bfd / elf32-i370.c

diff --git a/bfd/elf32-i370.c b/bfd/elf32-i370.c
index 37e77332a484e8ff1d151ba67b6e454081b40d2a..2c6a30d2abf81e38892e0f4a8e01525fa8a5292b 100644 (file)
--- a/bfd/elf32-i370.c
+++ b/bfd/elf32-i370.c
@@ -289,7 +289,7 @@ i370_elf_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
 
 /* Set the howto pointer for an i370 ELF reloc.  */
 
-static void
+static bfd_boolean
 i370_elf_info_to_howto (bfd *abfd,
                        arelent *cache_ptr,
                        Elf_Internal_Rela *dst)
@@ -307,9 +307,10 @@ i370_elf_info_to_howto (bfd *abfd,
       _bfd_error_handler (_("%pB: unsupported relocation type %#x"),
                          abfd, r_type);
       bfd_set_error (bfd_error_bad_value);
-      r_type = R_I370_NONE;
+      return FALSE;
     }
   cache_ptr->howto = i370_elf_howto_table[r_type];
+  return TRUE;
 }
 
 /* Hack alert --  the following several routines look generic to me ...
@@ -1068,7 +1069,6 @@ i370_elf_relocate_section (bfd *output_bfd,
       Elf_Internal_Sym *sym         = NULL;
       asection *sec                 = NULL;
       struct elf_link_hash_entry * h = NULL;
-      const char *sym_name          = NULL;
       reloc_howto_type *howto;
       unsigned long r_symndx;
       bfd_vma relocation;
@@ -1094,7 +1094,6 @@ i370_elf_relocate_section (bfd *output_bfd,
        {
          sym = local_syms + r_symndx;
          sec = local_sections[r_symndx];
-         sym_name = "<local symbol>";
 
          relocation = _bfd_elf_rela_local_sym (output_bfd, sym, & sec, rel);
          addend = rel->r_addend;
@@ -1111,7 +1110,6 @@ i370_elf_relocate_section (bfd *output_bfd,
          while (h->root.type == bfd_link_hash_indirect
                 || h->root.type == bfd_link_hash_warning)
            h = (struct elf_link_hash_entry *) h->root.u.i.link;
-         sym_name = h->root.root.string;
          if (h->root.type == bfd_link_hash_defined
              || h->root.type == bfd_link_hash_defweak)
            {
@@ -1301,28 +1299,15 @@ i370_elf_relocate_section (bfd *output_bfd,
 
        case (int) R_I370_COPY:
        case (int) R_I370_RELATIVE:
-         _bfd_error_handler
-           /* xgettext:c-format */
-           (_("%pB: Relocation %s is not yet supported for symbol %s."),
-            input_bfd,
-            i370_elf_howto_table[(int) r_type]->name,
-            sym_name);
-
+         /* xgettext:c-format */
+         _bfd_error_handler (_("%pB: %s unsupported"),
+                             input_bfd,
+                             i370_elf_howto_table[(int) r_type]->name);
          bfd_set_error (bfd_error_invalid_operation);
          ret = FALSE;
          continue;
        }
 
-#ifdef DEBUG
-      fprintf (stderr, "\ttype = %s (%d), name = %s, symbol index = %ld, offset = %ld, addend = %ld\n",
-              howto->name,
-              (int)r_type,
-              sym_name,
-              r_symndx,
-              (long) offset,
-              (long) addend);
-#endif
-
       r = _bfd_final_link_relocate (howto, input_bfd, input_section, contents,
                                    offset, relocation, addend);