* elf32-cris.c (cris_elf_relocate_section) <case R_CRIS_16_GOTPLT,

	case R_CRIS_32_GOTPLT>: For internal error message, handle NULL
	symname.
	(cris_elf_check_relocs) <case R_CRIS_32_PLT_PCREL>: Don't try to
	handle symbol visibility here.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 220dc7dd17bce89ecbccc911667a6da455aba83b..d74e8fe1654b79ac9bfb75fad63d328f3999b335 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,11 @@
+2004-09-07  Hans-Peter Nilsson  <hp@axis.com>
+
+       * elf32-cris.c (cris_elf_relocate_section) <case R_CRIS_16_GOTPLT,
+       case R_CRIS_32_GOTPLT>: For internal error message, handle NULL
+       symname.
+       (cris_elf_check_relocs) <case R_CRIS_32_PLT_PCREL>: Don't try to
+       handle symbol visibility here.
+
 2004-09-07  Alan Modra  <amodra@bigpond.net.au>
 
        * elf64-ppc.c (struct ppc_link_hash_table): Add stub_globals.

diff --git a/bfd/elf32-cris.c b/bfd/elf32-cris.c
index 4994e08d871c95e1c346ad482c830addead35627..aedf7749dcf424b91b30dbc22d38b18992a32d01 100644 (file)
--- a/bfd/elf32-cris.c
+++ b/bfd/elf32-cris.c
@@ -982,7 +982,8 @@ cris_elf_relocate_section (output_bfd, info, input_bfd, input_section,
                 input_bfd,
                 input_section,
                 cris_elf_howto_table[r_type].name,
-                symname[0] != '\0' ? symname : _("[whose name is lost]"));
+                (symname != NULL && symname[0] != '\0'
+                 ? symname : _("[whose name is lost]")));
 
              /* FIXME: Perhaps blaming input is not the right thing to
                 do; this is probably an internal error.  But it is true
@@ -2468,9 +2469,13 @@ cris_elf_check_relocs (abfd, info, sec, relocs)
              don't need to generate a procedure linkage table entry
              after all.  */
 
-         /* If this is a local symbol, we resolve it directly without
-            creating a procedure linkage table entry.  */
-         if (h == NULL || ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)
+         /* Beware: if we'd check for visibility of the symbol here
+            (and not marking the need for a PLT when non-visible), we'd
+            get into trouble with keeping handling consistent with
+            regards to relocs found before definition and GOTPLT
+            handling.  Eliminable PLT entries will be dealt with later
+            anyway.  */
+         if (h == NULL)
            continue;
 
          h->elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_PLT;