bfd/

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

diff --git a/bfd/elf32-openrisc.c b/bfd/elf32-openrisc.c
index fbda8fb3d1d3601906885dd19cdc511096cf83f9..bd491cc804025eb0c29dfca76ef8f3db29677157 100644 (file)
--- a/bfd/elf32-openrisc.c
+++ b/bfd/elf32-openrisc.c
@@ -1,5 +1,5 @@
 /* OpenRISC-specific support for 32-bit ELF.
-   Copyright 2001, 2002, 2003, 2004, 2005, 2006
+   Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007
    Free Software Foundation, Inc.
    Contributed by Johan Rydberg, jrydberg@opencores.org
 
@@ -192,9 +192,9 @@ static const struct openrisc_reloc_map openrisc_reloc_map[] =
   { BFD_RELOC_32,              R_OPENRISC_32 },
   { BFD_RELOC_16,              R_OPENRISC_16 },
   { BFD_RELOC_8,               R_OPENRISC_8 },
-  { BFD_RELOC_OPENRISC_REL_26,R_OPENRISC_INSN_REL_26 },
-  { BFD_RELOC_OPENRISC_ABS_26,R_OPENRISC_INSN_ABS_26 },
-    { BFD_RELOC_HI16,          R_OPENRISC_HI_16_IN_INSN },
+  { BFD_RELOC_OPENRISC_REL_26, R_OPENRISC_INSN_REL_26 },
+  { BFD_RELOC_OPENRISC_ABS_26, R_OPENRISC_INSN_ABS_26 },
+  { BFD_RELOC_HI16,            R_OPENRISC_HI_16_IN_INSN },
   { BFD_RELOC_LO16,            R_OPENRISC_LO_16_IN_INSN },
   { BFD_RELOC_VTABLE_INHERIT,  R_OPENRISC_GNU_VTINHERIT },
   { BFD_RELOC_VTABLE_ENTRY,    R_OPENRISC_GNU_VTENTRY }
@@ -214,6 +214,23 @@ openrisc_reloc_type_lookup (bfd * abfd ATTRIBUTE_UNUSED,
   return NULL;
 }
 
+static reloc_howto_type *
+openrisc_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+                           const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < (sizeof (openrisc_elf_howto_table)
+           / sizeof (openrisc_elf_howto_table[0]));
+       i++)
+    if (openrisc_elf_howto_table[i].name != NULL
+       && strcasecmp (openrisc_elf_howto_table[i].name, r_name) == 0)
+      return &openrisc_elf_howto_table[i];
+
+  return NULL;
+}
+
 /* Set the howto pointer for an OpenRISC ELF reloc.  */
 
 static void
@@ -304,9 +321,6 @@ openrisc_elf_relocate_section (bfd *output_bfd,
   Elf_Internal_Rela *rel;
   Elf_Internal_Rela *relend;
 
-  if (info->relocatable)
-    return TRUE;
-
   symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
   sym_hashes = elf_sym_hashes (input_bfd);
   relend = relocs + input_section->reloc_count;
@@ -334,7 +348,6 @@ openrisc_elf_relocate_section (bfd *output_bfd,
          (sizeof openrisc_elf_howto_table / sizeof (reloc_howto_type)))
        abort ();
 
-      /* This is a final link.  */
       howto = openrisc_elf_howto_table + ELF32_R_TYPE (rel->r_info);
       h = NULL;
       sym = NULL;
@@ -360,6 +373,20 @@ openrisc_elf_relocate_section (bfd *output_bfd,
                                   unresolved_reloc, warned);
        }
 
+      if (sec != NULL && elf_discarded_section (sec))
+       {
+         /* For relocs against symbols from removed linkonce sections,
+            or sections discarded by a linker script, we just want the
+            section contents zeroed.  Avoid any special processing.  */
+         _bfd_clear_contents (howto, input_bfd, contents + rel->r_offset);
+         rel->r_info = 0;
+         rel->r_addend = 0;
+         continue;
+       }
+
+      if (info->relocatable)
+       continue;
+
       r = openrisc_final_link_relocate (howto, input_bfd, input_section,
                                        contents, rel, relocation);
 
@@ -540,6 +567,7 @@ openrisc_elf_final_write_processing (bfd *abfd,
 #define elf_backend_rela_normal                1
 
 #define bfd_elf32_bfd_reloc_type_lookup openrisc_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup openrisc_reloc_name_lookup
 
 #define elf_backend_object_p                openrisc_elf_object_p
 #define elf_backend_final_write_processing  openrisc_elf_final_write_processing