diff options
Diffstat (limited to 'bfd/elf32-openrisc.c')
| -rw-r--r-- | bfd/elf32-openrisc.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/bfd/elf32-openrisc.c b/bfd/elf32-openrisc.c index fbda8fb..d6b4049 100644 --- 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 @@ -304,9 +304,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 +331,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 +356,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); |