* expr.c (make_expr_symbol): Fold FAKE_LABEL_NAME use into the

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

diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
index 92fb98c77219fc9e5a80e84c349eeab361183915..b277540107c533ba140b002aba1db7aee92f127e 100644 (file)
--- a/bfd/elf32-xtensa.c
+++ b/bfd/elf32-xtensa.c
@@ -1893,6 +1893,7 @@ elf_xtensa_relocate_section (output_bfd, info, input_bfd,
       bfd_reloc_status_type r;
       bfd_boolean is_weak_undef;
       bfd_boolean unresolved_reloc;
+      bfd_boolean warned;
 
       r_type = ELF32_R_TYPE (rel->r_info);
       if (r_type == (int) R_XTENSA_GNU_VTINHERIT
@@ -1983,6 +1984,7 @@ elf_xtensa_relocate_section (output_bfd, info, input_bfd,
       sec = NULL;
       is_weak_undef = FALSE;
       unresolved_reloc = FALSE;
+      warned = FALSE;
 
       if (howto->partial_inplace)
        {
@@ -2039,10 +2041,7 @@ elf_xtensa_relocate_section (output_bfd, info, input_bfd,
                      (!info->shared || info->no_undefined
                       || ELF_ST_VISIBILITY (h->other)))))
                return FALSE;
-
-             /* To avoid any more warning messages, like "call out of
-                range", we continue immediately to the next relocation.  */
-             continue;
+             warned = TRUE;
            }
        }
 
@@ -2171,7 +2170,7 @@ elf_xtensa_relocate_section (output_bfd, info, input_bfd,
                               contents, rel->r_offset, is_weak_undef,
                               &error_message);
       
-      if (r != bfd_reloc_ok)
+      if (r != bfd_reloc_ok && !warned)
        {
          const char *name;
 
@@ -3926,7 +3925,7 @@ retrieve_internal_relocs (abfd, sec, keep_memory)
 
   internal_relocs = elf_section_data (sec)->relocs;
   if (internal_relocs == NULL)
-    internal_relocs = (_bfd_elf32_link_read_relocs
+    internal_relocs = (_bfd_elf_link_read_relocs
                       (abfd, sec, (PTR) NULL, (Elf_Internal_Rela *) NULL,
                        keep_memory));
   return internal_relocs;