diff options
Diffstat (limited to 'bfd/elf64-ppc.c')
| -rw-r--r-- | bfd/elf64-ppc.c | 4344 |
1 files changed, 3341 insertions, 1003 deletions
diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c index a0d81d0550ee..33327f44cba9 100644 --- a/bfd/elf64-ppc.c +++ b/bfd/elf64-ppc.c @@ -1,5 +1,5 @@ /* PowerPC64-specific support for 64-bit ELF. - Copyright 1999, 2000, 2001, 2002, 2003, 2004 + Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. Written by Linus Nordberg, Swox AB <info@swox.com>, based on elf32-ppc.c by Ian Lance Taylor. @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., - 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ /* The 64-bit PowerPC ELF ABI may be found at http://www.linuxbase.org/spec/ELF/ppc64/PPC-elf64abi.txt, and @@ -35,6 +35,8 @@ static bfd_reloc_status_type ppc64_elf_ha_reloc (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **); +static bfd_reloc_status_type ppc64_elf_branch_reloc + (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **); static bfd_reloc_status_type ppc64_elf_brtaken_reloc (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **); static bfd_reloc_status_type ppc64_elf_sectoff_reloc @@ -49,7 +51,8 @@ static bfd_reloc_status_type ppc64_elf_toc64_reloc (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **); static bfd_reloc_status_type ppc64_elf_unhandled_reloc (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **); - +static bfd_vma opd_entry_value + (asection *, bfd_vma, asection **, bfd_vma *); #define TARGET_LITTLE_SYM bfd_elf64_powerpcle_vec #define TARGET_LITTLE_NAME "elf64-powerpcle" @@ -64,7 +67,6 @@ static bfd_reloc_status_type ppc64_elf_unhandled_reloc #define elf_backend_want_plt_sym 0 #define elf_backend_plt_alignment 3 #define elf_backend_plt_not_loaded 1 -#define elf_backend_got_symbol_offset 0 #define elf_backend_got_header_size 8 #define elf_backend_can_gc_sections 1 #define elf_backend_can_refcount 1 @@ -76,6 +78,7 @@ static bfd_reloc_status_type ppc64_elf_unhandled_reloc #define bfd_elf64_new_section_hook ppc64_elf_new_section_hook #define bfd_elf64_bfd_link_hash_table_create ppc64_elf_link_hash_table_create #define bfd_elf64_bfd_link_hash_table_free ppc64_elf_link_hash_table_free +#define bfd_elf64_get_synthetic_symtab ppc64_elf_get_synthetic_symtab #define elf_backend_object_p ppc64_elf_object_p #define elf_backend_grok_prstatus ppc64_elf_grok_prstatus @@ -83,13 +86,17 @@ static bfd_reloc_status_type ppc64_elf_unhandled_reloc #define elf_backend_create_dynamic_sections ppc64_elf_create_dynamic_sections #define elf_backend_copy_indirect_symbol ppc64_elf_copy_indirect_symbol #define elf_backend_add_symbol_hook ppc64_elf_add_symbol_hook +#define elf_backend_check_directives ppc64_elf_check_directives +#define elf_backend_archive_symbol_lookup ppc64_elf_archive_symbol_lookup #define elf_backend_check_relocs ppc64_elf_check_relocs +#define elf_backend_gc_mark_dynamic_ref ppc64_elf_gc_mark_dynamic_ref #define elf_backend_gc_mark_hook ppc64_elf_gc_mark_hook #define elf_backend_gc_sweep_hook ppc64_elf_gc_sweep_hook #define elf_backend_adjust_dynamic_symbol ppc64_elf_adjust_dynamic_symbol #define elf_backend_hide_symbol ppc64_elf_hide_symbol #define elf_backend_always_size_sections ppc64_elf_func_desc_adjust #define elf_backend_size_dynamic_sections ppc64_elf_size_dynamic_sections +#define elf_backend_action_discarded ppc64_elf_action_discarded #define elf_backend_relocate_section ppc64_elf_relocate_section #define elf_backend_finish_dynamic_symbol ppc64_elf_finish_dynamic_symbol #define elf_backend_reloc_type_class ppc64_elf_reloc_type_class @@ -168,9 +175,17 @@ static bfd_reloc_status_type ppc64_elf_unhandled_reloc #define LIS_R0_0 0x3c000000 /* lis %r0,0 */ #define ORI_R0_R0_0 0x60000000 /* ori %r0,%r0,0 */ -/* Instructions to save and restore floating point regs. */ +/* Instructions used by the save and restore reg functions. */ +#define STD_R0_0R1 0xf8010000 /* std %r0,0(%r1) */ +#define STD_R0_0R12 0xf80c0000 /* std %r0,0(%r12) */ +#define LD_R0_0R1 0xe8010000 /* ld %r0,0(%r1) */ +#define LD_R0_0R12 0xe80c0000 /* ld %r0,0(%r12) */ #define STFD_FR0_0R1 0xd8010000 /* stfd %fr0,0(%r1) */ #define LFD_FR0_0R1 0xc8010000 /* lfd %fr0,0(%r1) */ +#define LI_R12_0 0x39800000 /* li %r12,0 */ +#define STVX_VR0_R12_R0 0x7c0c01ce /* stvx %v0,%r12,%r0 */ +#define LVX_VR0_R12_R0 0x7c0c00ce /* lvx %v0,%r12,%r0 */ +#define MTLR_R0 0x7c0803a6 /* mtlr %r0 */ #define BLR 0x4e800020 /* blr */ /* Since .opd is an array of descriptors and each entry will end up @@ -303,7 +318,7 @@ static reloc_howto_type ppc64_elf_howto_raw[] = { FALSE, /* pc_relative */ 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ - bfd_elf_generic_reloc, /* special_function */ + ppc64_elf_branch_reloc, /* special_function */ "R_PPC64_ADDR14", /* name */ FALSE, /* partial_inplace */ 0, /* src_mask */ @@ -352,7 +367,7 @@ static reloc_howto_type ppc64_elf_howto_raw[] = { TRUE, /* pc_relative */ 0, /* bitpos */ complain_overflow_signed, /* complain_on_overflow */ - bfd_elf_generic_reloc, /* special_function */ + ppc64_elf_branch_reloc, /* special_function */ "R_PPC64_REL24", /* name */ FALSE, /* partial_inplace */ 0, /* src_mask */ @@ -367,7 +382,7 @@ static reloc_howto_type ppc64_elf_howto_raw[] = { TRUE, /* pc_relative */ 0, /* bitpos */ complain_overflow_signed, /* complain_on_overflow */ - bfd_elf_generic_reloc, /* special_function */ + ppc64_elf_branch_reloc, /* special_function */ "R_PPC64_REL14", /* name */ FALSE, /* partial_inplace */ 0, /* src_mask */ @@ -2104,8 +2119,13 @@ ppc64_elf_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED, arelent *cache_ptr, ppc_howto_init (); type = ELF64_R_TYPE (dst->r_info); - BFD_ASSERT (type < (sizeof (ppc64_elf_howto_table) - / sizeof (ppc64_elf_howto_table[0]))); + if (type >= (sizeof (ppc64_elf_howto_table) + / sizeof (ppc64_elf_howto_table[0]))) + { + (*_bfd_error_handler) (_("%B: invalid relocation type %d"), + abfd, (int) type); + type = R_PPC64_NONE; + } cache_ptr->howto = ppc64_elf_howto_table[type]; } @@ -2131,6 +2151,29 @@ ppc64_elf_ha_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol, } static bfd_reloc_status_type +ppc64_elf_branch_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol, + void *data, asection *input_section, + bfd *output_bfd, char **error_message) +{ + if (output_bfd != NULL) + return bfd_elf_generic_reloc (abfd, reloc_entry, symbol, data, + input_section, output_bfd, error_message); + + if (strcmp (symbol->section->name, ".opd") == 0 + && (symbol->section->owner->flags & DYNAMIC) == 0) + { + bfd_vma dest = opd_entry_value (symbol->section, + symbol->value + reloc_entry->addend, + NULL, NULL); + if (dest != (bfd_vma) -1) + reloc_entry->addend = dest - (symbol->value + + symbol->section->output_section->vma + + symbol->section->output_offset); + } + return bfd_reloc_continue; +} + +static bfd_reloc_status_type ppc64_elf_brtaken_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol, void *data, asection *input_section, bfd *output_bfd, char **error_message) @@ -2166,7 +2209,7 @@ ppc64_elf_brtaken_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol, else if ((insn & (0x14 << 21)) == (0x10 << 21)) insn |= 0x08 << 21; else - return bfd_reloc_continue; + goto out; } else { @@ -2188,7 +2231,9 @@ ppc64_elf_brtaken_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol, insn ^= 0x01 << 21; } bfd_put_32 (abfd, insn, (bfd_byte *) data + octets); - return bfd_reloc_continue; + out: + return ppc64_elf_branch_reloc (abfd, reloc_entry, symbol, data, + input_section, output_bfd, error_message); } static bfd_reloc_status_type @@ -2331,12 +2376,24 @@ struct ppc64_elf_obj_tdata asection *got; asection *relgot; + union { + /* Used during garbage collection. We attach global symbols defined + on removed .opd entries to this section so that the sym is removed. */ + asection *deleted_section; + + /* Used when adding symbols. */ + bfd_boolean has_dotsym; + } u; + /* TLS local dynamic got entry handling. Suppose for multiple GOT sections means we potentially need one of these for each input bfd. */ union { bfd_signed_vma refcount; bfd_vma offset; } tlsld_got; + + /* A copy of relocs before they are modified for --emit-relocs. */ + Elf_Internal_Rela *opd_relocs; }; #define ppc64_elf_tdata(bfd) \ @@ -2357,6 +2414,17 @@ ppc64_elf_mkobject (bfd *abfd) return TRUE; } +/* Return 1 if target is one of ours. */ + +static bfd_boolean +is_ppc64_elf_target (const struct bfd_target *targ) +{ + extern const bfd_target bfd_elf64_powerpc_vec; + extern const bfd_target bfd_elf64_powerpcle_vec; + + return targ == &bfd_elf64_powerpc_vec || targ == &bfd_elf64_powerpcle_vec; +} + /* Fix bad default arch selected for a 64 bit input bfd when the default is 32 bit. */ @@ -2382,7 +2450,7 @@ ppc64_elf_object_p (bfd *abfd) static bfd_boolean ppc64_elf_grok_prstatus (bfd *abfd, Elf_Internal_Note *note) { - size_t offset, raw_size; + size_t offset, size; if (note->descsz != 504) return FALSE; @@ -2395,11 +2463,11 @@ ppc64_elf_grok_prstatus (bfd *abfd, Elf_Internal_Note *note) /* pr_reg */ offset = 112; - raw_size = 384; + size = 384; /* Make a ".reg/999" section. */ return _bfd_elfcore_make_pseudosection (abfd, ".reg", - raw_size, note->descpos + offset); + size, note->descpos + offset); } static bfd_boolean @@ -2430,13 +2498,13 @@ ppc64_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd) const char *msg; if (bfd_big_endian (ibfd)) - msg = _("%s: compiled for a big endian system " + msg = _("%B: compiled for a big endian system " "and target is little endian"); else - msg = _("%s: compiled for a little endian system " + msg = _("%B: compiled for a little endian system " "and target is big endian"); - (*_bfd_error_handler) (msg, bfd_archive_filename (ibfd)); + (*_bfd_error_handler) (msg, ibfd); bfd_set_error (bfd_error_wrong_format); return FALSE; @@ -2447,11 +2515,11 @@ ppc64_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd) /* Add extra PPC sections. */ -static struct bfd_elf_special_section const ppc64_elf_special_sections[]= +static const struct bfd_elf_special_section ppc64_elf_special_sections[]= { - { ".sdata", 6, -2, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE }, - { ".sbss", 5, -2, SHT_NOBITS, SHF_ALLOC + SHF_WRITE }, { ".plt", 4, 0, SHT_NOBITS, 0 }, + { ".sbss", 5, -2, SHT_NOBITS, SHF_ALLOC + SHF_WRITE }, + { ".sdata", 6, -2, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE }, { ".toc", 4, 0, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE }, { ".toc1", 5, 0, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE }, { ".tocbss", 7, 0, SHT_NOBITS, SHF_ALLOC + SHF_WRITE }, @@ -2492,6 +2560,415 @@ ppc64_elf_new_section_hook (bfd *abfd, asection *sec) return _bfd_elf_new_section_hook (abfd, sec); } + +static void * +get_opd_info (asection * sec) +{ + if (sec != NULL + && ppc64_elf_section_data (sec) != NULL + && ppc64_elf_section_data (sec)->opd.adjust != NULL) + return ppc64_elf_section_data (sec)->opd.adjust; + return NULL; +} + +/* Parameters for the qsort hook. */ +static asection *synthetic_opd; +static bfd_boolean synthetic_relocatable; + +/* qsort comparison function for ppc64_elf_get_synthetic_symtab. */ + +static int +compare_symbols (const void *ap, const void *bp) +{ + const asymbol *a = * (const asymbol **) ap; + const asymbol *b = * (const asymbol **) bp; + + /* Section symbols first. */ + if ((a->flags & BSF_SECTION_SYM) && !(b->flags & BSF_SECTION_SYM)) + return -1; + if (!(a->flags & BSF_SECTION_SYM) && (b->flags & BSF_SECTION_SYM)) + return 1; + + /* then .opd symbols. */ + if (a->section == synthetic_opd && b->section != synthetic_opd) + return -1; + if (a->section != synthetic_opd && b->section == synthetic_opd) + return 1; + + /* then other code symbols. */ + if ((a->section->flags & (SEC_CODE | SEC_ALLOC | SEC_THREAD_LOCAL)) + == (SEC_CODE | SEC_ALLOC) + && (b->section->flags & (SEC_CODE | SEC_ALLOC | SEC_THREAD_LOCAL)) + != (SEC_CODE | SEC_ALLOC)) + return -1; + + if ((a->section->flags & (SEC_CODE | SEC_ALLOC | SEC_THREAD_LOCAL)) + != (SEC_CODE | SEC_ALLOC) + && (b->section->flags & (SEC_CODE | SEC_ALLOC | SEC_THREAD_LOCAL)) + == (SEC_CODE | SEC_ALLOC)) + return 1; + + if (synthetic_relocatable) + { + if (a->section->id < b->section->id) + return -1; + + if (a->section->id > b->section->id) + return 1; + } + + if (a->value + a->section->vma < b->value + b->section->vma) + return -1; + + if (a->value + a->section->vma > b->value + b->section->vma) + return 1; + + /* For syms with the same value, prefer strong dynamic global function + syms over other syms. */ + if ((a->flags & BSF_GLOBAL) != 0 && (b->flags & BSF_GLOBAL) == 0) + return -1; + + if ((a->flags & BSF_GLOBAL) == 0 && (b->flags & BSF_GLOBAL) != 0) + return 1; + + if ((a->flags & BSF_FUNCTION) != 0 && (b->flags & BSF_FUNCTION) == 0) + return -1; + + if ((a->flags & BSF_FUNCTION) == 0 && (b->flags & BSF_FUNCTION) != 0) + return 1; + + if ((a->flags & BSF_WEAK) == 0 && (b->flags & BSF_WEAK) != 0) + return -1; + + if ((a->flags & BSF_WEAK) != 0 && (b->flags & BSF_WEAK) == 0) + return 1; + + if ((a->flags & BSF_DYNAMIC) != 0 && (b->flags & BSF_DYNAMIC) == 0) + return -1; + + if ((a->flags & BSF_DYNAMIC) == 0 && (b->flags & BSF_DYNAMIC) != 0) + return 1; + + return 0; +} + +/* Search SYMS for a symbol of the given VALUE. */ + +static asymbol * +sym_exists_at (asymbol **syms, long lo, long hi, int id, bfd_vma value) +{ + long mid; + + if (id == -1) + { + while (lo < hi) + { + mid = (lo + hi) >> 1; + if (syms[mid]->value + syms[mid]->section->vma < value) + lo = mid + 1; + else if (syms[mid]->value + syms[mid]->section->vma > value) + hi = mid; + else + return syms[mid]; + } + } + else + { + while (lo < hi) + { + mid = (lo + hi) >> 1; + if (syms[mid]->section->id < id) + lo = mid + 1; + else if (syms[mid]->section->id > id) + hi = mid; + else if (syms[mid]->value < value) + lo = mid + 1; + else if (syms[mid]->value > value) + hi = mid; + else + return syms[mid]; + } + } + return NULL; +} + +/* Create synthetic symbols, effectively restoring "dot-symbol" function + entry syms. */ + +static long +ppc64_elf_get_synthetic_symtab (bfd *abfd, + long static_count, asymbol **static_syms, + long dyn_count, asymbol **dyn_syms, + asymbol **ret) +{ + asymbol *s; + long i; + long count; + char *names; + long symcount, codesecsym, codesecsymend, secsymend, opdsymend; + asection *opd; + bfd_boolean relocatable = (abfd->flags & (EXEC_P | DYNAMIC)) == 0; + asymbol **syms; + + *ret = NULL; + + opd = bfd_get_section_by_name (abfd, ".opd"); + if (opd == NULL) + return 0; + + symcount = static_count; + if (!relocatable) + symcount += dyn_count; + if (symcount == 0) + return 0; + + syms = bfd_malloc ((symcount + 1) * sizeof (*syms)); + if (syms == NULL) + return -1; + + if (!relocatable && static_count != 0 && dyn_count != 0) + { + /* Use both symbol tables. */ + memcpy (syms, static_syms, static_count * sizeof (*syms)); + memcpy (syms + static_count, dyn_syms, (dyn_count + 1) * sizeof (*syms)); + } + else if (!relocatable && static_count == 0) + memcpy (syms, dyn_syms, (symcount + 1) * sizeof (*syms)); + else + memcpy (syms, static_syms, (symcount + 1) * sizeof (*syms)); + + synthetic_opd = opd; + synthetic_relocatable = relocatable; + qsort (syms, symcount, sizeof (*syms), compare_symbols); + + if (!relocatable && symcount > 1) + { + long j; + /* Trim duplicate syms, since we may have merged the normal and + dynamic symbols. Actually, we only care about syms that have + different values, so trim any with the same value. */ + for (i = 1, j = 1; i < symcount; ++i) + if (syms[i - 1]->value + syms[i - 1]->section->vma + != syms[i]->value + syms[i]->section->vma) + syms[j++] = syms[i]; + symcount = j; + } + + i = 0; + if (syms[i]->section == opd) + ++i; + codesecsym = i; + + for (; i < symcount; ++i) + if (((syms[i]->section->flags & (SEC_CODE | SEC_ALLOC | SEC_THREAD_LOCAL)) + != (SEC_CODE | SEC_ALLOC)) + || (syms[i]->flags & BSF_SECTION_SYM) == 0) + break; + codesecsymend = i; + + for (; i < symcount; ++i) + if ((syms[i]->flags & BSF_SECTION_SYM) == 0) + break; + secsymend = i; + + for (; i < symcount; ++i) + if (syms[i]->section != opd) + break; + opdsymend = i; + + for (; i < symcount; ++i) + if ((syms[i]->section->flags & (SEC_CODE | SEC_ALLOC | SEC_THREAD_LOCAL)) + != (SEC_CODE | SEC_ALLOC)) + break; + symcount = i; + + count = 0; + if (opdsymend == secsymend) + goto done; + + if (relocatable) + { + bfd_boolean (*slurp_relocs) (bfd *, asection *, asymbol **, bfd_boolean); + arelent *r; + size_t size; + long relcount; + + slurp_relocs = get_elf_backend_data (abfd)->s->slurp_reloc_table; + relcount = (opd->flags & SEC_RELOC) ? opd->reloc_count : 0; + if (relcount == 0) + goto done; + + if (!(*slurp_relocs) (abfd, opd, static_syms, FALSE)) + { + count = -1; + goto done; + } + + size = 0; + for (i = secsymend, r = opd->relocation; i < opdsymend; ++i) + { + asymbol *sym; + + while (r < opd->relocation + relcount + && r->address < syms[i]->value + opd->vma) + ++r; + + if (r == opd->relocation + relcount) + break; + + if (r->address != syms[i]->value + opd->vma) + continue; + + if (r->howto->type != R_PPC64_ADDR64) + continue; + + sym = *r->sym_ptr_ptr; + if (!sym_exists_at (syms, opdsymend, symcount, + sym->section->id, sym->value + r->addend)) + { + ++count; + size += sizeof (asymbol); + size += strlen (syms[i]->name) + 2; + } + } + + s = *ret = bfd_malloc (size); + if (s == NULL) + { + count = -1; + goto done; + } + + names = (char *) (s + count); + + for (i = secsymend, r = opd->relocation; i < opdsymend; ++i) + { + asymbol *sym; + + while (r < opd->relocation + relcount + && r->address < syms[i]->value + opd->vma) + ++r; + + if (r == opd->relocation + relcount) + break; + + if (r->address != syms[i]->value + opd->vma) + continue; + + if (r->howto->type != R_PPC64_ADDR64) + continue; + + sym = *r->sym_ptr_ptr; + if (!sym_exists_at (syms, opdsymend, symcount, + sym->section->id, sym->value + r->addend)) + { + size_t len; + + *s = *syms[i]; + s->section = sym->section; + s->value = sym->value + r->addend; + s->name = names; + *names++ = '.'; + len = strlen (syms[i]->name); + memcpy (names, syms[i]->name, len + 1); + names += len + 1; + s++; + } + } + } + else + { + bfd_byte *contents; + size_t size; + + if (!bfd_malloc_and_get_section (abfd, opd, &contents)) + { + if (contents) + { + free_contents_and_exit: + free (contents); + } + count = -1; + goto done; + } + + size = 0; + for (i = secsymend; i < opdsymend; ++i) + { + bfd_vma ent; + + ent = bfd_get_64 (abfd, contents + syms[i]->value); + if (!sym_exists_at (syms, opdsymend, symcount, -1, ent)) + { + ++count; + size += sizeof (asymbol); + size += strlen (syms[i]->name) + 2; + } + } + + s = *ret = bfd_malloc (size); + if (s == NULL) + goto free_contents_and_exit; + + names = (char *) (s + count); + + for (i = secsymend; i < opdsymend; ++i) + { + bfd_vma ent; + + ent = bfd_get_64 (abfd, contents + syms[i]->value); + if (!sym_exists_at (syms, opdsymend, symcount, -1, ent)) + { + long lo, hi; + size_t len; + asection *sec = abfd->sections; + + *s = *syms[i]; + lo = codesecsym; + hi = codesecsymend; + while (lo < hi) + { + long mid = (lo + hi) >> 1; + if (syms[mid]->section->vma < ent) + lo = mid + 1; + else if (syms[mid]->section->vma > ent) + hi = mid; + else + { + sec = syms[mid]->section; + break; + } + } + + if (lo >= hi && lo > codesecsym) + sec = syms[lo - 1]->section; + + for (; sec != NULL; sec = sec->next) + { + if (sec->vma > ent) + break; + if ((sec->flags & SEC_ALLOC) == 0 + || (sec->flags & SEC_LOAD) == 0) + break; + if ((sec->flags & SEC_CODE) != 0) + s->section = sec; + } + s->value = ent - s->section->vma; + s->name = names; + *names++ = '.'; + len = strlen (syms[i]->name); + memcpy (names, syms[i]->name, len + 1); + names += len + 1; + s++; + } + } + free (contents); + } + + done: + free (syms); + return count; +} /* The following functions are specific to the ELF linker, while functions above are used generally. Those named ppc64_elf_* are @@ -2559,7 +3036,11 @@ ppc64_elf_new_section_hook (bfd *abfd, asection *sec) creating a shared library containing foo, we need to have both symbols dynamic so that references to .foo are satisfied during the early stages of linking. Otherwise the linker might decide to pull in a - definition from some other object, eg. a static library. */ + definition from some other object, eg. a static library. + + Update: As of August 2004, we support a new convention. Function + calls may use the function descriptor symbol, ie. "bl foo". This + behaves exactly as "bl .foo". */ /* The linker needs to keep track of the number of relocs that it decides to copy as dynamic relocs in check_relocs for each symbol. @@ -2669,7 +3150,10 @@ struct plt_entry . bctr ppc_stub_plt_call: - Used to call a function in a shared library. + Used to call a function in a shared library. If it so happens that + the plt entry referenced crosses a 64k boundary, then an extra + "addis %r12,%r12,1" will be inserted before the load at xxx+8 or + xxx+16 as appropriate. . addis %r12,%r2,xxx@toc@ha . std %r2,40(%r1) . ld %r11,xxx+0@toc@l(%r12) @@ -2739,7 +3223,7 @@ struct ppc_branch_hash_entry { /* Base hash table entry structure. */ struct bfd_hash_entry root; - /* Offset within .branch_lt. */ + /* Offset within branch lookup table. */ unsigned int offset; /* Generation marker. */ @@ -2758,16 +3242,21 @@ struct ppc_link_hash_entry struct ppc_dyn_relocs *dyn_relocs; /* Link between function code and descriptor symbols. */ - struct elf_link_hash_entry *oh; + struct ppc_link_hash_entry *oh; /* Flag function code and descriptor symbols. */ unsigned int is_func:1; unsigned int is_func_descriptor:1; - unsigned int is_entry:1; + unsigned int fake:1; - /* Whether global opd sym has been adjusted or not. */ + /* Whether global opd/toc sym has been adjusted or not. + After ppc64_elf_edit_opd/ppc64_elf_edit_toc has run, this flag + should be set for all globals defined in any opd/toc section. */ unsigned int adjust_done:1; + /* Set if we twiddled this symbol to weak at some stage. */ + unsigned int was_undefined:1; + /* Contexts in which symbol is used in the GOT (or TOC). TLS_GD .. TLS_EXPLICIT bits are or'd into the mask as the corresponding relocs are encountered during check_relocs. @@ -2816,10 +3305,6 @@ struct ppc_link_hash_table bfd_vma toc_off; } *stub_group; - /* Support for multiple toc sections. */ - unsigned int no_multi_toc; - unsigned int multi_toc_needed; - /* Temp used when calculating TOC pointers. */ bfd_vma toc_curr; @@ -2843,24 +3328,32 @@ struct ppc_link_hash_table asection *brlt; asection *relbrlt; - /* Shortcut to .__tls_get_addr. */ - struct elf_link_hash_entry *tls_get_addr; + /* Shortcut to .__tls_get_addr and __tls_get_addr. */ + struct ppc_link_hash_entry *tls_get_addr; + struct ppc_link_hash_entry *tls_get_addr_fd; /* Statistics. */ unsigned long stub_count[ppc_stub_plt_call]; + /* Number of stubs against global syms. */ + unsigned long stub_globals; + /* Set if we should emit symbols for stubs. */ - unsigned int emit_stub_syms; + unsigned int emit_stub_syms:1; + + /* Support for multiple toc sections. */ + unsigned int no_multi_toc:1; + unsigned int multi_toc_needed:1; /* Set on error. */ - unsigned int stub_error; + unsigned int stub_error:1; /* Flag set when small branches are detected. Used to select suitable defaults for the stub group size. */ - unsigned int has_14bit_branch; + unsigned int has_14bit_branch:1; - /* Set if we detect a reference undefined weak symbol. */ - unsigned int have_undefweak; + /* Temp used by ppc64_elf_check_directives. */ + unsigned int twiddled_syms:1; /* Incremented every time we size stubs. */ unsigned int stub_iteration; @@ -2869,6 +3362,12 @@ struct ppc_link_hash_table struct sym_sec_cache sym_sec; }; +/* Rename some of the generic section flags to better document how they + are used here. */ +#define has_toc_reloc has_gp_reloc +#define makes_toc_func_call need_finalize_relax +#define call_check_in_progress reloc_done + /* Get the ppc64 ELF linker hash table from a link_info structure. */ #define ppc_hash_table(p) \ @@ -2971,14 +3470,9 @@ link_hash_newfunc (struct bfd_hash_entry *entry, { struct ppc_link_hash_entry *eh = (struct ppc_link_hash_entry *) entry; - eh->stub_cache = NULL; - eh->dyn_relocs = NULL; - eh->oh = NULL; - eh->is_func = 0; - eh->is_func_descriptor = 0; - eh->is_entry = 0; - eh->adjust_done = 0; - eh->tls_mask = 0; + memset (&eh->stub_cache, 0, + (sizeof (struct ppc_link_hash_entry) + - offsetof (struct ppc_link_hash_entry, stub_cache))); } return entry; @@ -2996,28 +3490,35 @@ ppc64_elf_link_hash_table_create (bfd *abfd) if (htab == NULL) return NULL; - if (! _bfd_elf_link_hash_table_init (&htab->elf, abfd, link_hash_newfunc)) + if (!_bfd_elf_link_hash_table_init (&htab->elf, abfd, link_hash_newfunc, + sizeof (struct ppc_link_hash_entry))) { free (htab); return NULL; } /* Init the stub hash table too. */ - if (!bfd_hash_table_init (&htab->stub_hash_table, stub_hash_newfunc)) + if (!bfd_hash_table_init (&htab->stub_hash_table, stub_hash_newfunc, + sizeof (struct ppc_stub_hash_entry))) return NULL; /* And the branch hash table. */ - if (!bfd_hash_table_init (&htab->branch_hash_table, branch_hash_newfunc)) + if (!bfd_hash_table_init (&htab->branch_hash_table, branch_hash_newfunc, + sizeof (struct ppc_branch_hash_entry))) return NULL; /* Initializing two fields of the union is just cosmetic. We really only care about glist, but when compiled on a 32-bit host the bfd_vma fields are larger. Setting the bfd_vma to zero makes debugger inspection of these fields look nicer. */ - htab->elf.init_refcount.refcount = 0; - htab->elf.init_refcount.glist = NULL; - htab->elf.init_offset.offset = 0; - htab->elf.init_offset.glist = NULL; + htab->elf.init_got_refcount.refcount = 0; + htab->elf.init_got_refcount.glist = NULL; + htab->elf.init_plt_refcount.refcount = 0; + htab->elf.init_plt_refcount.glist = NULL; + htab->elf.init_got_offset.offset = 0; + htab->elf.init_got_offset.glist = NULL; + htab->elf.init_plt_offset.offset = 0; + htab->elf.init_plt_offset.glist = NULL; return &htab->elf.root; } @@ -3071,27 +3572,29 @@ ppc_stub_name (const asection *input_section, { len = 8 + 1 + strlen (h->elf.root.root.string) + 1 + 8 + 1; stub_name = bfd_malloc (len); - if (stub_name != NULL) - { - sprintf (stub_name, "%08x.%s+%x", - input_section->id & 0xffffffff, - h->elf.root.root.string, - (int) rel->r_addend & 0xffffffff); - } + if (stub_name == NULL) + return stub_name; + + sprintf (stub_name, "%08x.%s+%x", + input_section->id & 0xffffffff, + h->elf.root.root.string, + (int) rel->r_addend & 0xffffffff); } else { len = 8 + 1 + 8 + 1 + 8 + 1 + 8 + 1; stub_name = bfd_malloc (len); - if (stub_name != NULL) - { - sprintf (stub_name, "%08x.%x:%x+%x", - input_section->id & 0xffffffff, - sym_sec->id & 0xffffffff, - (int) ELF64_R_SYM (rel->r_info) & 0xffffffff, - (int) rel->r_addend & 0xffffffff); - } + if (stub_name == NULL) + return stub_name; + + sprintf (stub_name, "%08x.%x:%x+%x", + input_section->id & 0xffffffff, + sym_sec->id & 0xffffffff, + (int) ELF64_R_SYM (rel->r_info) & 0xffffffff, + (int) rel->r_addend & 0xffffffff); } + if (stub_name[len - 2] == '+' && stub_name[len - 1] == '0') + stub_name[len - 2] = 0; return stub_name; } @@ -3101,12 +3604,11 @@ ppc_stub_name (const asection *input_section, static struct ppc_stub_hash_entry * ppc_get_stub_entry (const asection *input_section, const asection *sym_sec, - struct elf_link_hash_entry *hash, + struct ppc_link_hash_entry *h, const Elf_Internal_Rela *rel, struct ppc_link_hash_table *htab) { struct ppc_stub_hash_entry *stub_entry; - struct ppc_link_hash_entry *h = (struct ppc_link_hash_entry *) hash; const asection *id_sec; /* If this input section is part of a group of sections sharing one @@ -3185,9 +3687,8 @@ ppc_add_stub (const char *stub_name, TRUE, FALSE); if (stub_entry == NULL) { - (*_bfd_error_handler) (_("%s: cannot create stub entry %s"), - bfd_archive_filename (section->owner), - stub_name); + (*_bfd_error_handler) (_("%B: cannot create stub entry %s"), + section->owner, stub_name); return NULL; } @@ -3210,25 +3711,37 @@ create_linkage_sections (bfd *dynobj, struct bfd_link_info *info) /* Create .sfpr for code to save and restore fp regs. */ flags = (SEC_ALLOC | SEC_LOAD | SEC_CODE | SEC_READONLY | SEC_HAS_CONTENTS | SEC_IN_MEMORY | SEC_LINKER_CREATED); - htab->sfpr = bfd_make_section_anyway (dynobj, ".sfpr"); + htab->sfpr = bfd_make_section_anyway_with_flags (dynobj, ".sfpr", + flags); if (htab->sfpr == NULL - || ! bfd_set_section_flags (dynobj, htab->sfpr, flags) || ! bfd_set_section_alignment (dynobj, htab->sfpr, 2)) return FALSE; /* Create .glink for lazy dynamic linking support. */ - htab->glink = bfd_make_section_anyway (dynobj, ".glink"); + htab->glink = bfd_make_section_anyway_with_flags (dynobj, ".glink", + flags); if (htab->glink == NULL - || ! bfd_set_section_flags (dynobj, htab->glink, flags) || ! bfd_set_section_alignment (dynobj, htab->glink, 2)) return FALSE; - /* Create .branch_lt for plt_branch stubs. */ - flags = (SEC_ALLOC | SEC_LOAD - | SEC_HAS_CONTENTS | SEC_IN_MEMORY | SEC_LINKER_CREATED); - htab->brlt = bfd_make_section_anyway (dynobj, ".branch_lt"); + /* Create branch lookup table for plt_branch stubs. */ + if (info->shared) + { + flags = (SEC_ALLOC | SEC_LOAD + | SEC_HAS_CONTENTS | SEC_IN_MEMORY | SEC_LINKER_CREATED); + htab->brlt + = bfd_make_section_anyway_with_flags (dynobj, ".data.rel.ro.brlt", + flags); + } + else + { + flags = (SEC_ALLOC | SEC_LOAD | SEC_READONLY + | SEC_HAS_CONTENTS | SEC_IN_MEMORY | SEC_LINKER_CREATED); + htab->brlt + = bfd_make_section_anyway_with_flags (dynobj, ".rodata.brlt", flags); + } + if (htab->brlt == NULL - || ! bfd_set_section_flags (dynobj, htab->brlt, flags) || ! bfd_set_section_alignment (dynobj, htab->brlt, 3)) return FALSE; @@ -3236,12 +3749,25 @@ create_linkage_sections (bfd *dynobj, struct bfd_link_info *info) { flags = (SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_HAS_CONTENTS | SEC_IN_MEMORY | SEC_LINKER_CREATED); - htab->relbrlt = bfd_make_section_anyway (dynobj, ".rela.branch_lt"); - if (!htab->relbrlt - || ! bfd_set_section_flags (dynobj, htab->relbrlt, flags) - || ! bfd_set_section_alignment (dynobj, htab->relbrlt, 3)) - return FALSE; + htab->relbrlt + = bfd_make_section_anyway_with_flags (dynobj, ".rela.data.rel.ro.brlt", + flags); } + else if (info->emitrelocations) + { + flags = (SEC_ALLOC | SEC_LOAD | SEC_READONLY + | SEC_HAS_CONTENTS | SEC_IN_MEMORY | SEC_LINKER_CREATED); + htab->relbrlt + = bfd_make_section_anyway_with_flags (dynobj, ".rela.rodata.brlt", + flags); + } + else + return TRUE; + + if (!htab->relbrlt + || ! bfd_set_section_alignment (dynobj, htab->relbrlt, 3)) + return FALSE; + return TRUE; } @@ -3268,15 +3794,14 @@ create_got_section (bfd *abfd, struct bfd_link_info *info) flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY | SEC_LINKER_CREATED); - got = bfd_make_section (abfd, ".got"); + got = bfd_make_section_anyway_with_flags (abfd, ".got", flags); if (!got - || !bfd_set_section_flags (abfd, got, flags) || !bfd_set_section_alignment (abfd, got, 3)) return FALSE; - relgot = bfd_make_section (abfd, ".rela.got"); + relgot = bfd_make_section_anyway_with_flags (abfd, ".rela.got", + flags | SEC_READONLY); if (!relgot - || ! bfd_set_section_flags (abfd, relgot, flags | SEC_READONLY) || ! bfd_set_section_alignment (abfd, relgot, 3)) return FALSE; @@ -3311,16 +3836,49 @@ ppc64_elf_create_dynamic_sections (bfd *dynobj, struct bfd_link_info *info) return TRUE; } +/* Merge PLT info on FROM with that on TO. */ + +static void +move_plt_plist (struct ppc_link_hash_entry *from, + struct ppc_link_hash_entry *to) +{ + if (from->elf.plt.plist != NULL) + { + if (to->elf.plt.plist != NULL) + { + struct plt_entry **entp; + struct plt_entry *ent; + + for (entp = &from->elf.plt.plist; (ent = *entp) != NULL; ) + { + struct plt_entry *dent; + + for (dent = to->elf.plt.plist; dent != NULL; dent = dent->next) + if (dent->addend == ent->addend) + { + dent->plt.refcount += ent->plt.refcount; + *entp = ent->next; + break; + } + if (dent == NULL) + entp = &ent->next; + } + *entp = to->elf.plt.plist; + } + + to->elf.plt.plist = from->elf.plt.plist; + from->elf.plt.plist = NULL; + } +} + /* Copy the extra info we tack onto an elf_link_hash_entry. */ static void -ppc64_elf_copy_indirect_symbol - (const struct elf_backend_data *bed ATTRIBUTE_UNUSED, - struct elf_link_hash_entry *dir, - struct elf_link_hash_entry *ind) +ppc64_elf_copy_indirect_symbol (struct bfd_link_info *info, + struct elf_link_hash_entry *dir, + struct elf_link_hash_entry *ind) { struct ppc_link_hash_entry *edir, *eind; - flagword mask; edir = (struct ppc_link_hash_entry *) dir; eind = (struct ppc_link_hash_entry *) ind; @@ -3333,10 +3891,7 @@ ppc64_elf_copy_indirect_symbol struct ppc_dyn_relocs **pp; struct ppc_dyn_relocs *p; - if (eind->elf.root.type == bfd_link_hash_indirect) - abort (); - - /* Add reloc counts against the weak sym to the strong sym + /* Add reloc counts against the indirect sym to the direct sym list. Merge any entries against the same section. */ for (pp = &eind->dyn_relocs; (p = *pp) != NULL; ) { @@ -3362,21 +3917,20 @@ ppc64_elf_copy_indirect_symbol edir->is_func |= eind->is_func; edir->is_func_descriptor |= eind->is_func_descriptor; - edir->is_entry |= eind->is_entry; edir->tls_mask |= eind->tls_mask; - mask = (ELF_LINK_HASH_REF_DYNAMIC | ELF_LINK_HASH_REF_REGULAR - | ELF_LINK_HASH_REF_REGULAR_NONWEAK | ELF_LINK_NON_GOT_REF - | ELF_LINK_HASH_NEEDS_PLT); /* If called to transfer flags for a weakdef during processing - of elf_adjust_dynamic_symbol, don't copy ELF_LINK_NON_GOT_REF. + of elf_adjust_dynamic_symbol, don't copy NON_GOT_REF. We clear it ourselves for ELIMINATE_COPY_RELOCS. */ - if (ELIMINATE_COPY_RELOCS - && eind->elf.root.type != bfd_link_hash_indirect - && (edir->elf.elf_link_hash_flags & ELF_LINK_HASH_DYNAMIC_ADJUSTED) != 0) - mask &= ~ELF_LINK_NON_GOT_REF; + if (!(ELIMINATE_COPY_RELOCS + && eind->elf.root.type != bfd_link_hash_indirect + && edir->elf.dynamic_adjusted)) + edir->elf.non_got_ref |= eind->elf.non_got_ref; - edir->elf.elf_link_hash_flags |= eind->elf.elf_link_hash_flags & mask; + edir->elf.ref_dynamic |= eind->elf.ref_dynamic; + edir->elf.ref_regular |= eind->elf.ref_regular; + edir->elf.ref_regular_nonweak |= eind->elf.ref_regular_nonweak; + edir->elf.needs_plt |= eind->elf.needs_plt; /* If we were called to copy over info for a weak sym, that's all. */ if (eind->elf.root.type != bfd_link_hash_indirect) @@ -3415,83 +3969,262 @@ ppc64_elf_copy_indirect_symbol } /* And plt entries. */ - if (eind->elf.plt.plist != NULL) - { - if (edir->elf.plt.plist != NULL) - { - struct plt_entry **entp; - struct plt_entry *ent; - - for (entp = &eind->elf.plt.plist; (ent = *entp) != NULL; ) - { - struct plt_entry *dent; - - for (dent = edir->elf.plt.plist; dent != NULL; dent = dent->next) - if (dent->addend == ent->addend) - { - dent->plt.refcount += ent->plt.refcount; - *entp = ent->next; - break; - } - if (dent == NULL) - entp = &ent->next; - } - *entp = edir->elf.plt.plist; - } + move_plt_plist (eind, edir); - edir->elf.plt.plist = eind->elf.plt.plist; - eind->elf.plt.plist = NULL; - } - - if (edir->elf.dynindx == -1) + if (eind->elf.dynindx != -1) { + if (edir->elf.dynindx != -1) + _bfd_elf_strtab_delref (elf_hash_table (info)->dynstr, + edir->elf.dynstr_index); edir->elf.dynindx = eind->elf.dynindx; edir->elf.dynstr_index = eind->elf.dynstr_index; eind->elf.dynindx = -1; eind->elf.dynstr_index = 0; } - else - BFD_ASSERT (eind->elf.dynindx == -1); } -/* Set a flag, used by ppc64_elf_gc_mark_hook, on the entry symbol and - symbols undefined on the command-line. */ +/* Find the function descriptor hash entry from the given function code + hash entry FH. Link the entries via their OH fields. */ -bfd_boolean -ppc64_elf_mark_entry_syms (struct bfd_link_info *info) +static struct ppc_link_hash_entry * +get_fdh (struct ppc_link_hash_entry *fh, struct ppc_link_hash_table *htab) { - struct ppc_link_hash_table *htab; - struct bfd_sym_chain *sym; + struct ppc_link_hash_entry *fdh = fh->oh; - htab = ppc_hash_table (info); - for (sym = info->gc_sym_list; sym; sym = sym->next) + if (fdh == NULL) { - struct elf_link_hash_entry *h; + const char *fd_name = fh->elf.root.root.string + 1; - h = elf_link_hash_lookup (&htab->elf, sym->name, FALSE, FALSE, FALSE); - if (h != NULL) - ((struct ppc_link_hash_entry *) h)->is_entry = 1; + fdh = (struct ppc_link_hash_entry *) + elf_link_hash_lookup (&htab->elf, fd_name, FALSE, FALSE, FALSE); + if (fdh != NULL) + { + fdh->is_func_descriptor = 1; + fdh->oh = fh; + fh->is_func = 1; + fh->oh = fdh; + } } - return TRUE; + + return fdh; } -/* Hack symbols defined in .opd sections to be function type. */ +/* Make a fake function descriptor sym for the code sym FH. */ + +static struct ppc_link_hash_entry * +make_fdh (struct bfd_link_info *info, + struct ppc_link_hash_entry *fh) +{ + bfd *abfd; + asymbol *newsym; + struct bfd_link_hash_entry *bh; + struct ppc_link_hash_entry *fdh; + + abfd = fh->elf.root.u.undef.abfd; + newsym = bfd_make_empty_symbol (abfd); + newsym->name = fh->elf.root.root.string + 1; + newsym->section = bfd_und_section_ptr; + newsym->value = 0; + newsym->flags = BSF_WEAK; + + bh = NULL; + if (!_bfd_generic_link_add_one_symbol (info, abfd, newsym->name, + newsym->flags, newsym->section, + newsym->value, NULL, FALSE, FALSE, + &bh)) + return NULL; + + fdh = (struct ppc_link_hash_entry *) bh; + fdh->elf.non_elf = 0; + fdh->fake = 1; + fdh->is_func_descriptor = 1; + fdh->oh = fh; + fh->is_func = 1; + fh->oh = fdh; + return fdh; +} + +/* Hacks to support old ABI code. + When making function calls, old ABI code references function entry + points (dot symbols), while new ABI code references the function + descriptor symbol. We need to make any combination of reference and + definition work together, without breaking archive linking. + + For a defined function "foo" and an undefined call to "bar": + An old object defines "foo" and ".foo", references ".bar" (possibly + "bar" too). + A new object defines "foo" and references "bar". + + A new object thus has no problem with its undefined symbols being + satisfied by definitions in an old object. On the other hand, the + old object won't have ".bar" satisfied by a new object. */ + +/* Fix function descriptor symbols defined in .opd sections to be + function type. */ static bfd_boolean -ppc64_elf_add_symbol_hook (bfd *ibfd ATTRIBUTE_UNUSED, +ppc64_elf_add_symbol_hook (bfd *ibfd, struct bfd_link_info *info ATTRIBUTE_UNUSED, Elf_Internal_Sym *isym, - const char **name ATTRIBUTE_UNUSED, + const char **name, flagword *flags ATTRIBUTE_UNUSED, asection **sec, bfd_vma *value ATTRIBUTE_UNUSED) { - if (strcmp (bfd_get_section_name (ibfd, *sec), ".opd") == 0) + if (*sec != NULL + && strcmp (bfd_get_section_name (ibfd, *sec), ".opd") == 0) isym->st_info = ELF_ST_INFO (ELF_ST_BIND (isym->st_info), STT_FUNC); + + if ((*name)[0] == '.' + && ELF_ST_BIND (isym->st_info) == STB_GLOBAL + && ELF_ST_TYPE (isym->st_info) < STT_SECTION + && is_ppc64_elf_target (ibfd->xvec)) + ppc64_elf_tdata (ibfd)->u.has_dotsym = 1; + + return TRUE; +} + +/* This function makes an old ABI object reference to ".bar" cause the + inclusion of a new ABI object archive that defines "bar". + NAME is a symbol defined in an archive. Return a symbol in the hash + table that might be satisfied by the archive symbols. */ + +static struct elf_link_hash_entry * +ppc64_elf_archive_symbol_lookup (bfd *abfd, + struct bfd_link_info *info, + const char *name) +{ + struct elf_link_hash_entry *h; + char *dot_name; + size_t len; + + h = _bfd_elf_archive_symbol_lookup (abfd, info, name); + if (h != NULL + /* Don't return this sym if it is a fake function descriptor + created by add_symbol_adjust. */ + && !(h->root.type == bfd_link_hash_undefweak + && ((struct ppc_link_hash_entry *) h)->fake)) + return h; + + if (name[0] == '.') + return h; + + len = strlen (name); + dot_name = bfd_alloc (abfd, len + 2); + if (dot_name == NULL) + return (struct elf_link_hash_entry *) 0 - 1; + dot_name[0] = '.'; + memcpy (dot_name + 1, name, len + 1); + h = _bfd_elf_archive_symbol_lookup (abfd, info, dot_name); + bfd_release (abfd, dot_name); + return h; +} + +/* This function satisfies all old ABI object references to ".bar" if a + new ABI object defines "bar". Well, at least, undefined dot symbols + are made weak. This stops later archive searches from including an + object if we already have a function descriptor definition. It also + prevents the linker complaining about undefined symbols. + We also check and correct mismatched symbol visibility here. The + most restrictive visibility of the function descriptor and the + function entry symbol is used. */ + +struct add_symbol_adjust_data +{ + struct bfd_link_info *info; + bfd_boolean ok; +}; + +static bfd_boolean +add_symbol_adjust (struct elf_link_hash_entry *h, void *inf) +{ + struct add_symbol_adjust_data *data; + struct ppc_link_hash_table *htab; + struct ppc_link_hash_entry *eh; + struct ppc_link_hash_entry *fdh; + + if (h->root.type == bfd_link_hash_indirect) + return TRUE; + + if (h->root.type == bfd_link_hash_warning) + h = (struct elf_link_hash_entry *) h->root.u.i.link; + + if (h->root.root.string[0] != '.') + return TRUE; + + data = inf; + htab = ppc_hash_table (data->info); + eh = (struct ppc_link_hash_entry *) h; + fdh = get_fdh (eh, htab); + if (fdh == NULL + && !data->info->relocatable + && (eh->elf.root.type == bfd_link_hash_undefined + || eh->elf.root.type == bfd_link_hash_undefweak) + && eh->elf.ref_regular) + { + /* Make an undefweak function descriptor sym, which is enough to + pull in an --as-needed shared lib, but won't cause link + errors. Archives are handled elsewhere. */ + fdh = make_fdh (data->info, eh); + if (fdh == NULL) + data->ok = FALSE; + else + fdh->elf.ref_regular = 1; + } + else if (fdh != NULL) + { + unsigned entry_vis = ELF_ST_VISIBILITY (eh->elf.other) - 1; + unsigned descr_vis = ELF_ST_VISIBILITY (fdh->elf.other) - 1; + if (entry_vis < descr_vis) + fdh->elf.other += entry_vis - descr_vis; + else if (entry_vis > descr_vis) + eh->elf.other += descr_vis - entry_vis; + + if ((fdh->elf.root.type == bfd_link_hash_defined + || fdh->elf.root.type == bfd_link_hash_defweak) + && eh->elf.root.type == bfd_link_hash_undefined) + { + eh->elf.root.type = bfd_link_hash_undefweak; + eh->was_undefined = 1; + htab->twiddled_syms = 1; + } + } + return TRUE; } static bfd_boolean +ppc64_elf_check_directives (bfd *abfd, struct bfd_link_info *info) +{ + struct ppc_link_hash_table *htab; + struct add_symbol_adjust_data data; + + if (!is_ppc64_elf_target (abfd->xvec)) + return TRUE; + + if (!ppc64_elf_tdata (abfd)->u.has_dotsym) + return TRUE; + ppc64_elf_tdata (abfd)->u.deleted_section = NULL; + + htab = ppc_hash_table (info); + if (!is_ppc64_elf_target (htab->elf.root.creator)) + return TRUE; + + data.info = info; + data.ok = TRUE; + elf_link_hash_traverse (&htab->elf, add_symbol_adjust, &data); + + /* We need to fix the undefs list for any syms we have twiddled to + undef_weak. */ + if (htab->twiddled_syms) + { + bfd_link_repair_undef_list (&htab->elf.root); + htab->twiddled_syms = 0; + } + return data.ok; +} + +static bfd_boolean update_local_sym_info (bfd *abfd, Elf_Internal_Shdr *symtab_hdr, unsigned long r_symndx, bfd_vma r_addend, int tls_type) { @@ -3559,36 +4292,13 @@ update_plt_info (bfd *abfd, struct ppc_link_hash_entry *eh, bfd_vma addend) eh->elf.plt.plist = ent; } ent->plt.refcount += 1; - eh->elf.elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_PLT; - eh->is_func = 1; + eh->elf.needs_plt = 1; + if (eh->elf.root.root.string[0] == '.' + && eh->elf.root.root.string[1] != '\0') + eh->is_func = 1; return TRUE; } -/* Find the function descriptor hash entry from the given function code - hash entry FH. Link the entries via their OH fields. */ -static struct ppc_link_hash_entry * -get_fdh (struct ppc_link_hash_entry *fh, struct ppc_link_hash_table *htab) -{ - struct ppc_link_hash_entry *fdh = (struct ppc_link_hash_entry *) fh->oh; - - if (fdh == NULL) - { - const char *fd_name = fh->elf.root.root.string + 1; - - fdh = (struct ppc_link_hash_entry *) - elf_link_hash_lookup (&htab->elf, fd_name, FALSE, FALSE, FALSE); - if (fdh != NULL) - { - fdh->is_func_descriptor = 1; - fdh->oh = &fh->elf; - fh->is_func = 1; - fh->oh = &fdh->elf; - } - } - - return fdh; -} - /* Look through the relocs for a section during the first phase, and calculate needed space in the global offset table, procedure linkage table, and dynamic reloc sections. */ @@ -3644,7 +4354,7 @@ ppc64_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, }; bfd_size_type amt; - amt = sec->_raw_size * sizeof (union opd_info) / 24; + amt = sec->size * sizeof (union opd_info) / 8; opd_sym_map = bfd_zalloc (abfd, amt); if (opd_sym_map == NULL) return FALSE; @@ -3667,7 +4377,12 @@ ppc64_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, if (r_symndx < symtab_hdr->sh_info) h = NULL; else - h = sym_hashes[r_symndx - symtab_hdr->sh_info]; + { + h = sym_hashes[r_symndx - symtab_hdr->sh_info]; + 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; + } r_type = ELF64_R_TYPE (rel->r_info); switch (r_type) @@ -3712,7 +4427,7 @@ ppc64_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, case R_PPC64_GOT16_LO: case R_PPC64_GOT16_LO_DS: /* This symbol requires a global offset table entry. */ - sec->has_gp_reloc = 1; + sec->has_toc_reloc = 1; if (ppc64_elf_tdata (abfd)->got == NULL && !create_got_section (abfd, info)) return FALSE; @@ -3802,7 +4517,7 @@ ppc64_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, case R_PPC64_TOC16_HA: case R_PPC64_TOC16_DS: case R_PPC64_TOC16_LO_DS: - sec->has_gp_reloc = 1; + sec->has_toc_reloc = 1; break; /* This relocation describes the C++ object vtable hierarchy. @@ -3822,27 +4537,51 @@ ppc64_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, case R_PPC64_REL14: case R_PPC64_REL14_BRTAKEN: case R_PPC64_REL14_BRNTAKEN: - htab->has_14bit_branch = 1; + { + asection *dest = NULL; + + /* Heuristic: If jumping outside our section, chances are + we are going to need a stub. */ + if (h != NULL) + { + /* If the sym is weak it may be overridden later, so + don't assume we know where a weak sym lives. */ + if (h->root.type == bfd_link_hash_defined) + dest = h->root.u.def.section; + } + else + dest = bfd_section_from_r_symndx (abfd, &htab->sym_sec, + sec, r_symndx); + if (dest != sec) + htab->has_14bit_branch = 1; + } /* Fall through. */ case R_PPC64_REL24: - if (h != NULL - && h->root.root.string[0] == '.' - && h->root.root.string[1] != 0) + if (h != NULL) { /* We may need a .plt entry if the function this reloc refers to is in a shared lib. */ if (!update_plt_info (abfd, (struct ppc_link_hash_entry *) h, rel->r_addend)) return FALSE; - if (h == htab->tls_get_addr) + if (h == &htab->tls_get_addr->elf + || h == &htab->tls_get_addr_fd->elf) sec->has_tls_reloc = 1; - else if ((strncmp (h->root.root.string, ".__tls_get_addr", 15) - == 0) + else if (htab->tls_get_addr == NULL + && !strncmp (h->root.root.string, ".__tls_get_addr", 15) && (h->root.root.string[15] == 0 || h->root.root.string[15] == '@')) { - htab->tls_get_addr = h; + htab->tls_get_addr = (struct ppc_link_hash_entry *) h; + sec->has_tls_reloc = 1; + } + else if (htab->tls_get_addr_fd == NULL + && !strncmp (h->root.root.string, "__tls_get_addr", 14) + && (h->root.root.string[14] == 0 + || h->root.root.string[14] == '@')) + { + htab->tls_get_addr_fd = (struct ppc_link_hash_entry *) h; sec->has_tls_reloc = 1; } } @@ -3888,7 +4627,7 @@ ppc64_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, if (ppc64_elf_section_data (sec)->t_symndx == NULL) { /* One extra to simplify get_tls_mask. */ - bfd_size_type amt = sec->_raw_size * sizeof (unsigned) / 8 + 1; + bfd_size_type amt = sec->size * sizeof (unsigned) / 8 + 1; ppc64_elf_section_data (sec)->t_symndx = bfd_zalloc (abfd, amt); if (ppc64_elf_section_data (sec)->t_symndx == NULL) return FALSE; @@ -3923,24 +4662,29 @@ ppc64_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, case R_PPC64_ADDR64: if (opd_sym_map != NULL - && h != NULL - && h->root.root.string[0] == '.' - && h->root.root.string[1] != 0) - get_fdh ((struct ppc_link_hash_entry *) h, htab); - - if (opd_sym_map != NULL - && h == NULL && rel + 1 < rel_end && ELF64_R_TYPE ((rel + 1)->r_info) == R_PPC64_TOC) { - asection *s; + if (h != NULL) + { + if (h->root.root.string[0] == '.' + && h->root.root.string[1] != 0 + && get_fdh ((struct ppc_link_hash_entry *) h, htab)) + ; + else + ((struct ppc_link_hash_entry *) h)->is_func = 1; + } + else + { + asection *s; - s = bfd_section_from_r_symndx (abfd, &htab->sym_sec, sec, - r_symndx); - if (s == NULL) - return FALSE; - else if (s != sec) - opd_sym_map[rel->r_offset / 24] = s; + s = bfd_section_from_r_symndx (abfd, &htab->sym_sec, sec, + r_symndx); + if (s == NULL) + return FALSE; + else if (s != sec) + opd_sym_map[rel->r_offset / 8] = s; + } } /* Fall through. */ @@ -3968,7 +4712,7 @@ ppc64_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, case R_PPC64_TOC: if (h != NULL && !info->shared) /* We may need a copy reloc. */ - h->elf_link_hash_flags |= ELF_LINK_NON_GOT_REF; + h->non_got_ref = 1; /* Don't propagate .opd relocs. */ if (NO_OPD_RELOCS && opd_sym_map != NULL) @@ -4001,14 +4745,12 @@ ppc64_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, || (h != NULL && (! info->symbolic || h->root.type == bfd_link_hash_defweak - || (h->elf_link_hash_flags - & ELF_LINK_HASH_DEF_REGULAR) == 0)))) + || !h->def_regular)))) || (ELIMINATE_COPY_RELOCS && !info->shared && h != NULL && (h->root.type == bfd_link_hash_defweak - || (h->elf_link_hash_flags - & ELF_LINK_HASH_DEF_REGULAR) == 0))) + || !h->def_regular))) { struct ppc_dyn_relocs *p; struct ppc_dyn_relocs **head; @@ -4033,8 +4775,8 @@ ppc64_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, name + 5) != 0) { (*_bfd_error_handler) - (_("%s: bad relocation section name `%s\'"), - bfd_archive_filename (abfd), name); + (_("%B: bad relocation section name `%s\'"), + abfd, name); bfd_set_error (bfd_error_bad_value); } @@ -4044,13 +4786,13 @@ ppc64_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, { flagword flags; - sreloc = bfd_make_section (dynobj, name); flags = (SEC_HAS_CONTENTS | SEC_READONLY - | SEC_IN_MEMORY | SEC_LINKER_CREATED); - if ((sec->flags & SEC_ALLOC) != 0) - flags |= SEC_ALLOC | SEC_LOAD; + | SEC_IN_MEMORY | SEC_LINKER_CREATED + | SEC_ALLOC | SEC_LOAD); + sreloc = bfd_make_section_with_flags (dynobj, + name, + flags); if (sreloc == NULL - || ! bfd_set_section_flags (dynobj, sreloc, flags) || ! bfd_set_section_alignment (dynobj, sreloc, 3)) return FALSE; } @@ -4070,13 +4812,15 @@ ppc64_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, easily. Oh well. */ asection *s; + void *vpp; + s = bfd_section_from_r_symndx (abfd, &htab->sym_sec, sec, r_symndx); if (s == NULL) return FALSE; - head = ((struct ppc_dyn_relocs **) - &elf_section_data (s)->local_dynrel); + vpp = &elf_section_data (s)->local_dynrel; + head = (struct ppc_dyn_relocs **) vpp; } p = *head; @@ -4106,22 +4850,235 @@ ppc64_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, return TRUE; } +/* OFFSET in OPD_SEC specifies a function descriptor. Return the address + of the code entry point, and its section. */ + +static bfd_vma +opd_entry_value (asection *opd_sec, + bfd_vma offset, + asection **code_sec, + bfd_vma *code_off) +{ + bfd *opd_bfd = opd_sec->owner; + Elf_Internal_Rela *relocs; + Elf_Internal_Rela *lo, *hi, *look; + bfd_vma val; + + /* No relocs implies we are linking a --just-symbols object. */ + if (opd_sec->reloc_count == 0) + { + bfd_vma val; + + if (!bfd_get_section_contents (opd_bfd, opd_sec, &val, offset, 8)) + return (bfd_vma) -1; + + if (code_sec != NULL) + { + asection *sec, *likely = NULL; + for (sec = opd_bfd->sections; sec != NULL; sec = sec->next) + if (sec->vma <= val + && (sec->flags & SEC_LOAD) != 0 + && (sec->flags & SEC_ALLOC) != 0) + likely = sec; + if (likely != NULL) + { + *code_sec = likely; + if (code_off != NULL) + *code_off = val - likely->vma; + } + } + return val; + } + + relocs = ppc64_elf_tdata (opd_bfd)->opd_relocs; + if (relocs == NULL) + relocs = _bfd_elf_link_read_relocs (opd_bfd, opd_sec, NULL, NULL, TRUE); + + /* Go find the opd reloc at the sym address. */ + lo = relocs; + BFD_ASSERT (lo != NULL); + hi = lo + opd_sec->reloc_count - 1; /* ignore last reloc */ + val = (bfd_vma) -1; + while (lo < hi) + { + look = lo + (hi - lo) / 2; + if (look->r_offset < offset) + lo = look + 1; + else if (look->r_offset > offset) + hi = look; + else + { + Elf_Internal_Shdr *symtab_hdr = &elf_tdata (opd_bfd)->symtab_hdr; + if (ELF64_R_TYPE (look->r_info) == R_PPC64_ADDR64 + && ELF64_R_TYPE ((look + 1)->r_info) == R_PPC64_TOC) + { + unsigned long symndx = ELF64_R_SYM (look->r_info); + asection *sec; + + if (symndx < symtab_hdr->sh_info) + { + Elf_Internal_Sym *sym; + + sym = (Elf_Internal_Sym *) symtab_hdr->contents; + if (sym == NULL) + { + sym = bfd_elf_get_elf_syms (opd_bfd, symtab_hdr, + symtab_hdr->sh_info, + 0, NULL, NULL, NULL); + if (sym == NULL) + break; + symtab_hdr->contents = (bfd_byte *) sym; + } + + sym += symndx; + val = sym->st_value; + sec = NULL; + if ((sym->st_shndx != SHN_UNDEF + && sym->st_shndx < SHN_LORESERVE) + || sym->st_shndx > SHN_HIRESERVE) + sec = bfd_section_from_elf_index (opd_bfd, sym->st_shndx); + BFD_ASSERT ((sec->flags & SEC_MERGE) == 0); + } + else + { + struct elf_link_hash_entry **sym_hashes; + struct elf_link_hash_entry *rh; + + sym_hashes = elf_sym_hashes (opd_bfd); + rh = sym_hashes[symndx - symtab_hdr->sh_info]; + while (rh->root.type == bfd_link_hash_indirect + || rh->root.type == bfd_link_hash_warning) + rh = ((struct elf_link_hash_entry *) rh->root.u.i.link); + BFD_ASSERT (rh->root.type == bfd_link_hash_defined + || rh->root.type == bfd_link_hash_defweak); + val = rh->root.u.def.value; + sec = rh->root.u.def.section; + } + val += look->r_addend; + if (code_off != NULL) + *code_off = val; + if (code_sec != NULL) + *code_sec = sec; + if (sec != NULL && sec->output_section != NULL) + val += sec->output_section->vma + sec->output_offset; + } + break; + } + } + + return val; +} + +/* Mark sections containing dynamically referenced symbols. When + building shared libraries, we must assume that any visible symbol is + referenced. */ + +static bfd_boolean +ppc64_elf_gc_mark_dynamic_ref (struct elf_link_hash_entry *h, void *inf) +{ + struct bfd_link_info *info = (struct bfd_link_info *) inf; + struct ppc_link_hash_entry *eh = (struct ppc_link_hash_entry *) h; + + if (eh->elf.root.type == bfd_link_hash_warning) + eh = (struct ppc_link_hash_entry *) eh->elf.root.u.i.link; + + /* Dynamic linking info is on the func descriptor sym. */ + if (eh->oh != NULL + && eh->oh->is_func_descriptor + && (eh->oh->elf.root.type == bfd_link_hash_defined + || eh->oh->elf.root.type == bfd_link_hash_defweak)) + eh = eh->oh; + + if ((eh->elf.root.type == bfd_link_hash_defined + || eh->elf.root.type == bfd_link_hash_defweak) + && (eh->elf.ref_dynamic + || (!info->executable + && eh->elf.def_regular + && ELF_ST_VISIBILITY (eh->elf.other) != STV_INTERNAL + && ELF_ST_VISIBILITY (eh->elf.other) != STV_HIDDEN))) + { + asection *code_sec; + + eh->elf.root.u.def.section->flags |= SEC_KEEP; + + /* Function descriptor syms cause the associated + function code sym section to be marked. */ + if (eh->is_func_descriptor + && (eh->oh->elf.root.type == bfd_link_hash_defined + || eh->oh->elf.root.type == bfd_link_hash_defweak)) + eh->oh->elf.root.u.def.section->flags |= SEC_KEEP; + else if (get_opd_info (eh->elf.root.u.def.section) != NULL + && opd_entry_value (eh->elf.root.u.def.section, + eh->elf.root.u.def.value, + &code_sec, NULL) != (bfd_vma) -1) + code_sec->flags |= SEC_KEEP; + } + + return TRUE; +} + /* Return the section that should be marked against GC for a given relocation. */ static asection * ppc64_elf_gc_mark_hook (asection *sec, - struct bfd_link_info *info ATTRIBUTE_UNUSED, + struct bfd_link_info *info, Elf_Internal_Rela *rel, struct elf_link_hash_entry *h, Elf_Internal_Sym *sym) { - asection *rsec = NULL; + asection *rsec; + + /* First mark all our entry sym sections. */ + if (info->gc_sym_list != NULL) + { + struct ppc_link_hash_table *htab = ppc_hash_table (info); + struct bfd_sym_chain *sym = info->gc_sym_list; + + info->gc_sym_list = NULL; + for (; sym != NULL; sym = sym->next) + { + struct ppc_link_hash_entry *eh; + + eh = (struct ppc_link_hash_entry *) + elf_link_hash_lookup (&htab->elf, sym->name, FALSE, FALSE, FALSE); + if (eh == NULL) + continue; + if (eh->elf.root.type != bfd_link_hash_defined + && eh->elf.root.type != bfd_link_hash_defweak) + continue; + + if (eh->is_func_descriptor + && (eh->oh->elf.root.type == bfd_link_hash_defined + || eh->oh->elf.root.type == bfd_link_hash_defweak)) + rsec = eh->oh->elf.root.u.def.section; + else if (get_opd_info (eh->elf.root.u.def.section) != NULL + && opd_entry_value (eh->elf.root.u.def.section, + eh->elf.root.u.def.value, + &rsec, NULL) != (bfd_vma) -1) + ; + else + continue; + + if (!rsec->gc_mark) + _bfd_elf_gc_mark (info, rsec, ppc64_elf_gc_mark_hook); + + rsec = eh->elf.root.u.def.section; + if (!rsec->gc_mark) + _bfd_elf_gc_mark (info, rsec, ppc64_elf_gc_mark_hook); + } + } + + /* Syms return NULL if we're marking .opd, so we avoid marking all + function sections, as all functions are referenced in .opd. */ + rsec = NULL; + if (get_opd_info (sec) != NULL) + return rsec; if (h != NULL) { enum elf_ppc64_reloc_type r_type; - struct ppc_link_hash_entry *fdh; + struct ppc_link_hash_entry *eh; r_type = ELF64_R_TYPE (rel->r_info); switch (r_type) @@ -4135,20 +5092,36 @@ ppc64_elf_gc_mark_hook (asection *sec, { case bfd_link_hash_defined: case bfd_link_hash_defweak: - fdh = (struct ppc_link_hash_entry *) h; + eh = (struct ppc_link_hash_entry *) h; + if (eh->oh != NULL + && eh->oh->is_func_descriptor + && (eh->oh->elf.root.type == bfd_link_hash_defined + || eh->oh->elf.root.type == bfd_link_hash_defweak)) + eh = eh->oh; /* Function descriptor syms cause the associated function code sym section to be marked. */ - if (fdh->is_func_descriptor) - rsec = fdh->oh->root.u.def.section; - - /* Function entry syms return NULL if they are in .opd - and are not ._start (or others undefined on the ld - command line). Thus we avoid marking all function - sections, as all functions are referenced in .opd. */ - else if ((fdh->oh != NULL - && ((struct ppc_link_hash_entry *) fdh->oh)->is_entry) - || ppc64_elf_section_data (sec)->opd.func_sec == NULL) + if (eh->is_func_descriptor + && (eh->oh->elf.root.type == bfd_link_hash_defined + || eh->oh->elf.root.type == bfd_link_hash_defweak)) + { + /* They also mark their opd section. */ + if (!eh->elf.root.u.def.section->gc_mark) + _bfd_elf_gc_mark (info, eh->elf.root.u.def.section, + ppc64_elf_gc_mark_hook); + + rsec = eh->oh->elf.root.u.def.section; + } + else if (get_opd_info (eh->elf.root.u.def.section) != NULL + && opd_entry_value (eh->elf.root.u.def.section, + eh->elf.root.u.def.value, + &rsec, NULL) != (bfd_vma) -1) + { + if (!eh->elf.root.u.def.section->gc_mark) + _bfd_elf_gc_mark (info, eh->elf.root.u.def.section, + ppc64_elf_gc_mark_hook); + } + else rsec = h->root.u.def.section; break; @@ -4166,11 +5139,14 @@ ppc64_elf_gc_mark_hook (asection *sec, asection **opd_sym_section; rsec = bfd_section_from_elf_index (sec->owner, sym->st_shndx); - opd_sym_section = ppc64_elf_section_data (rsec)->opd.func_sec; + opd_sym_section = get_opd_info (rsec); if (opd_sym_section != NULL) - rsec = opd_sym_section[sym->st_value / 24]; - else if (ppc64_elf_section_data (sec)->opd.func_sec != NULL) - rsec = NULL; + { + if (!rsec->gc_mark) + _bfd_elf_gc_mark (info, rsec, ppc64_elf_gc_mark_hook); + + rsec = opd_sym_section[(sym->st_value + rel->r_addend) / 8]; + } } return rsec; @@ -4216,6 +5192,9 @@ ppc64_elf_gc_sweep_hook (bfd *abfd, struct bfd_link_info *info, struct ppc_dyn_relocs *p; h = sym_hashes[r_symndx - symtab_hdr->sh_info]; + 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; eh = (struct ppc_link_hash_entry *) h; for (pp = &eh->dyn_relocs; (p = *pp) != NULL; pp = &p->next) @@ -4315,9 +5294,235 @@ ppc64_elf_gc_sweep_hook (bfd *abfd, struct bfd_link_info *info, return TRUE; } +/* The maximum size of .sfpr. */ +#define SFPR_MAX (218*4) + +struct sfpr_def_parms +{ + const char name[12]; + unsigned char lo, hi; + bfd_byte * (*write_ent) (bfd *, bfd_byte *, int); + bfd_byte * (*write_tail) (bfd *, bfd_byte *, int); +}; + +/* Auto-generate _save*, _rest* functions in .sfpr. */ + +static unsigned int +sfpr_define (struct bfd_link_info *info, const struct sfpr_def_parms *parm) +{ + struct ppc_link_hash_table *htab = ppc_hash_table (info); + unsigned int i; + size_t len = strlen (parm->name); + bfd_boolean writing = FALSE; + char sym[16]; + + memcpy (sym, parm->name, len); + sym[len + 2] = 0; + + for (i = parm->lo; i <= parm->hi; i++) + { + struct elf_link_hash_entry *h; + + sym[len + 0] = i / 10 + '0'; + sym[len + 1] = i % 10 + '0'; + h = elf_link_hash_lookup (&htab->elf, sym, FALSE, FALSE, TRUE); + if (h != NULL + && !h->def_regular) + { + h->root.type = bfd_link_hash_defined; + h->root.u.def.section = htab->sfpr; + h->root.u.def.value = htab->sfpr->size; + h->type = STT_FUNC; + h->def_regular = 1; + _bfd_elf_link_hash_hide_symbol (info, h, TRUE); + writing = TRUE; + if (htab->sfpr->contents == NULL) + { + htab->sfpr->contents = bfd_alloc (htab->elf.dynobj, SFPR_MAX); + if (htab->sfpr->contents == NULL) + return FALSE; + } + } + if (writing) + { + bfd_byte *p = htab->sfpr->contents + htab->sfpr->size; + if (i != parm->hi) + p = (*parm->write_ent) (htab->elf.dynobj, p, i); + else + p = (*parm->write_tail) (htab->elf.dynobj, p, i); + htab->sfpr->size = p - htab->sfpr->contents; + } + } + + return TRUE; +} + +static bfd_byte * +savegpr0 (bfd *abfd, bfd_byte *p, int r) +{ + bfd_put_32 (abfd, STD_R0_0R1 + (r << 21) + (1 << 16) - (32 - r) * 8, p); + return p + 4; +} + +static bfd_byte * +savegpr0_tail (bfd *abfd, bfd_byte *p, int r) +{ + p = savegpr0 (abfd, p, r); + bfd_put_32 (abfd, STD_R0_0R1 + 16, p); + p = p + 4; + bfd_put_32 (abfd, BLR, p); + return p + 4; +} + +static bfd_byte * +restgpr0 (bfd *abfd, bfd_byte *p, int r) +{ + bfd_put_32 (abfd, LD_R0_0R1 + (r << 21) + (1 << 16) - (32 - r) * 8, p); + return p + 4; +} + +static bfd_byte * +restgpr0_tail (bfd *abfd, bfd_byte *p, int r) +{ + bfd_put_32 (abfd, LD_R0_0R1 + 16, p); + p = p + 4; + p = restgpr0 (abfd, p, r); + bfd_put_32 (abfd, MTLR_R0, p); + p = p + 4; + if (r == 29) + { + p = restgpr0 (abfd, p, 30); + p = restgpr0 (abfd, p, 31); + } + bfd_put_32 (abfd, BLR, p); + return p + 4; +} + +static bfd_byte * +savegpr1 (bfd *abfd, bfd_byte *p, int r) +{ + bfd_put_32 (abfd, STD_R0_0R12 + (r << 21) + (1 << 16) - (32 - r) * 8, p); + return p + 4; +} + +static bfd_byte * +savegpr1_tail (bfd *abfd, bfd_byte *p, int r) +{ + p = savegpr1 (abfd, p, r); + bfd_put_32 (abfd, BLR, p); + return p + 4; +} + +static bfd_byte * +restgpr1 (bfd *abfd, bfd_byte *p, int r) +{ + bfd_put_32 (abfd, LD_R0_0R12 + (r << 21) + (1 << 16) - (32 - r) * 8, p); + return p + 4; +} + +static bfd_byte * +restgpr1_tail (bfd *abfd, bfd_byte *p, int r) +{ + p = restgpr1 (abfd, p, r); + bfd_put_32 (abfd, BLR, p); + return p + 4; +} + +static bfd_byte * +savefpr (bfd *abfd, bfd_byte *p, int r) +{ + bfd_put_32 (abfd, STFD_FR0_0R1 + (r << 21) + (1 << 16) - (32 - r) * 8, p); + return p + 4; +} + +static bfd_byte * +savefpr0_tail (bfd *abfd, bfd_byte *p, int r) +{ + p = savefpr (abfd, p, r); + bfd_put_32 (abfd, STD_R0_0R1 + 16, p); + p = p + 4; + bfd_put_32 (abfd, BLR, p); + return p + 4; +} + +static bfd_byte * +restfpr (bfd *abfd, bfd_byte *p, int r) +{ + bfd_put_32 (abfd, LFD_FR0_0R1 + (r << 21) + (1 << 16) - (32 - r) * 8, p); + return p + 4; +} + +static bfd_byte * +restfpr0_tail (bfd *abfd, bfd_byte *p, int r) +{ + bfd_put_32 (abfd, LD_R0_0R1 + 16, p); + p = p + 4; + p = restfpr (abfd, p, r); + bfd_put_32 (abfd, MTLR_R0, p); + p = p + 4; + if (r == 29) + { + p = restfpr (abfd, p, 30); + p = restfpr (abfd, p, 31); + } + bfd_put_32 (abfd, BLR, p); + return p + 4; +} + +static bfd_byte * +savefpr1_tail (bfd *abfd, bfd_byte *p, int r) +{ + p = savefpr (abfd, p, r); + bfd_put_32 (abfd, BLR, p); + return p + 4; +} + +static bfd_byte * +restfpr1_tail (bfd *abfd, bfd_byte *p, int r) +{ + p = restfpr (abfd, p, r); + bfd_put_32 (abfd, BLR, p); + return p + 4; +} + +static bfd_byte * +savevr (bfd *abfd, bfd_byte *p, int r) +{ + bfd_put_32 (abfd, LI_R12_0 + (1 << 16) - (32 - r) * 16, p); + p = p + 4; + bfd_put_32 (abfd, STVX_VR0_R12_R0 + (r << 21), p); + return p + 4; +} + +static bfd_byte * +savevr_tail (bfd *abfd, bfd_byte *p, int r) +{ + p = savevr (abfd, p, r); + bfd_put_32 (abfd, BLR, p); + return p + 4; +} + +static bfd_byte * +restvr (bfd *abfd, bfd_byte *p, int r) +{ + bfd_put_32 (abfd, LI_R12_0 + (1 << 16) - (32 - r) * 16, p); + p = p + 4; + bfd_put_32 (abfd, LVX_VR0_R12_R0 + (r << 21), p); + return p + 4; +} + +static bfd_byte * +restvr_tail (bfd *abfd, bfd_byte *p, int r) +{ + p = restvr (abfd, p, r); + bfd_put_32 (abfd, BLR, p); + return p + 4; +} + /* Called via elf_link_hash_traverse to transfer dynamic linking information on function code symbol entries to their corresponding function descriptor symbol entries. */ + static bfd_boolean func_desc_adjust (struct elf_link_hash_entry *h, void *inf) { @@ -4338,15 +5543,29 @@ func_desc_adjust (struct elf_link_hash_entry *h, void *inf) info = inf; htab = ppc_hash_table (info); + /* Resolve undefined references to dot-symbols as the value + in the function descriptor, if we have one in a regular object. + This is to satisfy cases like ".quad .foo". Calls to functions + in dynamic objects are handled elsewhere. */ + if (fh->elf.root.type == bfd_link_hash_undefweak + && fh->was_undefined + && (fh->oh->elf.root.type == bfd_link_hash_defined + || fh->oh->elf.root.type == bfd_link_hash_defweak) + && get_opd_info (fh->oh->elf.root.u.def.section) != NULL + && opd_entry_value (fh->oh->elf.root.u.def.section, + fh->oh->elf.root.u.def.value, + &fh->elf.root.u.def.section, + &fh->elf.root.u.def.value) != (bfd_vma) -1) + { + fh->elf.root.type = fh->oh->elf.root.type; + fh->elf.forced_local = 1; + } + /* If this is a function code symbol, transfer dynamic linking information to the function descriptor symbol. */ if (!fh->is_func) return TRUE; - if (fh->elf.root.type == bfd_link_hash_undefweak - && (fh->elf.elf_link_hash_flags & ELF_LINK_HASH_REF_REGULAR)) - htab->have_undefweak = TRUE; - for (ent = fh->elf.plt.plist; ent != NULL; ent = ent->next) if (ent->plt.refcount > 0) break; @@ -4369,56 +5588,56 @@ func_desc_adjust (struct elf_link_hash_entry *h, void *inf) && (fh->elf.root.type == bfd_link_hash_undefined || fh->elf.root.type == bfd_link_hash_undefweak)) { - bfd *abfd; - asymbol *newsym; - struct bfd_link_hash_entry *bh; - - abfd = fh->elf.root.u.undef.abfd; - newsym = bfd_make_empty_symbol (abfd); - newsym->name = fh->elf.root.root.string + 1; - newsym->section = bfd_und_section_ptr; - newsym->value = 0; - newsym->flags = BSF_OBJECT; - if (fh->elf.root.type == bfd_link_hash_undefweak) - newsym->flags |= BSF_WEAK; - - bh = &fdh->elf.root; - if ( !(_bfd_generic_link_add_one_symbol - (info, abfd, newsym->name, newsym->flags, - newsym->section, newsym->value, NULL, FALSE, FALSE, &bh))) + fdh = make_fdh (info, fh); + if (fdh == NULL) + return FALSE; + } + + /* Fake function descriptors are made undefweak. If the function + code symbol is strong undefined, make the fake sym the same. + If the function code symbol is defined, then force the fake + descriptor local; We can't support overriding of symbols in a + shared library on a fake descriptor. */ + + if (fdh != NULL + && fdh->fake + && fdh->elf.root.type == bfd_link_hash_undefweak) + { + if (fh->elf.root.type == bfd_link_hash_undefined) { - return FALSE; + fdh->elf.root.type = bfd_link_hash_undefined; + bfd_link_add_undef (&htab->elf.root, &fdh->elf.root); + } + else if (fh->elf.root.type == bfd_link_hash_defined + || fh->elf.root.type == bfd_link_hash_defweak) + { + _bfd_elf_link_hash_hide_symbol (info, &fdh->elf, TRUE); } - fdh = (struct ppc_link_hash_entry *) bh; - fdh->elf.elf_link_hash_flags &= ~ELF_LINK_NON_ELF; - fdh->elf.size = 24; - fdh->elf.type = STT_OBJECT; } if (fdh != NULL - && (fdh->elf.elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0 + && !fdh->elf.forced_local && (info->shared - || (fdh->elf.elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) != 0 - || (fdh->elf.elf_link_hash_flags & ELF_LINK_HASH_REF_DYNAMIC) != 0 + || fdh->elf.def_dynamic + || fdh->elf.ref_dynamic || (fdh->elf.root.type == bfd_link_hash_undefweak && ELF_ST_VISIBILITY (fdh->elf.other) == STV_DEFAULT))) { if (fdh->elf.dynindx == -1) if (! bfd_elf_link_record_dynamic_symbol (info, &fdh->elf)) return FALSE; - fdh->elf.elf_link_hash_flags - |= (fh->elf.elf_link_hash_flags & (ELF_LINK_HASH_REF_REGULAR - | ELF_LINK_HASH_REF_DYNAMIC - | ELF_LINK_HASH_REF_REGULAR_NONWEAK - | ELF_LINK_NON_GOT_REF)); + fdh->elf.ref_regular |= fh->elf.ref_regular; + fdh->elf.ref_dynamic |= fh->elf.ref_dynamic; + fdh->elf.ref_regular_nonweak |= fh->elf.ref_regular_nonweak; + fdh->elf.non_got_ref |= fh->elf.non_got_ref; if (ELF_ST_VISIBILITY (fh->elf.other) == STV_DEFAULT) { - fdh->elf.plt.plist = fh->elf.plt.plist; - fdh->elf.elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_PLT; + move_plt_plist (fh, fdh); + fdh->elf.needs_plt = 1; } fdh->is_func_descriptor = 1; - fdh->oh = &fh->elf; - fh->oh = &fdh->elf; + fdh->oh = fh; + fh->oh = fdh; } /* Now that the info is on the function descriptor, clear the @@ -4428,130 +5647,57 @@ func_desc_adjust (struct elf_link_hash_entry *h, void *inf) been imported from another library. Function code syms that are really in the library we must leave global to prevent the linker dragging in a definition from a static library. */ - force_local - = (info->shared - && ((fh->elf.elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0 - || fdh == NULL - || (fdh->elf.elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0 - || (fdh->elf.elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) != 0)); + force_local = (!fh->elf.def_regular + || fdh == NULL + || !fdh->elf.def_regular + || fdh->elf.forced_local); _bfd_elf_link_hash_hide_symbol (info, &fh->elf, force_local); return TRUE; } -#define MIN_SAVE_FPR 14 -#define MAX_SAVE_FPR 31 - /* Called near the start of bfd_elf_size_dynamic_sections. We use this hook to a) provide some gcc support functions, and b) transfer dynamic linking information gathered so far on function code symbol entries, to their corresponding function descriptor symbol entries. */ + static bfd_boolean ppc64_elf_func_desc_adjust (bfd *obfd ATTRIBUTE_UNUSED, struct bfd_link_info *info) { struct ppc_link_hash_table *htab; - unsigned int lowest_savef = MAX_SAVE_FPR + 2; - unsigned int lowest_restf = MAX_SAVE_FPR + 2; unsigned int i; - struct elf_link_hash_entry *h; - bfd_byte *p; - char sym[10]; + const struct sfpr_def_parms funcs[] = + { + { "_savegpr0_", 14, 31, savegpr0, savegpr0_tail }, + { "_restgpr0_", 14, 29, restgpr0, restgpr0_tail }, + { "_restgpr0_", 30, 31, restgpr0, restgpr0_tail }, + { "_savegpr1_", 14, 31, savegpr1, savegpr1_tail }, + { "_restgpr1_", 14, 31, restgpr1, restgpr1_tail }, + { "_savefpr_", 14, 31, savefpr, savefpr0_tail }, + { "_restfpr_", 14, 29, restfpr, restfpr0_tail }, + { "_restfpr_", 30, 31, restfpr, restfpr0_tail }, + { "._savef", 14, 31, savefpr, savefpr1_tail }, + { "._restf", 14, 31, restfpr, restfpr1_tail }, + { "_savevr_", 20, 31, savevr, savevr_tail }, + { "_restvr_", 20, 31, restvr, restvr_tail } + }; htab = ppc_hash_table (info); - if (htab->sfpr == NULL) /* We don't have any relocs. */ return TRUE; - /* First provide any missing ._savef* and ._restf* functions. */ - memcpy (sym, "._savef14", 10); - for (i = MIN_SAVE_FPR; i <= MAX_SAVE_FPR; i++) - { - sym[7] = i / 10 + '0'; - sym[8] = i % 10 + '0'; - h = elf_link_hash_lookup (&htab->elf, sym, FALSE, FALSE, TRUE); - if (h != NULL - && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0) - { - if (lowest_savef > i) - lowest_savef = i; - h->root.type = bfd_link_hash_defined; - h->root.u.def.section = htab->sfpr; - h->root.u.def.value = (i - lowest_savef) * 4; - h->type = STT_FUNC; - h->elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR; - _bfd_elf_link_hash_hide_symbol (info, h, TRUE); - } - } - - memcpy (sym, "._restf14", 10); - for (i = MIN_SAVE_FPR; i <= MAX_SAVE_FPR; i++) - { - sym[7] = i / 10 + '0'; - sym[8] = i % 10 + '0'; - h = elf_link_hash_lookup (&htab->elf, sym, FALSE, FALSE, TRUE); - if (h != NULL - && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0) - { - if (lowest_restf > i) - lowest_restf = i; - h->root.type = bfd_link_hash_defined; - h->root.u.def.section = htab->sfpr; - h->root.u.def.value = ((MAX_SAVE_FPR + 2 - lowest_savef) * 4 - + (i - lowest_restf) * 4); - h->type = STT_FUNC; - h->elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR; - _bfd_elf_link_hash_hide_symbol (info, h, TRUE); - } - } + /* Provide any missing _save* and _rest* functions. */ + htab->sfpr->size = 0; + for (i = 0; i < sizeof (funcs) / sizeof (funcs[0]); i++) + if (!sfpr_define (info, &funcs[i])) + return FALSE; elf_link_hash_traverse (&htab->elf, func_desc_adjust, info); - htab->sfpr->_raw_size = ((MAX_SAVE_FPR + 2 - lowest_savef) * 4 - + (MAX_SAVE_FPR + 2 - lowest_restf) * 4); - - if (htab->sfpr->_raw_size == 0) - { - if (!htab->have_undefweak) - { - _bfd_strip_section_from_output (info, htab->sfpr); - return TRUE; - } - - htab->sfpr->_raw_size = 4; - } - - p = bfd_alloc (htab->elf.dynobj, htab->sfpr->_raw_size); - if (p == NULL) - return FALSE; - htab->sfpr->contents = p; - - for (i = lowest_savef; i <= MAX_SAVE_FPR; i++) - { - unsigned int fpr = i << 21; - unsigned int stackoff = (1 << 16) - (MAX_SAVE_FPR + 1 - i) * 8; - bfd_put_32 (htab->elf.dynobj, STFD_FR0_0R1 + fpr + stackoff, p); - p += 4; - } - if (lowest_savef <= MAX_SAVE_FPR) - { - bfd_put_32 (htab->elf.dynobj, BLR, p); - p += 4; - } - - for (i = lowest_restf; i <= MAX_SAVE_FPR; i++) - { - unsigned int fpr = i << 21; - unsigned int stackoff = (1 << 16) - (MAX_SAVE_FPR + 1 - i) * 8; - bfd_put_32 (htab->elf.dynobj, LFD_FR0_0R1 + fpr + stackoff, p); - p += 4; - } - if (lowest_restf <= MAX_SAVE_FPR - || htab->sfpr->_raw_size == 4) - { - bfd_put_32 (htab->elf.dynobj, BLR, p); - } + if (htab->sfpr->size == 0) + htab->sfpr->flags |= SEC_EXCLUDE; return TRUE; } @@ -4574,7 +5720,7 @@ ppc64_elf_adjust_dynamic_symbol (struct bfd_link_info *info, /* Deal with function syms. */ if (h->type == STT_FUNC - || (h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT) != 0) + || h->needs_plt) { /* Clear procedure linkage table information for any symbol that won't need a .plt entry. */ @@ -4582,14 +5728,13 @@ ppc64_elf_adjust_dynamic_symbol (struct bfd_link_info *info, for (ent = h->plt.plist; ent != NULL; ent = ent->next) if (ent->plt.refcount > 0) break; - if (!((struct ppc_link_hash_entry *) h)->is_func_descriptor - || ent == NULL + if (ent == NULL || SYMBOL_CALLS_LOCAL (info, h) || (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT && h->root.type == bfd_link_hash_undefweak)) { h->plt.plist = NULL; - h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT; + h->needs_plt = 0; } } else @@ -4598,16 +5743,14 @@ ppc64_elf_adjust_dynamic_symbol (struct bfd_link_info *info, /* If this is a weak symbol, and there is a real definition, the processor independent code will have arranged for us to see the real definition first, and we can just use the same value. */ - if (h->weakdef != NULL) + if (h->u.weakdef != NULL) { - BFD_ASSERT (h->weakdef->root.type == bfd_link_hash_defined - || h->weakdef->root.type == bfd_link_hash_defweak); - h->root.u.def.section = h->weakdef->root.u.def.section; - h->root.u.def.value = h->weakdef->root.u.def.value; + BFD_ASSERT (h->u.weakdef->root.type == bfd_link_hash_defined + || h->u.weakdef->root.type == bfd_link_hash_defweak); + h->root.u.def.section = h->u.weakdef->root.u.def.section; + h->root.u.def.value = h->u.weakdef->root.u.def.value; if (ELIMINATE_COPY_RELOCS) - h->elf_link_hash_flags - = ((h->elf_link_hash_flags & ~ELF_LINK_NON_GOT_REF) - | (h->weakdef->elf_link_hash_flags & ELF_LINK_NON_GOT_REF)); + h->non_got_ref = h->u.weakdef->non_got_ref; return TRUE; } @@ -4620,7 +5763,7 @@ ppc64_elf_adjust_dynamic_symbol (struct bfd_link_info *info, /* If there are no references to this symbol that do not use the GOT, we don't need to generate a copy reloc. */ - if ((h->elf_link_hash_flags & ELF_LINK_NON_GOT_REF) == 0) + if (!h->non_got_ref) return TRUE; if (ELIMINATE_COPY_RELOCS) @@ -4640,7 +5783,7 @@ ppc64_elf_adjust_dynamic_symbol (struct bfd_link_info *info, we'll be keeping the dynamic relocs and avoiding the copy reloc. */ if (p == NULL) { - h->elf_link_hash_flags &= ~ELF_LINK_NON_GOT_REF; + h->non_got_ref = 0; return TRUE; } } @@ -4661,6 +5804,13 @@ ppc64_elf_adjust_dynamic_symbol (struct bfd_link_info *info, /* This is a reference to a symbol defined by a dynamic object which is not a function. */ + if (h->size == 0) + { + (*_bfd_error_handler) (_("dynamic variable `%s' is zero size"), + h->root.root.string); + return TRUE; + } + /* We must allocate the symbol in our .dynbss section, which will become part of the .bss section of the executable. There will be an entry for this symbol in the .dynsym section. The dynamic @@ -4677,8 +5827,8 @@ ppc64_elf_adjust_dynamic_symbol (struct bfd_link_info *info, .rela.bss section we are going to use. */ if ((h->root.u.def.section->flags & SEC_ALLOC) != 0) { - htab->relbss->_raw_size += sizeof (Elf64_External_Rela); - h->elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_COPY; + htab->relbss->size += sizeof (Elf64_External_Rela); + h->needs_copy = 1; } /* We need to figure out the alignment required for this symbol. I @@ -4689,7 +5839,7 @@ ppc64_elf_adjust_dynamic_symbol (struct bfd_link_info *info, /* Apply the required alignment. */ s = htab->dynbss; - s->_raw_size = BFD_ALIGN (s->_raw_size, (bfd_size_type) (1 << power_of_two)); + s->size = BFD_ALIGN (s->size, (bfd_size_type) (1 << power_of_two)); if (power_of_two > bfd_get_section_alignment (htab->elf.dynobj, s)) { if (! bfd_set_section_alignment (htab->elf.dynobj, s, power_of_two)) @@ -4698,10 +5848,10 @@ ppc64_elf_adjust_dynamic_symbol (struct bfd_link_info *info, /* Define the symbol as being at this point in the section. */ h->root.u.def.section = s; - h->root.u.def.value = s->_raw_size; + h->root.u.def.value = s->size; /* Increment the section size to make room for the symbol. */ - s->_raw_size += h->size; + s->size += h->size; return TRUE; } @@ -4713,11 +5863,13 @@ ppc64_elf_hide_symbol (struct bfd_link_info *info, struct elf_link_hash_entry *h, bfd_boolean force_local) { + struct ppc_link_hash_entry *eh; _bfd_elf_link_hash_hide_symbol (info, h, force_local); - if (((struct ppc_link_hash_entry *) h)->is_func_descriptor) + eh = (struct ppc_link_hash_entry *) h; + if (eh->is_func_descriptor) { - struct elf_link_hash_entry *fh = ((struct ppc_link_hash_entry *) h)->oh; + struct ppc_link_hash_entry *fh = eh->oh; if (fh == NULL) { @@ -4731,14 +5883,15 @@ ppc64_elf_hide_symbol (struct bfd_link_info *info, when it runs out of memory. This function doesn't have a return status, so there's no way to gracefully return an error. So cheat. We know that string[-1] can be safely - dereferenced; It's either a string in an ELF string - table, or allocated in an objalloc structure. */ + accessed; It's either a string in an ELF string table, + or allocated in an objalloc structure. */ - p = h->root.root.string - 1; + p = eh->elf.root.root.string - 1; save = *p; *(char *) p = '.'; htab = ppc_hash_table (info); - fh = elf_link_hash_lookup (&htab->elf, p, FALSE, FALSE, FALSE); + fh = (struct ppc_link_hash_entry *) + elf_link_hash_lookup (&htab->elf, p, FALSE, FALSE, FALSE); *(char *) p = save; /* Unfortunately, if it so happens that the string we were @@ -4747,27 +5900,32 @@ ppc64_elf_hide_symbol (struct bfd_link_info *info, reason the lookup should fail. */ if (fh == NULL) { - q = h->root.root.string + strlen (h->root.root.string); - while (q >= h->root.root.string && *q == *p) + q = eh->elf.root.root.string + strlen (eh->elf.root.root.string); + while (q >= eh->elf.root.root.string && *q == *p) --q, --p; - if (q < h->root.root.string && *p == '.') - fh = elf_link_hash_lookup (&htab->elf, p, FALSE, FALSE, FALSE); + if (q < eh->elf.root.root.string && *p == '.') + fh = (struct ppc_link_hash_entry *) + elf_link_hash_lookup (&htab->elf, p, FALSE, FALSE, FALSE); } if (fh != NULL) { - ((struct ppc_link_hash_entry *) h)->oh = fh; - ((struct ppc_link_hash_entry *) fh)->oh = h; + eh->oh = fh; + fh->oh = eh; } } if (fh != NULL) - _bfd_elf_link_hash_hide_symbol (info, fh, force_local); + _bfd_elf_link_hash_hide_symbol (info, &fh->elf, force_local); } } static bfd_boolean -get_sym_h (struct elf_link_hash_entry **hp, Elf_Internal_Sym **symp, - asection **symsecp, char **tls_maskp, Elf_Internal_Sym **locsymsp, - unsigned long r_symndx, bfd *ibfd) +get_sym_h (struct elf_link_hash_entry **hp, + Elf_Internal_Sym **symp, + asection **symsecp, + char **tls_maskp, + Elf_Internal_Sym **locsymsp, + unsigned long r_symndx, + bfd *ibfd) { Elf_Internal_Shdr *symtab_hdr = &elf_tdata (ibfd)->symtab_hdr; @@ -4900,15 +6058,14 @@ get_tls_mask (char **tls_maskp, unsigned long *toc_symndx, if ((h == NULL || ((h->root.type == bfd_link_hash_defined || h->root.type == bfd_link_hash_defweak) - && !(h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC))) + && !h->def_dynamic)) && (next_r == -1 || next_r == -2)) return 1 - next_r; return 1; } /* Adjust all global syms defined in opd sections. In gcc generated - code these will already have been done, but I suppose we have to - cater for all sorts of hand written assembly. */ + code for the old ABI, these will already have been done. */ static bfd_boolean adjust_opd_syms (struct elf_link_hash_entry *h, void *inf ATTRIBUTE_UNUSED) @@ -4932,16 +6089,167 @@ adjust_opd_syms (struct elf_link_hash_entry *h, void *inf ATTRIBUTE_UNUSED) return TRUE; sym_sec = eh->elf.root.u.def.section; - if (sym_sec != NULL - && elf_section_data (sym_sec) != NULL - && (opd_adjust = ppc64_elf_section_data (sym_sec)->opd.adjust) != NULL) + opd_adjust = get_opd_info (sym_sec); + if (opd_adjust != NULL) { - eh->elf.root.u.def.value += opd_adjust[eh->elf.root.u.def.value / 24]; + long adjust = opd_adjust[eh->elf.root.u.def.value / 8]; + if (adjust == -1) + { + /* This entry has been deleted. */ + asection *dsec = ppc64_elf_tdata (sym_sec->owner)->u.deleted_section; + if (dsec == NULL) + { + for (dsec = sym_sec->owner->sections; dsec; dsec = dsec->next) + if (elf_discarded_section (dsec)) + { + ppc64_elf_tdata (sym_sec->owner)->u.deleted_section = dsec; + break; + } + } + eh->elf.root.u.def.value = 0; + eh->elf.root.u.def.section = dsec; + } + else + eh->elf.root.u.def.value += adjust; eh->adjust_done = 1; } return TRUE; } +/* Handles decrementing dynamic reloc counts for the reloc specified by + R_INFO in section SEC. If LOCAL_SYMS is NULL, then H and SYM_SEC + have already been determined. */ + +static bfd_boolean +dec_dynrel_count (bfd_vma r_info, + asection *sec, + struct bfd_link_info *info, + Elf_Internal_Sym **local_syms, + struct elf_link_hash_entry *h, + asection *sym_sec) +{ + enum elf_ppc64_reloc_type r_type; + struct ppc_dyn_relocs *p; + struct ppc_dyn_relocs **pp; + + /* Can this reloc be dynamic? This switch, and later tests here + should be kept in sync with the code in check_relocs. */ + r_type = ELF64_R_TYPE (r_info); + switch (r_type) + { + default: + return TRUE; + + case R_PPC64_TPREL16: + case R_PPC64_TPREL16_LO: + case R_PPC64_TPREL16_HI: + case R_PPC64_TPREL16_HA: + case R_PPC64_TPREL16_DS: + case R_PPC64_TPREL16_LO_DS: + case R_PPC64_TPREL16_HIGHER: + case R_PPC64_TPREL16_HIGHERA: + case R_PPC64_TPREL16_HIGHEST: + case R_PPC64_TPREL16_HIGHESTA: + if (!info->shared) + return TRUE; + + case R_PPC64_TPREL64: + case R_PPC64_DTPMOD64: + case R_PPC64_DTPREL64: + case R_PPC64_ADDR64: + case R_PPC64_REL30: + case R_PPC64_REL32: + case R_PPC64_REL64: + case R_PPC64_ADDR14: + case R_PPC64_ADDR14_BRNTAKEN: + case R_PPC64_ADDR14_BRTAKEN: + case R_PPC64_ADDR16: + case R_PPC64_ADDR16_DS: + case R_PPC64_ADDR16_HA: + case R_PPC64_ADDR16_HI: + case R_PPC64_ADDR16_HIGHER: + case R_PPC64_ADDR16_HIGHERA: + case R_PPC64_ADDR16_HIGHEST: + case R_PPC64_ADDR16_HIGHESTA: + case R_PPC64_ADDR16_LO: + case R_PPC64_ADDR16_LO_DS: + case R_PPC64_ADDR24: + case R_PPC64_ADDR32: + case R_PPC64_UADDR16: + case R_PPC64_UADDR32: + case R_PPC64_UADDR64: + case R_PPC64_TOC: + break; + } + + if (local_syms != NULL) + { + unsigned long r_symndx; + Elf_Internal_Sym *sym; + bfd *ibfd = sec->owner; + + r_symndx = ELF64_R_SYM (r_info); + if (!get_sym_h (&h, &sym, &sym_sec, NULL, local_syms, r_symndx, ibfd)) + return FALSE; + } + + if ((info->shared + && (MUST_BE_DYN_RELOC (r_type) + || (h != NULL + && (!info->symbolic + || h->root.type == bfd_link_hash_defweak + || !h->def_regular)))) + || (ELIMINATE_COPY_RELOCS + && !info->shared + && h != NULL + && (h->root.type == bfd_link_hash_defweak + || !h->def_regular))) + ; + else + return TRUE; + + if (h != NULL) + pp = &((struct ppc_link_hash_entry *) h)->dyn_relocs; + else + { + if (sym_sec != NULL) + { + void *vpp = &elf_section_data (sym_sec)->local_dynrel; + pp = (struct ppc_dyn_relocs **) vpp; + } + else + { + void *vpp = &elf_section_data (sec)->local_dynrel; + pp = (struct ppc_dyn_relocs **) vpp; + } + + /* elf_gc_sweep may have already removed all dyn relocs associated + with local syms for a given section. Don't report a dynreloc + miscount. */ + if (*pp == NULL) + return TRUE; + } + + while ((p = *pp) != NULL) + { + if (p->sec == sec) + { + if (!MUST_BE_DYN_RELOC (r_type)) + p->pc_count -= 1; + p->count -= 1; + if (p->count == 0) + *pp = p->next; + return TRUE; + } + pp = &p->next; + } + + (*_bfd_error_handler) (_("dynreloc miscount for %B, section %A"), + sec->owner, sec); + bfd_set_error (bfd_error_bad_value); + return FALSE; +} + /* Remove unused Official Procedure Descriptor entries. Currently we only remove those associated with functions in discarded link-once sections, or weakly defined functions that have been overridden. It @@ -4949,10 +6257,13 @@ adjust_opd_syms (struct elf_link_hash_entry *h, void *inf ATTRIBUTE_UNUSED) applications. */ bfd_boolean -ppc64_elf_edit_opd (bfd *obfd, struct bfd_link_info *info) +ppc64_elf_edit_opd (bfd *obfd, struct bfd_link_info *info, + bfd_boolean no_opd_opt, + bfd_boolean non_overlapping) { bfd *ibfd; bfd_boolean some_edited = FALSE; + asection *need_pad = NULL; for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next) { @@ -4963,23 +6274,32 @@ ppc64_elf_edit_opd (bfd *obfd, struct bfd_link_info *info) struct elf_link_hash_entry **sym_hashes; bfd_vma offset; bfd_size_type amt; - long *adjust; - bfd_boolean need_edit; + long *opd_adjust; + bfd_boolean need_edit, add_aux_fields; + bfd_size_type cnt_16b = 0; sec = bfd_get_section_by_name (ibfd, ".opd"); - if (sec == NULL) + if (sec == NULL || sec->size == 0) continue; - amt = sec->_raw_size * sizeof (long) / 24; - adjust = ppc64_elf_section_data (sec)->opd.adjust; - if (adjust == NULL) + amt = sec->size * sizeof (long) / 8; + opd_adjust = get_opd_info (sec); + if (opd_adjust == NULL) { - /* Must be a ld -r link. ie. check_relocs hasn't been - called. */ - adjust = bfd_zalloc (obfd, amt); - ppc64_elf_section_data (sec)->opd.adjust = adjust; + /* check_relocs hasn't been called. Must be a ld -r link + or --just-symbols object. */ + opd_adjust = bfd_alloc (obfd, amt); + if (opd_adjust == NULL) + return FALSE; + ppc64_elf_section_data (sec)->opd.adjust = opd_adjust; } - memset (adjust, 0, amt); + memset (opd_adjust, 0, amt); + + if (no_opd_opt) + continue; + + if (sec->sec_info_type == ELF_INFO_TYPE_JUST_SYMS) + continue; if (sec->output_section == bfd_abs_section_ptr) continue; @@ -5001,6 +6321,7 @@ ppc64_elf_edit_opd (bfd *obfd, struct bfd_link_info *info) /* First run through the relocs to check they are sane, and to determine whether we need to edit this opd section. */ need_edit = FALSE; + need_pad = sec; offset = 0; relend = relstart + sec->reloc_count; for (rel = relstart; rel < relend; ) @@ -5011,7 +6332,7 @@ ppc64_elf_edit_opd (bfd *obfd, struct bfd_link_info *info) struct elf_link_hash_entry *h; Elf_Internal_Sym *sym; - /* .opd contains a regular array of 24 byte entries. We're + /* .opd contains a regular array of 16 or 24 byte entries. We're only interested in the reloc pointing to a function entry point. */ if (rel->r_offset != offset @@ -5023,9 +6344,9 @@ ppc64_elf_edit_opd (bfd *obfd, struct bfd_link_info *info) Also, there's nothing to prevent someone putting something silly in .opd with the assembler. No .opd optimization for them! */ + broken_opd: (*_bfd_error_handler) - (_("%s: .opd is not a regular array of opd entries"), - bfd_archive_filename (ibfd)); + (_("%B: .opd is not a regular array of opd entries"), ibfd); need_edit = FALSE; break; } @@ -5034,8 +6355,8 @@ ppc64_elf_edit_opd (bfd *obfd, struct bfd_link_info *info) || (r_type = ELF64_R_TYPE ((rel + 1)->r_info)) != R_PPC64_TOC) { (*_bfd_error_handler) - (_("%s: unexpected reloc type %u in .opd section"), - bfd_archive_filename (ibfd), r_type); + (_("%B: unexpected reloc type %u in .opd section"), + ibfd, r_type); need_edit = FALSE; break; } @@ -5051,12 +6372,12 @@ ppc64_elf_edit_opd (bfd *obfd, struct bfd_link_info *info) if (h != NULL) sym_name = h->root.root.string; else - sym_name = bfd_elf_local_sym_name (ibfd, sym); + sym_name = bfd_elf_sym_name (ibfd, symtab_hdr, sym, + sym_sec); (*_bfd_error_handler) - (_("%s: undefined sym `%s' in .opd section"), - bfd_archive_filename (ibfd), - sym_name); + (_("%B: undefined sym `%s' in .opd section"), + ibfd, sym_name); need_edit = FALSE; break; } @@ -5072,19 +6393,54 @@ ppc64_elf_edit_opd (bfd *obfd, struct bfd_link_info *info) || sym_sec->output_section == bfd_abs_section_ptr) need_edit = TRUE; - offset += 24; rel += 2; - /* Allow for the possibility of a reloc on the third word. */ - if (rel < relend - && rel->r_offset == offset - 8) - rel += 1; + if (rel == relend + || (rel + 1 == relend && rel->r_offset == offset + 16)) + { + if (sec->size == offset + 24) + { + need_pad = NULL; + break; + } + if (rel == relend && sec->size == offset + 16) + { + cnt_16b++; + break; + } + goto broken_opd; + } + + if (rel->r_offset == offset + 24) + offset += 24; + else if (rel->r_offset != offset + 16) + goto broken_opd; + else if (rel + 1 < relend + && ELF64_R_TYPE (rel[0].r_info) == R_PPC64_ADDR64 + && ELF64_R_TYPE (rel[1].r_info) == R_PPC64_TOC) + { + offset += 16; + cnt_16b++; + } + else if (rel + 2 < relend + && ELF64_R_TYPE (rel[1].r_info) == R_PPC64_ADDR64 + && ELF64_R_TYPE (rel[2].r_info) == R_PPC64_TOC) + { + offset += 24; + rel += 1; + } + else + goto broken_opd; } - if (need_edit) + add_aux_fields = non_overlapping && cnt_16b > 0; + + if (need_edit || add_aux_fields) { Elf_Internal_Rela *write_rel; bfd_byte *rptr, *wptr; + bfd_byte *new_contents = NULL; bfd_boolean skip; + long opd_ent_size; /* This seems a waste of time as input .opd sections are all zeros as generated by gcc, but I suppose there's no reason @@ -5092,11 +6448,11 @@ ppc64_elf_edit_opd (bfd *obfd, struct bfd_link_info *info) the third word of .opd entries. */ if ((sec->flags & SEC_IN_MEMORY) == 0) { - bfd_byte *loc = bfd_alloc (ibfd, sec->_raw_size); - if (loc == NULL - || !bfd_get_section_contents (ibfd, sec, loc, 0, - sec->_raw_size)) + bfd_byte *loc; + if (!bfd_malloc_and_get_section (ibfd, sec, &loc)) { + if (loc != NULL) + free (loc); error_ret: if (local_syms != NULL && symtab_hdr->contents != (unsigned char *) local_syms) @@ -5111,11 +6467,21 @@ ppc64_elf_edit_opd (bfd *obfd, struct bfd_link_info *info) elf_section_data (sec)->relocs = relstart; - wptr = sec->contents; + new_contents = sec->contents; + if (add_aux_fields) + { + new_contents = bfd_malloc (sec->size + cnt_16b * 8); + if (new_contents == NULL) + return FALSE; + need_pad = FALSE; + } + wptr = new_contents; rptr = sec->contents; + write_rel = relstart; skip = FALSE; offset = 0; + opd_ent_size = 0; for (rel = relstart; rel < relend; rel++) { unsigned long r_symndx; @@ -5131,27 +6497,48 @@ ppc64_elf_edit_opd (bfd *obfd, struct bfd_link_info *info) if (rel->r_offset == offset) { struct ppc_link_hash_entry *fdh = NULL; - if (h != NULL) - fdh = get_fdh ((struct ppc_link_hash_entry *) h, - ppc_hash_table (info)); + + /* See if the .opd entry is full 24 byte or + 16 byte (with fd_aux entry overlapped with next + fd_func). */ + opd_ent_size = 24; + if ((rel + 2 == relend && sec->size == offset + 16) + || (rel + 3 < relend + && rel[2].r_offset == offset + 16 + && rel[3].r_offset == offset + 24 + && ELF64_R_TYPE (rel[2].r_info) == R_PPC64_ADDR64 + && ELF64_R_TYPE (rel[3].r_info) == R_PPC64_TOC)) + opd_ent_size = 16; + + if (h != NULL + && h->root.root.string[0] == '.') + { + fdh = get_fdh ((struct ppc_link_hash_entry *) h, + ppc_hash_table (info)); + if (fdh != NULL + && fdh->elf.root.type != bfd_link_hash_defined + && fdh->elf.root.type != bfd_link_hash_defweak) + fdh = NULL; + } skip = (sym_sec->owner != ibfd || sym_sec->output_section == bfd_abs_section_ptr); if (skip) { - if (h != NULL && sym_sec->owner == ibfd) + if (fdh != NULL && sym_sec->owner == ibfd) { /* Arrange for the function descriptor sym to be dropped. */ fdh->elf.root.u.def.value = 0; fdh->elf.root.u.def.section = sym_sec; } + opd_adjust[rel->r_offset / 8] = -1; } else { /* We'll be keeping this opd entry. */ - if (h != NULL) + if (fdh != NULL) { /* Redefine the function descriptor symbol to this location in the opd section. It is @@ -5160,7 +6547,7 @@ ppc64_elf_edit_opd (bfd *obfd, struct bfd_link_info *info) for local symbols, because various places in the generic ELF code use the value stored in u.def.value. */ - fdh->elf.root.u.def.value = wptr - sec->contents; + fdh->elf.root.u.def.value = wptr - new_contents; fdh->adjust_done = 1; } @@ -5170,60 +6557,50 @@ ppc64_elf_edit_opd (bfd *obfd, struct bfd_link_info *info) for the function descriptor sym which we don't have at the moment. So keep an array of adjustments. */ - adjust[rel->r_offset / 24] = wptr - rptr; + opd_adjust[rel->r_offset / 8] + = (wptr - new_contents) - (rptr - sec->contents); if (wptr != rptr) - memcpy (wptr, rptr, 24); - wptr += 24; + memcpy (wptr, rptr, opd_ent_size); + wptr += opd_ent_size; + if (add_aux_fields && opd_ent_size == 16) + { + memset (wptr, '\0', 8); + wptr += 8; + } } - rptr += 24; - offset += 24; + rptr += opd_ent_size; + offset += opd_ent_size; } if (skip) { - BFD_ASSERT (MUST_BE_DYN_RELOC (ELF64_R_TYPE (rel->r_info))); - if (info->shared) - { - /* We won't be needing dynamic relocs here. */ - struct ppc_dyn_relocs **pp; - struct ppc_dyn_relocs *p; - - if (h != NULL) - pp = &((struct ppc_link_hash_entry *) h)->dyn_relocs; - else if (sym_sec != NULL) - pp = ((struct ppc_dyn_relocs **) - &elf_section_data (sym_sec)->local_dynrel); - else - pp = ((struct ppc_dyn_relocs **) - &elf_section_data (sec)->local_dynrel); - while ((p = *pp) != NULL) - { - if (p->sec == sec) - { - p->count -= 1; - if (p->count == 0) - *pp = p->next; - break; - } - pp = &p->next; - } - } + if (!NO_OPD_RELOCS + && !info->relocatable + && !dec_dynrel_count (rel->r_info, sec, info, + NULL, h, sym_sec)) + goto error_ret; } else { /* We need to adjust any reloc offsets to point to the new opd entries. While we're at it, we may as well remove redundant relocs. */ - rel->r_offset += wptr - rptr; + rel->r_offset += opd_adjust[(offset - opd_ent_size) / 8]; if (write_rel != rel) memcpy (write_rel, rel, sizeof (*rel)); ++write_rel; } } - sec->_cooked_size = wptr - sec->contents; + sec->size = wptr - new_contents; sec->reloc_count = write_rel - relstart; + if (add_aux_fields) + { + free (sec->contents); + sec->contents = new_contents; + } + /* Fudge the size too, as this is used later in elf_bfd_final_link if we are emitting relocs. */ elf_section_data (sec)->rel_hdr.sh_size @@ -5247,6 +6624,40 @@ ppc64_elf_edit_opd (bfd *obfd, struct bfd_link_info *info) if (some_edited) elf_link_hash_traverse (elf_hash_table (info), adjust_opd_syms, NULL); + /* If we are doing a final link and the last .opd entry is just 16 byte + long, add a 8 byte padding after it. */ + if (need_pad != NULL && !info->relocatable) + { + bfd_byte *p; + + if ((need_pad->flags & SEC_IN_MEMORY) == 0) + { + BFD_ASSERT (need_pad->size > 0); + + p = bfd_malloc (need_pad->size + 8); + if (p == NULL) + return FALSE; + + if (! bfd_get_section_contents (need_pad->owner, need_pad, + p, 0, need_pad->size)) + return FALSE; + + need_pad->contents = p; + need_pad->flags |= (SEC_IN_MEMORY | SEC_HAS_CONTENTS); + } + else + { + p = bfd_realloc (need_pad->contents, need_pad->size + 8); + if (p == NULL) + return FALSE; + + need_pad->contents = p; + } + + memset (need_pad->contents + need_pad->size, 0, 8); + need_pad->size += 8; + } + return TRUE; } @@ -5260,13 +6671,31 @@ ppc64_elf_tls_setup (bfd *obfd, struct bfd_link_info *info) htab = ppc_hash_table (info); if (htab->tls_get_addr != NULL) { - struct elf_link_hash_entry *h = htab->tls_get_addr; + struct ppc_link_hash_entry *h = htab->tls_get_addr; - 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; + while (h->elf.root.type == bfd_link_hash_indirect + || h->elf.root.type == bfd_link_hash_warning) + h = (struct ppc_link_hash_entry *) h->elf.root.u.i.link; htab->tls_get_addr = h; + + if (htab->tls_get_addr_fd == NULL + && h->oh != NULL + && h->oh->is_func_descriptor + && (h->oh->elf.root.type == bfd_link_hash_defined + || h->oh->elf.root.type == bfd_link_hash_defweak)) + htab->tls_get_addr_fd = h->oh; + } + + if (htab->tls_get_addr_fd != NULL) + { + struct ppc_link_hash_entry *h = htab->tls_get_addr_fd; + + while (h->elf.root.type == bfd_link_hash_indirect + || h->elf.root.type == bfd_link_hash_warning) + h = (struct ppc_link_hash_entry *) h->elf.root.u.i.link; + + htab->tls_get_addr_fd = h; } return _bfd_elf_tls_setup (obfd, info); @@ -5293,12 +6722,22 @@ ppc64_elf_tls_optimize (bfd *obfd ATTRIBUTE_UNUSED, struct bfd_link_info *info) for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next) { Elf_Internal_Sym *locsyms = NULL; - - for (sec = ibfd->sections; sec != NULL; sec = sec->next) + asection *toc = bfd_get_section_by_name (ibfd, ".toc"); + unsigned char *toc_ref = NULL; + + /* Look at all the sections for this file, with TOC last. */ + for (sec = (ibfd->sections == toc && toc && toc->next ? toc->next + : ibfd->sections); + sec != NULL; + sec = (sec == toc ? NULL + : sec->next == NULL ? toc + : sec->next == toc && toc->next ? toc->next + : sec->next)) if (sec->has_tls_reloc && !bfd_is_abs_section (sec->output_section)) { Elf_Internal_Rela *relstart, *rel, *relend; int expecting_tls_get_addr; + long toc_ref_index = 0; /* Read the relocations. */ relstart = _bfd_elf_link_read_relocs (ibfd, sec, NULL, NULL, @@ -5327,6 +6766,8 @@ ppc64_elf_tls_optimize (bfd *obfd ATTRIBUTE_UNUSED, struct bfd_link_info *info) err_free_rel: if (elf_section_data (sec)->relocs != relstart) free (relstart); + if (toc_ref != NULL) + free (toc_ref); if (locsyms != NULL && (elf_tdata (ibfd)->symtab_hdr.contents != (unsigned char *) locsyms)) @@ -5342,22 +6783,14 @@ ppc64_elf_tls_optimize (bfd *obfd ATTRIBUTE_UNUSED, struct bfd_link_info *info) value = h->root.u.def.value; } else - { - value = sym->st_value; - - if (elf_section_data (sym_sec) != NULL) - { - long *adjust; - adjust = ppc64_elf_section_data (sym_sec)->opd.adjust; - if (adjust != NULL) - value += adjust[value / 24]; - } - } + /* Symbols referenced by TLS relocs must be of type + STT_TLS. So no need for .opd local sym adjust. */ + value = sym->st_value; ok_tprel = FALSE; is_local = FALSE; if (h == NULL - || !(h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC)) + || !h->def_dynamic) { is_local = TRUE; value += sym_sec->output_offset; @@ -5424,7 +6857,8 @@ ppc64_elf_tls_optimize (bfd *obfd ATTRIBUTE_UNUSED, struct bfd_link_info *info) case R_PPC64_REL14_BRNTAKEN: case R_PPC64_REL24: if (h != NULL - && h == htab->tls_get_addr) + && (h == &htab->tls_get_addr->elf + || h == &htab->tls_get_addr_fd->elf)) { if (!expecting_tls_get_addr && rel != relstart @@ -5441,8 +6875,12 @@ ppc64_elf_tls_optimize (bfd *obfd ATTRIBUTE_UNUSED, struct bfd_link_info *info) rel - 1, ibfd); if (retval == 0) goto err_free_rel; - if (toc_tls != NULL) - expecting_tls_get_addr = retval > 1; + if (retval > 1 && toc_tls != NULL) + { + expecting_tls_get_addr = 1; + if (toc_ref != NULL) + toc_ref[toc_ref_index] = 1; + } } if (expecting_tls_get_addr) @@ -5460,8 +6898,40 @@ ppc64_elf_tls_optimize (bfd *obfd ATTRIBUTE_UNUSED, struct bfd_link_info *info) expecting_tls_get_addr = 0; continue; + case R_PPC64_TOC16: + case R_PPC64_TOC16_LO: + case R_PPC64_TLS: + expecting_tls_get_addr = 0; + if (sym_sec == toc && toc != NULL) + { + /* Mark this toc entry as referenced by a TLS + code sequence. We can do that now in the + case of R_PPC64_TLS, and after checking for + tls_get_addr for the TOC16 relocs. */ + if (toc_ref == NULL) + { + toc_ref = bfd_zmalloc (toc->size / 8); + if (toc_ref == NULL) + goto err_free_rel; + } + if (h != NULL) + value = h->root.u.def.value; + else + value = sym->st_value; + value += rel->r_addend; + BFD_ASSERT (value < toc->size && value % 8 == 0); + toc_ref_index = value / 8; + if (r_type == R_PPC64_TLS) + toc_ref[toc_ref_index] = 1; + } + continue; + case R_PPC64_TPREL64: expecting_tls_get_addr = 0; + if (sec != toc + || toc_ref == NULL + || !toc_ref[rel->r_offset / 8]) + continue; if (ok_tprel) { /* IE -> LE */ @@ -5474,6 +6944,10 @@ ppc64_elf_tls_optimize (bfd *obfd ATTRIBUTE_UNUSED, struct bfd_link_info *info) case R_PPC64_DTPMOD64: expecting_tls_get_addr = 0; + if (sec != toc + || toc_ref == NULL + || !toc_ref[rel->r_offset / 8]) + continue; if (rel + 1 < relend && (rel[1].r_info == ELF64_R_INFO (r_symndx, R_PPC64_DTPREL64)) @@ -5528,29 +7002,20 @@ ppc64_elf_tls_optimize (bfd *obfd ATTRIBUTE_UNUSED, struct bfd_link_info *info) ent->got.refcount -= 1; } } - else if (h != NULL) + else { - struct ppc_link_hash_entry * eh; - struct ppc_dyn_relocs **pp; - struct ppc_dyn_relocs *p; - - /* Adjust dynamic relocs. */ - eh = (struct ppc_link_hash_entry *) h; - for (pp = &eh->dyn_relocs; - (p = *pp) != NULL; - pp = &p->next) - if (p->sec == sec) - { - /* If we got rid of a DTPMOD/DTPREL reloc - pair then we'll lose one or two dyn - relocs. */ - if (tls_set == (TLS_EXPLICIT | TLS_GD)) - p->count -= 1; - p->count -= 1; - if (p->count == 0) - *pp = p->next; - break; - } + /* If we got rid of a DTPMOD/DTPREL reloc pair then + we'll lose one or two dyn relocs. */ + if (!dec_dynrel_count (rel->r_info, sec, info, + NULL, h, sym_sec)) + return FALSE; + + if (tls_set == (TLS_EXPLICIT | TLS_GD)) + { + if (!dec_dynrel_count ((rel + 1)->r_info, sec, info, + NULL, h, sym_sec)) + return FALSE; + } } *tls_mask |= tls_set; @@ -5561,6 +7026,9 @@ ppc64_elf_tls_optimize (bfd *obfd ATTRIBUTE_UNUSED, struct bfd_link_info *info) free (relstart); } + if (toc_ref != NULL) + free (toc_ref); + if (locsyms != NULL && (elf_tdata (ibfd)->symtab_hdr.contents != (unsigned char *) locsyms)) @@ -5574,6 +7042,462 @@ ppc64_elf_tls_optimize (bfd *obfd ATTRIBUTE_UNUSED, struct bfd_link_info *info) return TRUE; } +/* Called via elf_link_hash_traverse from ppc64_elf_edit_toc to adjust + the values of any global symbols in a toc section that has been + edited. Globals in toc sections should be a rarity, so this function + sets a flag if any are found in toc sections other than the one just + edited, so that futher hash table traversals can be avoided. */ + +struct adjust_toc_info +{ + asection *toc; + unsigned long *skip; + bfd_boolean global_toc_syms; +}; + +static bfd_boolean +adjust_toc_syms (struct elf_link_hash_entry *h, void *inf) +{ + struct ppc_link_hash_entry *eh; + struct adjust_toc_info *toc_inf = (struct adjust_toc_info *) inf; + + if (h->root.type == bfd_link_hash_indirect) + return TRUE; + + if (h->root.type == bfd_link_hash_warning) + h = (struct elf_link_hash_entry *) h->root.u.i.link; + + if (h->root.type != bfd_link_hash_defined + && h->root.type != bfd_link_hash_defweak) + return TRUE; + + eh = (struct ppc_link_hash_entry *) h; + if (eh->adjust_done) + return TRUE; + + if (eh->elf.root.u.def.section == toc_inf->toc) + { + unsigned long skip = toc_inf->skip[eh->elf.root.u.def.value >> 3]; + if (skip != (unsigned long) -1) + eh->elf.root.u.def.value -= skip; + else + { + (*_bfd_error_handler) + (_("%s defined in removed toc entry"), eh->elf.root.root.string); + eh->elf.root.u.def.section = &bfd_abs_section; + eh->elf.root.u.def.value = 0; + } + eh->adjust_done = 1; + } + else if (strcmp (eh->elf.root.u.def.section->name, ".toc") == 0) + toc_inf->global_toc_syms = TRUE; + + return TRUE; +} + +/* Examine all relocs referencing .toc sections in order to remove + unused .toc entries. */ + +bfd_boolean +ppc64_elf_edit_toc (bfd *obfd ATTRIBUTE_UNUSED, struct bfd_link_info *info) +{ + bfd *ibfd; + struct adjust_toc_info toc_inf; + + toc_inf.global_toc_syms = TRUE; + for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next) + { + asection *toc, *sec; + Elf_Internal_Shdr *symtab_hdr; + Elf_Internal_Sym *local_syms; + struct elf_link_hash_entry **sym_hashes; + Elf_Internal_Rela *relstart, *rel; + unsigned long *skip, *drop; + unsigned char *used; + unsigned char *keep, last, some_unused; + + toc = bfd_get_section_by_name (ibfd, ".toc"); + if (toc == NULL + || toc->size == 0 + || toc->sec_info_type == ELF_INFO_TYPE_JUST_SYMS + || elf_discarded_section (toc)) + continue; + + local_syms = NULL; + symtab_hdr = &elf_tdata (ibfd)->symtab_hdr; + sym_hashes = elf_sym_hashes (ibfd); + + /* Look at sections dropped from the final link. */ + skip = NULL; + relstart = NULL; + for (sec = ibfd->sections; sec != NULL; sec = sec->next) + { + if (sec->reloc_count == 0 + || !elf_discarded_section (sec) + || get_opd_info (sec) + || (sec->flags & SEC_ALLOC) == 0 + || (sec->flags & SEC_DEBUGGING) != 0) + continue; + + relstart = _bfd_elf_link_read_relocs (ibfd, sec, NULL, NULL, FALSE); + if (relstart == NULL) + goto error_ret; + + /* Run through the relocs to see which toc entries might be + unused. */ + for (rel = relstart; rel < relstart + sec->reloc_count; ++rel) + { + enum elf_ppc64_reloc_type r_type; + unsigned long r_symndx; + asection *sym_sec; + struct elf_link_hash_entry *h; + Elf_Internal_Sym *sym; + bfd_vma val; + + r_type = ELF64_R_TYPE (rel->r_info); + switch (r_type) + { + default: + continue; + + case R_PPC64_TOC16: + case R_PPC64_TOC16_LO: + case R_PPC64_TOC16_HI: + case R_PPC64_TOC16_HA: + case R_PPC64_TOC16_DS: + case R_PPC64_TOC16_LO_DS: + break; + } + + r_symndx = ELF64_R_SYM (rel->r_info); + if (!get_sym_h (&h, &sym, &sym_sec, NULL, &local_syms, + r_symndx, ibfd)) + goto error_ret; + + if (sym_sec != toc) + continue; + + if (h != NULL) + val = h->root.u.def.value; + else + val = sym->st_value; + val += rel->r_addend; + + if (val >= toc->size) + continue; + + /* Anything in the toc ought to be aligned to 8 bytes. + If not, don't mark as unused. */ + if (val & 7) + continue; + + if (skip == NULL) + { + skip = bfd_zmalloc (sizeof (*skip) * (toc->size + 7) / 8); + if (skip == NULL) + goto error_ret; + } + + skip[val >> 3] = 1; + } + + if (elf_section_data (sec)->relocs != relstart) + free (relstart); + } + + if (skip == NULL) + continue; + + used = bfd_zmalloc (sizeof (*used) * (toc->size + 7) / 8); + if (used == NULL) + { + error_ret: + if (local_syms != NULL + && symtab_hdr->contents != (unsigned char *) local_syms) + free (local_syms); + if (sec != NULL + && relstart != NULL + && elf_section_data (sec)->relocs != relstart) + free (relstart); + if (skip != NULL) + free (skip); + return FALSE; + } + + /* Now check all kept sections that might reference the toc. + Check the toc itself last. */ + for (sec = (ibfd->sections == toc && toc->next ? toc->next + : ibfd->sections); + sec != NULL; + sec = (sec == toc ? NULL + : sec->next == NULL ? toc + : sec->next == toc && toc->next ? toc->next + : sec->next)) + { + int repeat; + + if (sec->reloc_count == 0 + || elf_discarded_section (sec) + || get_opd_info (sec) + || (sec->flags & SEC_ALLOC) == 0 + || (sec->flags & SEC_DEBUGGING) != 0) + continue; + + relstart = _bfd_elf_link_read_relocs (ibfd, sec, NULL, NULL, TRUE); + if (relstart == NULL) + goto error_ret; + + /* Mark toc entries referenced as used. */ + repeat = 0; + do + for (rel = relstart; rel < relstart + sec->reloc_count; ++rel) + { + enum elf_ppc64_reloc_type r_type; + unsigned long r_symndx; + asection *sym_sec; + struct elf_link_hash_entry *h; + Elf_Internal_Sym *sym; + bfd_vma val; + + r_type = ELF64_R_TYPE (rel->r_info); + switch (r_type) + { + case R_PPC64_TOC16: + case R_PPC64_TOC16_LO: + case R_PPC64_TOC16_HI: + case R_PPC64_TOC16_HA: + case R_PPC64_TOC16_DS: + case R_PPC64_TOC16_LO_DS: + /* In case we're taking addresses of toc entries. */ + case R_PPC64_ADDR64: + break; + + default: + continue; + } + + r_symndx = ELF64_R_SYM (rel->r_info); + if (!get_sym_h (&h, &sym, &sym_sec, NULL, &local_syms, + r_symndx, ibfd)) + { + free (used); + goto error_ret; + } + + if (sym_sec != toc) + continue; + + if (h != NULL) + val = h->root.u.def.value; + else + val = sym->st_value; + val += rel->r_addend; + + if (val >= toc->size) + continue; + + /* For the toc section, we only mark as used if + this entry itself isn't unused. */ + if (sec == toc + && !used[val >> 3] + && (used[rel->r_offset >> 3] + || !skip[rel->r_offset >> 3])) + /* Do all the relocs again, to catch reference + chains. */ + repeat = 1; + + used[val >> 3] = 1; + } + while (repeat); + } + + /* Merge the used and skip arrays. Assume that TOC + doublewords not appearing as either used or unused belong + to to an entry more than one doubleword in size. */ + for (drop = skip, keep = used, last = 0, some_unused = 0; + drop < skip + (toc->size + 7) / 8; + ++drop, ++keep) + { + if (*keep) + { + *drop = 0; + last = 0; + } + else if (*drop) + { + some_unused = 1; + last = 1; + } + else + *drop = last; + } + + free (used); + + if (some_unused) + { + bfd_byte *contents, *src; + unsigned long off; + + /* Shuffle the toc contents, and at the same time convert the + skip array from booleans into offsets. */ + if (!bfd_malloc_and_get_section (ibfd, toc, &contents)) + goto error_ret; + + elf_section_data (toc)->this_hdr.contents = contents; + + for (src = contents, off = 0, drop = skip; + src < contents + toc->size; + src += 8, ++drop) + { + if (*drop) + { + *drop = (unsigned long) -1; + off += 8; + } + else if (off != 0) + { + *drop = off; + memcpy (src - off, src, 8); + } + } + toc->rawsize = toc->size; + toc->size = src - contents - off; + + if (toc->reloc_count != 0) + { + Elf_Internal_Rela *wrel; + bfd_size_type sz; + + /* Read toc relocs. */ + relstart = _bfd_elf_link_read_relocs (ibfd, toc, NULL, NULL, + TRUE); + if (relstart == NULL) + goto error_ret; + + /* Remove unused toc relocs, and adjust those we keep. */ + wrel = relstart; + for (rel = relstart; rel < relstart + toc->reloc_count; ++rel) + if (skip[rel->r_offset >> 3] != (unsigned long) -1) + { + wrel->r_offset = rel->r_offset - skip[rel->r_offset >> 3]; + wrel->r_info = rel->r_info; + wrel->r_addend = rel->r_addend; + ++wrel; + } + else if (!dec_dynrel_count (rel->r_info, toc, info, + &local_syms, NULL, NULL)) + goto error_ret; + + toc->reloc_count = wrel - relstart; + sz = elf_section_data (toc)->rel_hdr.sh_entsize; + elf_section_data (toc)->rel_hdr.sh_size = toc->reloc_count * sz; + BFD_ASSERT (elf_section_data (toc)->rel_hdr2 == NULL); + } + + /* Adjust addends for relocs against the toc section sym. */ + for (sec = ibfd->sections; sec != NULL; sec = sec->next) + { + if (sec->reloc_count == 0 + || elf_discarded_section (sec)) + continue; + + relstart = _bfd_elf_link_read_relocs (ibfd, sec, NULL, NULL, + TRUE); + if (relstart == NULL) + goto error_ret; + + for (rel = relstart; rel < relstart + sec->reloc_count; ++rel) + { + enum elf_ppc64_reloc_type r_type; + unsigned long r_symndx; + asection *sym_sec; + struct elf_link_hash_entry *h; + Elf_Internal_Sym *sym; + + r_type = ELF64_R_TYPE (rel->r_info); + switch (r_type) + { + default: + continue; + + case R_PPC64_TOC16: + case R_PPC64_TOC16_LO: + case R_PPC64_TOC16_HI: + case R_PPC64_TOC16_HA: + case R_PPC64_TOC16_DS: + case R_PPC64_TOC16_LO_DS: + case R_PPC64_ADDR64: + break; + } + + r_symndx = ELF64_R_SYM (rel->r_info); + if (!get_sym_h (&h, &sym, &sym_sec, NULL, &local_syms, + r_symndx, ibfd)) + goto error_ret; + + if (sym_sec != toc || h != NULL || sym->st_value != 0) + continue; + + rel->r_addend -= skip[rel->r_addend >> 3]; + } + } + + /* We shouldn't have local or global symbols defined in the TOC, + but handle them anyway. */ + if (local_syms != NULL) + { + Elf_Internal_Sym *sym; + + for (sym = local_syms; + sym < local_syms + symtab_hdr->sh_info; + ++sym) + if (sym->st_shndx != SHN_UNDEF + && (sym->st_shndx < SHN_LORESERVE + || sym->st_shndx > SHN_HIRESERVE) + && sym->st_value != 0 + && bfd_section_from_elf_index (ibfd, sym->st_shndx) == toc) + { + if (skip[sym->st_value >> 3] != (unsigned long) -1) + sym->st_value -= skip[sym->st_value >> 3]; + else + { + (*_bfd_error_handler) + (_("%s defined in removed toc entry"), + bfd_elf_sym_name (ibfd, symtab_hdr, sym, + NULL)); + sym->st_value = 0; + sym->st_shndx = SHN_ABS; + } + symtab_hdr->contents = (unsigned char *) local_syms; + } + } + + /* Finally, adjust any global syms defined in the toc. */ + if (toc_inf.global_toc_syms) + { + toc_inf.toc = toc; + toc_inf.skip = skip; + toc_inf.global_toc_syms = FALSE; + elf_link_hash_traverse (elf_hash_table (info), adjust_toc_syms, + &toc_inf); + } + } + + if (local_syms != NULL + && symtab_hdr->contents != (unsigned char *) local_syms) + { + if (!info->keep_memory) + free (local_syms); + else + symtab_hdr->contents = (unsigned char *) local_syms; + } + free (skip); + } + + return TRUE; +} + /* Allocate space in .plt, .got and associated reloc sections for dynamic relocs. */ @@ -5605,31 +7529,29 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf) for (pent = h->plt.plist; pent != NULL; pent = pent->next) if (pent->plt.refcount > 0) { - BFD_ASSERT (((struct ppc_link_hash_entry *) h)->is_func_descriptor); - /* If this is the first .plt entry, make room for the special first entry. */ s = htab->plt; - if (s->_raw_size == 0) - s->_raw_size += PLT_INITIAL_ENTRY_SIZE; + if (s->size == 0) + s->size += PLT_INITIAL_ENTRY_SIZE; - pent->plt.offset = s->_raw_size; + pent->plt.offset = s->size; /* Make room for this entry. */ - s->_raw_size += PLT_ENTRY_SIZE; + s->size += PLT_ENTRY_SIZE; /* Make room for the .glink code. */ s = htab->glink; - if (s->_raw_size == 0) - s->_raw_size += GLINK_CALL_STUB_SIZE; + if (s->size == 0) + s->size += GLINK_CALL_STUB_SIZE; /* We need bigger stubs past index 32767. */ - if (s->_raw_size >= GLINK_CALL_STUB_SIZE + 32768*2*4) - s->_raw_size += 4; - s->_raw_size += 2*4; + if (s->size >= GLINK_CALL_STUB_SIZE + 32768*2*4) + s->size += 4; + s->size += 2*4; /* We also need to make an entry in the .rela.plt section. */ s = htab->relplt; - s->_raw_size += sizeof (Elf64_External_Rela); + s->size += sizeof (Elf64_External_Rela); doneone = TRUE; } else @@ -5637,13 +7559,13 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf) if (!doneone) { h->plt.plist = NULL; - h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT; + h->needs_plt = 0; } } else { h->plt.plist = NULL; - h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT; + h->needs_plt = 0; } eh = (struct ppc_link_hash_entry *) h; @@ -5681,29 +7603,29 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf) Undefined weak syms won't yet be marked as dynamic, nor will all TLS symbols. */ if (h->dynindx == -1 - && (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0) + && !h->forced_local) { if (! bfd_elf_link_record_dynamic_symbol (info, h)) return FALSE; } if ((gent->tls_type & TLS_LD) != 0 - && !(h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC)) + && !h->def_dynamic) { gent->got.offset = ppc64_tlsld_got (gent->owner)->offset; continue; } s = ppc64_elf_tdata (gent->owner)->got; - gent->got.offset = s->_raw_size; - s->_raw_size + gent->got.offset = s->size; + s->size += (gent->tls_type & eh->tls_mask & (TLS_GD | TLS_LD)) ? 16 : 8; dyn = htab->elf.dynamic_sections_created; if ((info->shared || WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, 0, h)) && (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT || h->root.type != bfd_link_hash_undefweak)) - ppc64_elf_tdata (gent->owner)->relgot->_raw_size + ppc64_elf_tdata (gent->owner)->relgot->size += (gent->tls_type & eh->tls_mask & TLS_GD ? 2 * sizeof (Elf64_External_Rela) : sizeof (Elf64_External_Rela)); @@ -5745,9 +7667,21 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf) /* Also discard relocs on undefined weak syms with non-default visibility. */ - if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT + if (eh->dyn_relocs != NULL && h->root.type == bfd_link_hash_undefweak) - eh->dyn_relocs = NULL; + { + if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT) + eh->dyn_relocs = NULL; + + /* Make sure this symbol is output as a dynamic symbol. + Undefined weak syms won't yet be marked as dynamic. */ + else if (h->dynindx == -1 + && !h->forced_local) + { + if (! bfd_elf_link_record_dynamic_symbol (info, h)) + return FALSE; + } + } } else if (ELIMINATE_COPY_RELOCS) { @@ -5755,14 +7689,14 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf) symbols which turn out to need copy relocs or are not dynamic. */ - if ((h->elf_link_hash_flags & ELF_LINK_NON_GOT_REF) == 0 - && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) != 0 - && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0) + if (!h->non_got_ref + && h->def_dynamic + && !h->def_regular) { /* Make sure this symbol is output as a dynamic symbol. Undefined weak syms won't yet be marked as dynamic. */ if (h->dynindx == -1 - && (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0) + && !h->forced_local) { if (! bfd_elf_link_record_dynamic_symbol (info, h)) return FALSE; @@ -5783,7 +7717,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf) for (p = eh->dyn_relocs; p != NULL; p = p->next) { asection *sreloc = elf_section_data (p->sec)->sreloc; - sreloc->_raw_size += p->count * sizeof (Elf64_External_Rela); + sreloc->size += p->count * sizeof (Elf64_External_Rela); } return TRUE; @@ -5843,7 +7777,7 @@ ppc64_elf_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED, s = bfd_get_section_by_name (dynobj, ".interp"); if (s == NULL) abort (); - s->_raw_size = sizeof ELF_DYNAMIC_INTERPRETER; + s->size = sizeof ELF_DYNAMIC_INTERPRETER; s->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER; } } @@ -5859,18 +7793,18 @@ ppc64_elf_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED, Elf_Internal_Shdr *symtab_hdr; asection *srel; - if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour) + if (!is_ppc64_elf_target (ibfd->xvec)) continue; if (ppc64_tlsld_got (ibfd)->refcount > 0) { s = ppc64_elf_tdata (ibfd)->got; - ppc64_tlsld_got (ibfd)->offset = s->_raw_size; - s->_raw_size += 16; + ppc64_tlsld_got (ibfd)->offset = s->size; + s->size += 16; if (info->shared) { srel = ppc64_elf_tdata (ibfd)->relgot; - srel->_raw_size += sizeof (Elf64_External_Rela); + srel->size += sizeof (Elf64_External_Rela); } } else @@ -5880,10 +7814,7 @@ ppc64_elf_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED, { struct ppc_dyn_relocs *p; - for (p = *((struct ppc_dyn_relocs **) - &elf_section_data (s)->local_dynrel); - p != NULL; - p = p->next) + for (p = elf_section_data (s)->local_dynrel; p != NULL; p = p->next) { if (!bfd_is_abs_section (p->sec) && bfd_is_abs_section (p->sec->output_section)) @@ -5896,7 +7827,7 @@ ppc64_elf_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED, else if (p->count != 0) { srel = elf_section_data (p->sec)->sreloc; - srel->_raw_size += p->count * sizeof (Elf64_External_Rela); + srel->size += p->count * sizeof (Elf64_External_Rela); if ((p->sec->output_section->flags & SEC_READONLY) != 0) info->flags |= DF_TEXTREL; } @@ -5924,27 +7855,27 @@ ppc64_elf_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED, { if (ppc64_tlsld_got (ibfd)->offset == (bfd_vma) -1) { - ppc64_tlsld_got (ibfd)->offset = s->_raw_size; - s->_raw_size += 16; + ppc64_tlsld_got (ibfd)->offset = s->size; + s->size += 16; if (info->shared) - srel->_raw_size += sizeof (Elf64_External_Rela); + srel->size += sizeof (Elf64_External_Rela); } ent->got.offset = ppc64_tlsld_got (ibfd)->offset; } else { - ent->got.offset = s->_raw_size; + ent->got.offset = s->size; if ((ent->tls_type & *lgot_masks & TLS_GD) != 0) { - s->_raw_size += 16; + s->size += 16; if (info->shared) - srel->_raw_size += 2 * sizeof (Elf64_External_Rela); + srel->size += 2 * sizeof (Elf64_External_Rela); } else { - s->_raw_size += 8; + s->size += 8; if (info->shared) - srel->_raw_size += sizeof (Elf64_External_Rela); + srel->size += sizeof (Elf64_External_Rela); } } } @@ -5965,35 +7896,20 @@ ppc64_elf_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED, if ((s->flags & SEC_LINKER_CREATED) == 0) continue; - /* Reset _cooked_size since prelim layout will set it wrongly, - and a non-zero _cooked_size sticks. */ - s->_cooked_size = 0; - if (s == htab->brlt || s == htab->relbrlt) /* These haven't been allocated yet; don't strip. */ continue; else if (s == htab->got || s == htab->plt - || s == htab->glink) + || s == htab->glink + || s == htab->dynbss) { /* Strip this section if we don't need it; see the comment below. */ } else if (strncmp (bfd_get_section_name (dynobj, s), ".rela", 5) == 0) { - if (s->_raw_size == 0) - { - /* If we don't need this section, strip it from the - output file. This is mostly to handle .rela.bss and - .rela.plt. We must create both sections in - create_dynamic_sections, because they must be created - before the linker maps input sections to output - sections. The linker does that before - adjust_dynamic_symbol is called, and it is that - function which decides whether anything needs to go - into these sections. */ - } - else + if (s->size != 0) { if (s != htab->relplt) relocs = TRUE; @@ -6009,14 +7925,22 @@ ppc64_elf_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED, continue; } - if (s->_raw_size == 0) + if (s->size == 0) { - _bfd_strip_section_from_output (info, s); + /* If we don't need this section, strip it from the + output file. This is mostly to handle .rela.bss and + .rela.plt. We must create both sections in + create_dynamic_sections, because they must be created + before the linker maps input sections to output + sections. The linker does that before + adjust_dynamic_symbol is called, and it is that + function which decides whether anything needs to go + into these sections. */ + s->flags |= SEC_EXCLUDE; continue; } - /* .plt is in the bss section. We don't initialise it. */ - if (s == htab->plt) + if ((s->flags & SEC_HAS_CONTENTS) == 0) continue; /* Allocate memory for the section contents. We use bfd_zalloc @@ -6026,22 +7950,24 @@ ppc64_elf_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED, sections instead of garbage. We also rely on the section contents being zero when writing the GOT. */ - s->contents = bfd_zalloc (dynobj, s->_raw_size); + s->contents = bfd_zalloc (dynobj, s->size); if (s->contents == NULL) return FALSE; } for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next) { + if (!is_ppc64_elf_target (ibfd->xvec)) + continue; + s = ppc64_elf_tdata (ibfd)->got; if (s != NULL && s != htab->got) { - s->_cooked_size = 0; - if (s->_raw_size == 0) - _bfd_strip_section_from_output (info, s); + if (s->size == 0) + s->flags |= SEC_EXCLUDE; else { - s->contents = bfd_zalloc (ibfd, s->_raw_size); + s->contents = bfd_zalloc (ibfd, s->size); if (s->contents == NULL) return FALSE; } @@ -6049,12 +7975,11 @@ ppc64_elf_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED, s = ppc64_elf_tdata (ibfd)->relgot; if (s != NULL) { - s->_cooked_size = 0; - if (s->_raw_size == 0) - _bfd_strip_section_from_output (info, s); + if (s->size == 0) + s->flags |= SEC_EXCLUDE; else { - s->contents = bfd_zalloc (ibfd, s->_raw_size); + s->contents = bfd_zalloc (ibfd, s->size); if (s->contents == NULL) return FALSE; relocs = TRUE; @@ -6079,7 +8004,7 @@ ppc64_elf_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED, return FALSE; } - if (htab->plt != NULL && htab->plt->_raw_size != 0) + if (htab->plt != NULL && htab->plt->size != 0) { if (!add_dynamic_entry (DT_PLTGOT, 0) || !add_dynamic_entry (DT_PLTRELSZ, 0) @@ -6136,22 +8061,34 @@ ppc_type_of_stub (asection *input_sec, if (h != NULL) { - if (h->oh != NULL - && h->oh->dynindx != -1) + struct ppc_link_hash_entry *fdh = h; + if (fdh->oh != NULL + && fdh->oh->is_func_descriptor) + fdh = fdh->oh; + + if (fdh->elf.dynindx != -1) { struct plt_entry *ent; - for (ent = h->oh->plt.plist; ent != NULL; ent = ent->next) + + for (ent = fdh->elf.plt.plist; ent != NULL; ent = ent->next) if (ent->addend == rel->r_addend && ent->plt.offset != (bfd_vma) -1) { - *hash = (struct ppc_link_hash_entry *) h->oh; + *hash = fdh; return ppc_stub_plt_call; } } - if (!(h->elf.root.type == bfd_link_hash_defined - || h->elf.root.type == bfd_link_hash_defweak) - || h->elf.root.u.def.section->output_section == NULL) + /* Here, we know we don't have a plt entry. If we don't have a + either a defined function descriptor or a defined entry symbol + in a regular object file, then it is pointless trying to make + any other type of stub. */ + if (!((fdh->elf.root.type == bfd_link_hash_defined + || fdh->elf.root.type == bfd_link_hash_defweak) + && fdh->elf.root.u.def.section->output_section != NULL) + && !((h->elf.root.type == bfd_link_hash_defined + || h->elf.root.type == bfd_link_hash_defweak) + && h->elf.root.u.def.section->output_section != NULL)) return ppc_stub_none; } @@ -6212,7 +8149,7 @@ ppc_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg) bfd_byte *p; unsigned int indx; struct plt_entry *ent; - bfd_vma off; + bfd_vma dest, off; int size; /* Massage our args to the form they really have. */ @@ -6222,7 +8159,7 @@ ppc_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg) htab = ppc_hash_table (info); /* Make a note of the offset within the stubs for this entry. */ - stub_entry->stub_offset = stub_entry->stub_sec->_cooked_size; + stub_entry->stub_offset = stub_entry->stub_sec->size; loc = stub_entry->stub_sec->contents + stub_entry->stub_offset; htab->stub_count[stub_entry->stub_type - 1] += 1; @@ -6231,9 +8168,9 @@ ppc_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg) case ppc_stub_long_branch: case ppc_stub_long_branch_r2off: /* Branches are relative. This is where we are going to. */ - off = (stub_entry->target_value - + stub_entry->target_section->output_offset - + stub_entry->target_section->output_section->vma); + off = dest = (stub_entry->target_value + + stub_entry->target_section->output_offset + + stub_entry->target_section->output_section->vma); /* And this is where we are coming from. */ off -= (stub_entry->stub_offset @@ -6259,7 +8196,74 @@ ppc_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg) } bfd_put_32 (htab->stub_bfd, B_DOT | (off & 0x3fffffc), loc); - BFD_ASSERT (off + (1 << 25) < (bfd_vma) (1 << 26)); + if (off + (1 << 25) >= (bfd_vma) (1 << 26)) + { + (*_bfd_error_handler) (_("long branch stub `%s' offset overflow"), + stub_entry->root.string); + htab->stub_error = TRUE; + return FALSE; + } + + if (info->emitrelocations) + { + Elf_Internal_Rela *relocs, *r; + struct bfd_elf_section_data *elfsec_data; + + elfsec_data = elf_section_data (stub_entry->stub_sec); + relocs = elfsec_data->relocs; + if (relocs == NULL) + { + bfd_size_type relsize; + relsize = stub_entry->stub_sec->reloc_count * sizeof (*relocs); + relocs = bfd_alloc (htab->stub_bfd, relsize); + if (relocs == NULL) + return FALSE; + elfsec_data->relocs = relocs; + elfsec_data->rel_hdr.sh_size = relsize; + elfsec_data->rel_hdr.sh_entsize = 24; + stub_entry->stub_sec->reloc_count = 0; + } + r = relocs + stub_entry->stub_sec->reloc_count; + stub_entry->stub_sec->reloc_count += 1; + r->r_offset = loc - stub_entry->stub_sec->contents; + r->r_info = ELF64_R_INFO (0, R_PPC64_REL24); + r->r_addend = dest; + if (stub_entry->h != NULL) + { + struct elf_link_hash_entry **hashes; + unsigned long symndx; + struct ppc_link_hash_entry *h; + + hashes = elf_sym_hashes (htab->stub_bfd); + if (hashes == NULL) + { + bfd_size_type hsize; + + hsize = (htab->stub_globals + 1) * sizeof (*hashes); + hashes = bfd_zalloc (htab->stub_bfd, hsize); + if (hashes == NULL) + return FALSE; + elf_sym_hashes (htab->stub_bfd) = hashes; + htab->stub_globals = 1; + } + symndx = htab->stub_globals++; + h = stub_entry->h; + hashes[symndx] = &h->elf; + r->r_info = ELF64_R_INFO (symndx, R_PPC64_REL24); + if (h->oh != NULL && h->oh->is_func) + h = h->oh; + if (h->elf.root.u.def.section != stub_entry->target_section) + /* H is an opd symbol. The addend must be zero. */ + r->r_addend = 0; + else + { + off = (h->elf.root.u.def.value + + h->elf.root.u.def.section->output_offset + + h->elf.root.u.def.section->output_section->vma); + r->r_addend -= off; + } + } + } break; case ppc_stub_plt_branch: @@ -6270,7 +8274,7 @@ ppc_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg) if (br_entry == NULL) { (*_bfd_error_handler) (_("can't find branch stub `%s'"), - stub_entry->root.string + 9); + stub_entry->root.string); htab->stub_error = TRUE; return FALSE; } @@ -6282,7 +8286,7 @@ ppc_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg) bfd_put_64 (htab->brlt->owner, off, htab->brlt->contents + br_entry->offset); - if (info->shared) + if (htab->relbrlt != NULL) { /* Create a reloc for the branch lookup table entry. */ Elf_Internal_Rela rela; @@ -6350,17 +8354,18 @@ ppc_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg) /* Do the best we can for shared libraries built without exporting ".foo" for each "foo". This can happen when symbol versioning scripts strip all bar a subset of symbols. */ - if (stub_entry->h->oh->root.type != bfd_link_hash_defined - && stub_entry->h->oh->root.type != bfd_link_hash_defweak) + if (stub_entry->h->oh != NULL + && stub_entry->h->oh->elf.root.type != bfd_link_hash_defined + && stub_entry->h->oh->elf.root.type != bfd_link_hash_defweak) { /* Point the symbol at the stub. There may be multiple stubs, we don't really care; The main thing is to make this sym defined somewhere. Maybe defining the symbol in the stub section is a silly idea. If we didn't do this, htab->top_id could disappear. */ - stub_entry->h->oh->root.type = bfd_link_hash_defined; - stub_entry->h->oh->root.u.def.section = stub_entry->stub_sec; - stub_entry->h->oh->root.u.def.value = stub_entry->stub_offset; + stub_entry->h->oh->elf.root.type = bfd_link_hash_defined; + stub_entry->h->oh->elf.root.u.def.section = stub_entry->stub_sec; + stub_entry->h->oh->elf.root.u.def.value = stub_entry->stub_offset; } /* Now build the stub. */ @@ -6399,17 +8404,28 @@ ppc_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg) return FALSE; } - stub_entry->stub_sec->_cooked_size += size; + stub_entry->stub_sec->size += size; - if (htab->emit_stub_syms - && !(stub_entry->stub_type == ppc_stub_plt_call - && stub_entry->h->oh->root.type == bfd_link_hash_defined - && stub_entry->h->oh->root.u.def.section == stub_entry->stub_sec - && stub_entry->h->oh->root.u.def.value == stub_entry->stub_offset)) + if (htab->emit_stub_syms) { struct elf_link_hash_entry *h; - h = elf_link_hash_lookup (&htab->elf, stub_entry->root.string, - TRUE, FALSE, FALSE); + size_t len1, len2; + char *name; + const char *const stub_str[] = { "long_branch", + "long_branch_r2off", + "plt_branch", + "plt_branch_r2off", + "plt_call" }; + + len1 = strlen (stub_str[stub_entry->stub_type - 1]); + len2 = strlen (stub_entry->root.string); + name = bfd_malloc (len1 + len2 + 2); + if (name == NULL) + return FALSE; + memcpy (name, stub_entry->root.string, 9); + memcpy (name + 9, stub_str[stub_entry->stub_type - 1], len1); + memcpy (name + len1 + 9, stub_entry->root.string + 8, len2 - 8 + 1); + h = elf_link_hash_lookup (&htab->elf, name, TRUE, FALSE, FALSE); if (h == NULL) return FALSE; if (h->root.type == bfd_link_hash_new) @@ -6417,10 +8433,11 @@ ppc_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg) h->root.type = bfd_link_hash_defined; h->root.u.def.section = stub_entry->stub_sec; h->root.u.def.value = stub_entry->stub_offset; - h->elf_link_hash_flags = (ELF_LINK_HASH_REF_REGULAR - | ELF_LINK_HASH_DEF_REGULAR - | ELF_LINK_HASH_REF_REGULAR_NONWEAK - | ELF_LINK_FORCED_LOCAL); + h->ref_regular = 1; + h->def_regular = 1; + h->ref_regular_nonweak = 1; + h->forced_local = 1; + h->non_elf = 0; } } @@ -6474,7 +8491,7 @@ ppc_size_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg) off = (stub_entry->target_value + stub_entry->target_section->output_offset + stub_entry->target_section->output_section->vma); - off -= (stub_entry->stub_sec->_raw_size + off -= (stub_entry->stub_sec->size + stub_entry->stub_sec->output_offset + stub_entry->stub_sec->output_section->vma); @@ -6501,7 +8518,7 @@ ppc_size_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg) if (br_entry == NULL) { (*_bfd_error_handler) (_("can't build branch stub `%s'"), - stub_entry->root.string + 9); + stub_entry->root.string); htab->stub_error = TRUE; return FALSE; } @@ -6509,11 +8526,11 @@ ppc_size_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg) if (br_entry->iter != htab->stub_iteration) { br_entry->iter = htab->stub_iteration; - br_entry->offset = htab->brlt->_raw_size; - htab->brlt->_raw_size += 8; + br_entry->offset = htab->brlt->size; + htab->brlt->size += 8; - if (info->shared) - htab->relbrlt->_raw_size += sizeof (Elf64_External_Rela); + if (htab->relbrlt != NULL) + htab->relbrlt->size += sizeof (Elf64_External_Rela); } stub_entry->stub_type += ppc_stub_plt_branch - ppc_stub_long_branch; @@ -6521,9 +8538,14 @@ ppc_size_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg) if (stub_entry->stub_type != ppc_stub_plt_branch) size = 28; } + + if (info->emitrelocations + && (stub_entry->stub_type == ppc_stub_long_branch + || stub_entry->stub_type == ppc_stub_long_branch_r2off)) + stub_entry->stub_sec->reloc_count += 1; } - stub_entry->stub_sec->_raw_size += size; + stub_entry->stub_sec->size += size; return TRUE; } @@ -6532,7 +8554,9 @@ ppc_size_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg) 0 when no stubs will be needed, and 1 on success. */ int -ppc64_elf_setup_section_lists (bfd *output_bfd, struct bfd_link_info *info) +ppc64_elf_setup_section_lists (bfd *output_bfd, + struct bfd_link_info *info, + int no_multi_toc) { bfd *input_bfd; int top_id, top_index, id; @@ -6541,6 +8565,8 @@ ppc64_elf_setup_section_lists (bfd *output_bfd, struct bfd_link_info *info) bfd_size_type amt; struct ppc_link_hash_table *htab = ppc_hash_table (info); + htab->no_multi_toc = no_multi_toc; + if (htab->brlt == NULL) return 0; @@ -6572,7 +8598,7 @@ ppc64_elf_setup_section_lists (bfd *output_bfd, struct bfd_link_info *info) /* We can't use output_bfd->section_count here to find the top output section index as some sections may have been removed, and - _bfd_strip_section_from_output doesn't renumber the indices. */ + strip_excluded_output_sections doesn't renumber the indices. */ for (section = output_bfd->sections, top_index = 0; section != NULL; section = section->next) @@ -6605,11 +8631,10 @@ ppc64_elf_next_toc_section (struct bfd_link_info *info, asection *isec) { bfd_vma addr = isec->output_offset + isec->output_section->vma; bfd_vma off = addr - htab->toc_curr; - if (off + isec->_raw_size > 0x10000) - { - htab->toc_curr = addr; - htab->multi_toc_needed = 1; - } + + if (off + isec->size > 0x10000) + htab->toc_curr = addr; + elf_gp (isec->owner) = (htab->toc_curr - elf_gp (isec->output_section->owner) + TOC_BASE_OFF); @@ -6619,11 +8644,12 @@ ppc64_elf_next_toc_section (struct bfd_link_info *info, asection *isec) /* Called after the last call to the above function. */ void -ppc64_elf_reinit_toc (bfd *output_bfd ATTRIBUTE_UNUSED, - struct bfd_link_info *info) +ppc64_elf_reinit_toc (bfd *output_bfd, struct bfd_link_info *info) { struct ppc_link_hash_table *htab = ppc_hash_table (info); + htab->multi_toc_needed = htab->toc_curr != elf_gp (output_bfd); + /* toc_curr tracks the TOC offset used for code sections below in ppc64_elf_next_input_section. Start off at 0x8000. */ htab->toc_curr = TOC_BASE_OFF; @@ -6632,64 +8658,208 @@ ppc64_elf_reinit_toc (bfd *output_bfd ATTRIBUTE_UNUSED, /* No toc references were found in ISEC. If the code in ISEC makes no calls, then there's no need to use toc adjusting stubs when branching into ISEC. Actually, indirect calls from ISEC are OK as they will - load r2. */ + load r2. Returns -1 on error, 0 for no stub needed, 1 for stub + needed, and 2 if a cyclical call-graph was found but no other reason + for a stub was detected. If called from the top level, a return of + 2 means the same as a return of 0. */ static int toc_adjusting_stub_needed (struct bfd_link_info *info, asection *isec) { - bfd_byte *contents; - bfd_size_type i; + Elf_Internal_Rela *relstart, *rel; + Elf_Internal_Sym *local_syms; int ret; - int branch_ok; + struct ppc_link_hash_table *htab; /* We know none of our code bearing sections will need toc stubs. */ if ((isec->flags & SEC_LINKER_CREATED) != 0) return 0; - if (isec->_raw_size == 0) + if (isec->size == 0) + return 0; + + if (isec->output_section == NULL) return 0; /* Hack for linux kernel. .fixup contains branches, but only back to the function that hit an exception. */ - branch_ok = strcmp (isec->name, ".fixup") == 0; + if (strcmp (isec->name, ".fixup") == 0) + return 0; - contents = elf_section_data (isec)->this_hdr.contents; - if (contents == NULL) + if (isec->reloc_count == 0) + return 0; + + relstart = _bfd_elf_link_read_relocs (isec->owner, isec, NULL, NULL, + info->keep_memory); + if (relstart == NULL) + return -1; + + /* Look for branches to outside of this section. */ + local_syms = NULL; + ret = 0; + htab = ppc_hash_table (info); + for (rel = relstart; rel < relstart + isec->reloc_count; ++rel) { - contents = bfd_malloc (isec->_raw_size); - if (contents == NULL) - return -1; - if (! bfd_get_section_contents (isec->owner, isec, contents, - 0, isec->_raw_size)) + enum elf_ppc64_reloc_type r_type; + unsigned long r_symndx; + struct elf_link_hash_entry *h; + Elf_Internal_Sym *sym; + asection *sym_sec; + long *opd_adjust; + bfd_vma sym_value; + bfd_vma dest; + + r_type = ELF64_R_TYPE (rel->r_info); + if (r_type != R_PPC64_REL24 + && r_type != R_PPC64_REL14 + && r_type != R_PPC64_REL14_BRTAKEN + && r_type != R_PPC64_REL14_BRNTAKEN) + continue; + + r_symndx = ELF64_R_SYM (rel->r_info); + if (!get_sym_h (&h, &sym, &sym_sec, NULL, &local_syms, r_symndx, + isec->owner)) { - free (contents); - return -1; + ret = -1; + break; } - if (info->keep_memory) - elf_section_data (isec)->this_hdr.contents = contents; - } - /* Code scan, because we don't necessarily have relocs on calls to - static functions. */ - ret = 0; - for (i = 0; i < isec->_raw_size; i += 4) - { - unsigned long insn = bfd_get_32 (isec->owner, contents + i); - /* Is this a branch? */ - if ((insn & (0x3f << 26)) == (18 << 26) - /* If branch and link, it's a function call. */ - && ((insn & 1) != 0 - /* Sibling calls use a plain branch. I don't know a way - of deciding whether a branch is really a sibling call. */ - || !branch_ok)) + /* Calls to dynamic lib functions go through a plt call stub + that uses r2. Branches to undefined symbols might be a call + using old-style dot symbols that can be satisfied by a plt + call into a new-style dynamic library. */ + if (sym_sec == NULL) + { + struct ppc_link_hash_entry *eh = (struct ppc_link_hash_entry *) h; + if (eh != NULL + && eh->oh != NULL + && eh->oh->elf.plt.plist != NULL) + { + ret = 1; + break; + } + + /* Ignore other undefined symbols. */ + continue; + } + + /* Assume branches to other sections not included in the link need + stubs too, to cover -R and absolute syms. */ + if (sym_sec->output_section == NULL) { ret = 1; break; } + + if (h == NULL) + sym_value = sym->st_value; + else + { + if (h->root.type != bfd_link_hash_defined + && h->root.type != bfd_link_hash_defweak) + abort (); + sym_value = h->root.u.def.value; + } + sym_value += rel->r_addend; + + /* If this branch reloc uses an opd sym, find the code section. */ + opd_adjust = get_opd_info (sym_sec); + if (opd_adjust != NULL) + { + if (h == NULL) + { + long adjust; + + adjust = opd_adjust[sym->st_value / 8]; + if (adjust == -1) + /* Assume deleted functions won't ever be called. */ + continue; + sym_value += adjust; + } + + dest = opd_entry_value (sym_sec, sym_value, &sym_sec, NULL); + if (dest == (bfd_vma) -1) + continue; + } + else + dest = (sym_value + + sym_sec->output_offset + + sym_sec->output_section->vma); + + /* Ignore branch to self. */ + if (sym_sec == isec) + continue; + + /* If the called function uses the toc, we need a stub. */ + if (sym_sec->has_toc_reloc + || sym_sec->makes_toc_func_call) + { + ret = 1; + break; + } + + /* Assume any branch that needs a long branch stub might in fact + need a plt_branch stub. A plt_branch stub uses r2. */ + else if (dest - (isec->output_offset + + isec->output_section->vma + + rel->r_offset) + (1 << 25) >= (2 << 25)) + { + ret = 1; + break; + } + + /* If calling back to a section in the process of being tested, we + can't say for sure that no toc adjusting stubs are needed, so + don't return zero. */ + else if (sym_sec->call_check_in_progress) + ret = 2; + + /* Branches to another section that itself doesn't have any TOC + references are OK. Recursively call ourselves to check. */ + else if (sym_sec->id <= htab->top_id + && htab->stub_group[sym_sec->id].toc_off == 0) + { + int recur; + + /* Mark current section as indeterminate, so that other + sections that call back to current won't be marked as + known. */ + isec->call_check_in_progress = 1; + recur = toc_adjusting_stub_needed (info, sym_sec); + isec->call_check_in_progress = 0; + + if (recur < 0) + { + /* An error. Exit. */ + ret = -1; + break; + } + else if (recur <= 1) + { + /* Known result. Mark as checked and set section flag. */ + htab->stub_group[sym_sec->id].toc_off = 1; + if (recur != 0) + { + sym_sec->makes_toc_func_call = 1; + ret = 1; + break; + } + } + else + { + /* Unknown result. Continue checking. */ + ret = 2; + } + } } - if (elf_section_data (isec)->this_hdr.contents != contents) - free (contents); + if (local_syms != NULL + && (elf_tdata (isec->owner)->symtab_hdr.contents + != (unsigned char *) local_syms)) + free (local_syms); + if (elf_section_data (isec)->relocs != relstart) + free (relstart); + return ret; } @@ -6702,7 +8872,6 @@ bfd_boolean ppc64_elf_next_input_section (struct bfd_link_info *info, asection *isec) { struct ppc_link_hash_table *htab = ppc_hash_table (info); - int ret; if ((isec->output_section->flags & SEC_CODE) != 0 && isec->output_section->index <= htab->top_index) @@ -6716,19 +8885,26 @@ ppc64_elf_next_input_section (struct bfd_link_info *info, asection *isec) *list = isec; } - /* If a code section has a function that uses the TOC then we need - to use the right TOC (obviously). Also, make sure that .opd gets - the correct TOC value for R_PPC64_TOC relocs that don't have or - can't find their function symbol (shouldn't ever happen now). */ - if (isec->has_gp_reloc || (isec->flags & SEC_CODE) == 0) + if (htab->multi_toc_needed) { - if (elf_gp (isec->owner) != 0) - htab->toc_curr = elf_gp (isec->owner); + /* If a code section has a function that uses the TOC then we need + to use the right TOC (obviously). Also, make sure that .opd gets + the correct TOC value for R_PPC64_TOC relocs that don't have or + can't find their function symbol (shouldn't ever happen now). */ + if (isec->has_toc_reloc || (isec->flags & SEC_CODE) == 0) + { + if (elf_gp (isec->owner) != 0) + htab->toc_curr = elf_gp (isec->owner); + } + else if (htab->stub_group[isec->id].toc_off == 0) + { + int ret = toc_adjusting_stub_needed (info, isec); + if (ret < 0) + return FALSE; + else + isec->makes_toc_func_call = ret & 1; + } } - else if ((ret = toc_adjusting_stub_needed (info, isec)) < 0) - return FALSE; - else - isec->has_gp_reloc = ret; /* Functions that don't use the TOC can belong in any TOC group. Use the last TOC base. This happens to make _init and _fini @@ -6762,11 +8938,11 @@ group_sections (struct ppc_link_hash_table *htab, bfd_vma curr_toc; curr = tail; - if (tail->_cooked_size) - total = tail->_cooked_size; - else - total = tail->_raw_size; - big_sec = total >= stub_group_size; + total = tail->size; + big_sec = total > stub_group_size; + if (big_sec) + (*_bfd_error_handler) (_("%B section %A exceeds stub group size"), + tail->owner, tail); curr_toc = htab->stub_group[tail->id].toc_off; while ((prev = PREV_SEC (curr)) != NULL @@ -6868,10 +9044,8 @@ ppc64_elf_size_stubs (bfd *output_bfd, bfd *input_bfd; unsigned int bfd_indx; asection *stub_sec; - bfd_boolean stub_changed; htab->stub_iteration += 1; - stub_changed = FALSE; for (input_bfd = info->input_bfds, bfd_indx = 0; input_bfd != NULL; @@ -6881,6 +9055,9 @@ ppc64_elf_size_stubs (bfd *output_bfd, asection *section; Elf_Internal_Sym *local_syms = NULL; + if (!is_ppc64_elf_target (input_bfd->xvec)) + continue; + /* We'll need the symbol table in a second. */ symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr; if (symtab_hdr->sh_info == 0) @@ -6921,14 +9098,17 @@ ppc64_elf_size_stubs (bfd *output_bfd, unsigned int r_indx; enum ppc_stub_type stub_type; struct ppc_stub_hash_entry *stub_entry; - asection *sym_sec; + asection *sym_sec, *code_sec; bfd_vma sym_value; bfd_vma destination; + bfd_boolean ok_dest; struct ppc_link_hash_entry *hash; + struct ppc_link_hash_entry *fdh; struct elf_link_hash_entry *h; Elf_Internal_Sym *sym; char *stub_name; const asection *id_sec; + long *opd_adjust; r_type = ELF64_R_TYPE (irela->r_info); r_indx = ELF64_R_SYM (irela->r_info); @@ -6948,41 +9128,88 @@ ppc64_elf_size_stubs (bfd *output_bfd, /* Now determine the call target, its name, value, section. */ - destination = 0; if (!get_sym_h (&h, &sym, &sym_sec, NULL, &local_syms, r_indx, input_bfd)) goto error_ret_free_internal; hash = (struct ppc_link_hash_entry *) h; + ok_dest = FALSE; + fdh = NULL; + sym_value = 0; if (hash == NULL) { - /* It's a local symbol. */ sym_value = sym->st_value; - destination = (sym_value + irela->r_addend + ok_dest = TRUE; + } + else if (hash->elf.root.type == bfd_link_hash_defined + || hash->elf.root.type == bfd_link_hash_defweak) + { + sym_value = hash->elf.root.u.def.value; + if (sym_sec->output_section != NULL) + ok_dest = TRUE; + } + else if (hash->elf.root.type == bfd_link_hash_undefweak + || hash->elf.root.type == bfd_link_hash_undefined) + { + /* Recognise an old ABI func code entry sym, and + use the func descriptor sym instead if it is + defined. */ + if (hash->elf.root.root.string[0] == '.' + && (fdh = get_fdh (hash, htab)) != NULL) + { + if (fdh->elf.root.type == bfd_link_hash_defined + || fdh->elf.root.type == bfd_link_hash_defweak) + { + sym_sec = fdh->elf.root.u.def.section; + sym_value = fdh->elf.root.u.def.value; + if (sym_sec->output_section != NULL) + ok_dest = TRUE; + } + else + fdh = NULL; + } + } + else + { + bfd_set_error (bfd_error_bad_value); + goto error_ret_free_internal; + } + + destination = 0; + if (ok_dest) + { + sym_value += irela->r_addend; + destination = (sym_value + sym_sec->output_offset + sym_sec->output_section->vma); } - else + + code_sec = sym_sec; + opd_adjust = get_opd_info (sym_sec); + if (opd_adjust != NULL) { - /* It's an external symbol. */ - sym_value = 0; - if (hash->elf.root.type == bfd_link_hash_defined - || hash->elf.root.type == bfd_link_hash_defweak) + bfd_vma dest; + + if (hash == NULL) { - sym_value = hash->elf.root.u.def.value; - if (sym_sec->output_section != NULL) - destination = (sym_value + irela->r_addend - + sym_sec->output_offset - + sym_sec->output_section->vma); + long adjust = opd_adjust[sym_value / 8]; + if (adjust == -1) + continue; + sym_value += adjust; } - else if (hash->elf.root.type == bfd_link_hash_undefweak) - ; - else if (hash->elf.root.type == bfd_link_hash_undefined) - ; - else + dest = opd_entry_value (sym_sec, sym_value, + &code_sec, &sym_value); + if (dest != (bfd_vma) -1) { - bfd_set_error (bfd_error_bad_value); - goto error_ret_free_internal; + destination = dest; + if (fdh != NULL) + { + /* Fixup old ABI sym to point at code + entry. */ + hash->elf.root.type = bfd_link_hash_defweak; + hash->elf.root.u.def.section = code_sec; + hash->elf.root.u.def.value = sym_value; + } } } @@ -6998,12 +9225,12 @@ ppc64_elf_size_stubs (bfd *output_bfd, _init and _fini functions, it may be that a call to what looks like a local sym is in fact a call needing a TOC adjustment. */ - if (sym_sec != NULL - && sym_sec->output_section != NULL - && (htab->stub_group[sym_sec->id].toc_off + if (code_sec != NULL + && code_sec->output_section != NULL + && (htab->stub_group[code_sec->id].toc_off != htab->stub_group[section->id].toc_off) - && sym_sec->has_gp_reloc - && section->has_gp_reloc) + && (code_sec->has_toc_reloc + || code_sec->makes_toc_func_call)) stub_type = ppc_stub_long_branch_r2off; } @@ -7013,7 +9240,8 @@ ppc64_elf_size_stubs (bfd *output_bfd, /* __tls_get_addr calls might be eliminated. */ if (stub_type != ppc_stub_plt_call && hash != NULL - && &hash->elf == htab->tls_get_addr + && (hash == htab->tls_get_addr + || hash == htab->tls_get_addr_fd) && section->has_tls_reloc && irela != internal_relocs) { @@ -7061,10 +9289,12 @@ ppc64_elf_size_stubs (bfd *output_bfd, stub_entry->stub_type = stub_type; stub_entry->target_value = sym_value; - stub_entry->target_section = sym_sec; + stub_entry->target_section = code_sec; stub_entry->h = hash; stub_entry->addend = irela->r_addend; - stub_changed = TRUE; + + if (stub_entry->h != NULL) + htab->stub_globals += 1; } /* We're done with the internal relocs, free them. */ @@ -7082,34 +9312,41 @@ ppc64_elf_size_stubs (bfd *output_bfd, } } - if (!stub_changed) - break; - - /* OK, we've added some stubs. Find out the new size of the + /* We may have added some stubs. Find out the new size of the stub sections. */ for (stub_sec = htab->stub_bfd->sections; stub_sec != NULL; stub_sec = stub_sec->next) if ((stub_sec->flags & SEC_LINKER_CREATED) == 0) { - stub_sec->_raw_size = 0; - stub_sec->_cooked_size = 0; + stub_sec->rawsize = stub_sec->size; + stub_sec->size = 0; + stub_sec->reloc_count = 0; } - htab->brlt->_raw_size = 0; - htab->brlt->_cooked_size = 0; - if (info->shared) - { - htab->relbrlt->_raw_size = 0; - htab->relbrlt->_cooked_size = 0; - } + + htab->brlt->size = 0; + if (htab->relbrlt != NULL) + htab->relbrlt->size = 0; bfd_hash_traverse (&htab->stub_hash_table, ppc_size_one_stub, info); + for (stub_sec = htab->stub_bfd->sections; + stub_sec != NULL; + stub_sec = stub_sec->next) + if ((stub_sec->flags & SEC_LINKER_CREATED) == 0 + && stub_sec->rawsize != stub_sec->size) + break; + + /* Exit from this loop when no stubs have been added, and no stubs + have changed size. */ + if (stub_sec == NULL) + break; + /* Ask the linker to do its stuff. */ (*htab->layout_sections_again) (); } - /* It would be nice to strip .branch_lt from the output if the + /* It would be nice to strip htab->brlt from the output if the section is empty, but it's too late. If we strip sections here, the dynamic symbol table is corrupted since the section symbol for the stripped section isn't written. */ @@ -7188,22 +9425,21 @@ ppc64_elf_build_stubs (bfd_boolean emit_stub_syms, int stub_sec_count = 0; htab->emit_stub_syms = emit_stub_syms; + + /* Allocate memory to hold the linker stubs. */ for (stub_sec = htab->stub_bfd->sections; stub_sec != NULL; stub_sec = stub_sec->next) - if ((stub_sec->flags & SEC_LINKER_CREATED) == 0) + if ((stub_sec->flags & SEC_LINKER_CREATED) == 0 + && stub_sec->size != 0) { - bfd_size_type size; - - /* Allocate memory to hold the linker stubs. */ - size = stub_sec->_raw_size; - if (size != 0) - { - stub_sec->contents = bfd_zalloc (htab->stub_bfd, size); - if (stub_sec->contents == NULL) - return FALSE; - } - stub_sec->_cooked_size = 0; + stub_sec->contents = bfd_zalloc (htab->stub_bfd, stub_sec->size); + if (stub_sec->contents == NULL) + return FALSE; + /* We want to check that built size is the same as calculated + size. rawsize is a convenient location to use. */ + stub_sec->rawsize = stub_sec->size; + stub_sec->size = 0; } if (htab->plt != NULL) @@ -7235,10 +9471,11 @@ ppc64_elf_build_stubs (bfd_boolean emit_stub_syms, h->root.type = bfd_link_hash_defined; h->root.u.def.section = htab->glink; h->root.u.def.value = 0; - h->elf_link_hash_flags = (ELF_LINK_HASH_REF_REGULAR - | ELF_LINK_HASH_DEF_REGULAR - | ELF_LINK_HASH_REF_REGULAR_NONWEAK - | ELF_LINK_FORCED_LOCAL); + h->ref_regular = 1; + h->def_regular = 1; + h->ref_regular_nonweak = 1; + h->forced_local = 1; + h->non_elf = 0; } } p = htab->glink->contents; @@ -7277,7 +9514,7 @@ ppc64_elf_build_stubs (bfd_boolean emit_stub_syms, /* Build the .glink lazy link call stubs. */ indx = 0; - while (p < htab->glink->contents + htab->glink->_raw_size) + while (p < htab->glink->contents + htab->glink->size) { if (indx < 0x8000) { @@ -7296,20 +9533,20 @@ ppc64_elf_build_stubs (bfd_boolean emit_stub_syms, indx++; p += 4; } - htab->glink->_cooked_size = p - htab->glink->contents; + htab->glink->rawsize = p - htab->glink->contents; } - if (htab->brlt->_raw_size != 0) + if (htab->brlt->size != 0) { htab->brlt->contents = bfd_zalloc (htab->brlt->owner, - htab->brlt->_raw_size); + htab->brlt->size); if (htab->brlt->contents == NULL) return FALSE; } - if (info->shared && htab->relbrlt->_raw_size != 0) + if (htab->relbrlt != NULL && htab->relbrlt->size != 0) { htab->relbrlt->contents = bfd_zalloc (htab->relbrlt->owner, - htab->relbrlt->_raw_size); + htab->relbrlt->size); if (htab->relbrlt->contents == NULL) return FALSE; } @@ -7323,12 +9560,12 @@ ppc64_elf_build_stubs (bfd_boolean emit_stub_syms, if ((stub_sec->flags & SEC_LINKER_CREATED) == 0) { stub_sec_count += 1; - if (stub_sec->_raw_size != stub_sec->_cooked_size) + if (stub_sec->rawsize != stub_sec->size) break; } if (stub_sec != NULL - || htab->glink->_raw_size != htab->glink->_cooked_size) + || htab->glink->rawsize != htab->glink->size) { htab->stub_error = TRUE; (*_bfd_error_handler) (_("stubs don't match calculated size")); @@ -7343,13 +9580,14 @@ ppc64_elf_build_stubs (bfd_boolean emit_stub_syms, if (*stats == NULL) return FALSE; - sprintf (*stats, _("linker stubs in %u groups\n" + sprintf (*stats, _("linker stubs in %u group%s\n" " branch %lu\n" " toc adjust %lu\n" " long branch %lu\n" " long toc adj %lu\n" " plt call %lu"), stub_sec_count, + stub_sec_count == 1 ? "" : "s", htab->stub_count[ppc_stub_long_branch - 1], htab->stub_count[ppc_stub_long_branch_r2off - 1], htab->stub_count[ppc_stub_plt_branch - 1], @@ -7359,6 +9597,52 @@ ppc64_elf_build_stubs (bfd_boolean emit_stub_syms, return TRUE; } +/* This function undoes the changes made by add_symbol_adjust. */ + +static bfd_boolean +undo_symbol_twiddle (struct elf_link_hash_entry *h, void *inf ATTRIBUTE_UNUSED) +{ + struct ppc_link_hash_entry *eh; + + if (h->root.type == bfd_link_hash_indirect) + return TRUE; + + if (h->root.type == bfd_link_hash_warning) + h = (struct elf_link_hash_entry *) h->root.u.i.link; + + eh = (struct ppc_link_hash_entry *) h; + if (eh->elf.root.type != bfd_link_hash_undefweak || !eh->was_undefined) + return TRUE; + + eh->elf.root.type = bfd_link_hash_undefined; + return TRUE; +} + +void +ppc64_elf_restore_symbols (struct bfd_link_info *info) +{ + struct ppc_link_hash_table *htab = ppc_hash_table (info); + elf_link_hash_traverse (&htab->elf, undo_symbol_twiddle, info); +} + +/* What to do when ld finds relocations against symbols defined in + discarded sections. */ + +static unsigned int +ppc64_elf_action_discarded (asection *sec) +{ + if (strcmp (".opd", sec->name) == 0) + return 0; + + if (strcmp (".toc", sec->name) == 0) + return 0; + + if (strcmp (".toc1", sec->name) == 0) + return 0; + + return _bfd_elf_default_action_discarded (sec); +} + /* The RELOCATE_SECTION function is called by the ELF backend linker to handle the relocations for a section. @@ -7412,14 +9696,16 @@ ppc64_elf_relocate_section (bfd *output_bfd, /* Disabled until we sort out how ld should choose 'y' vs 'at'. */ bfd_boolean is_power4 = FALSE; - if (info->relocatable) - return TRUE; - /* Initialize howto table if needed. */ if (!ppc64_elf_howto_table[R_PPC64_ADDR32]) ppc_howto_init (); htab = ppc_hash_table (info); + + /* Don't relocate stub sections. */ + if (input_section->owner == htab->stub_bfd) + return TRUE; + local_got_ents = elf_local_got_ents (input_bfd); TOCstart = elf_gp (output_bfd); symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr; @@ -7431,12 +9717,13 @@ ppc64_elf_relocate_section (bfd *output_bfd, for (; rel < relend; rel++) { enum elf_ppc64_reloc_type r_type; - bfd_vma addend; + bfd_vma addend, orig_addend; bfd_reloc_status_type r; Elf_Internal_Sym *sym; asection *sec; - struct elf_link_hash_entry *h; - struct elf_link_hash_entry *fdh; + struct elf_link_hash_entry *h_elf; + struct ppc_link_hash_entry *h; + struct ppc_link_hash_entry *fdh; const char *sym_name; unsigned long r_symndx, toc_symndx; char tls_mask, tls_gd, tls_type; @@ -7463,37 +9750,56 @@ ppc64_elf_relocate_section (bfd *output_bfd, sym = NULL; sec = NULL; - h = NULL; + h_elf = NULL; sym_name = NULL; unresolved_reloc = FALSE; warned = FALSE; + orig_addend = rel->r_addend; if (r_symndx < symtab_hdr->sh_info) { /* It's a local symbol. */ + long *opd_adjust; + sym = local_syms + r_symndx; sec = local_sections[r_symndx]; - sym_name = bfd_elf_local_sym_name (input_bfd, sym); + sym_name = bfd_elf_sym_name (input_bfd, symtab_hdr, sym, sec); sym_type = ELF64_ST_TYPE (sym->st_info); relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel); - if (elf_section_data (sec) != NULL) + opd_adjust = get_opd_info (sec); + if (opd_adjust != NULL) { - long *opd_sym_adjust; - - opd_sym_adjust = ppc64_elf_section_data (sec)->opd.adjust; - if (opd_sym_adjust != NULL) - relocation += opd_sym_adjust[sym->st_value / 24]; + long adjust = opd_adjust[(sym->st_value + rel->r_addend) / 8]; + if (adjust == -1) + relocation = 0; + else + { + /* If this is a relocation against the opd section sym + and we have edited .opd, adjust the reloc addend so + that ld -r and ld --emit-relocs output is correct. + If it is a reloc against some other .opd symbol, + then the symbol value will be adjusted later. */ + if (ELF_ST_TYPE (sym->st_info) == STT_SECTION) + rel->r_addend += adjust; + else + relocation += adjust; + } } + if (info->relocatable) + continue; } else { + if (info->relocatable) + continue; RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel, r_symndx, symtab_hdr, sym_hashes, - h, sec, relocation, + h_elf, sec, relocation, unresolved_reloc, warned); - sym_name = h->root.root.string; - sym_type = h->type; + sym_name = h_elf->root.root.string; + sym_type = h_elf->type; } + h = (struct ppc_link_hash_entry *) h_elf; /* TLS optimizations. Replace instruction sequences and relocs based on information we collected in tls_optimize. We edit @@ -7505,7 +9811,7 @@ ppc64_elf_relocate_section (bfd *output_bfd, if (IS_PPC64_TLS_RELOC (r_type)) { if (h != NULL) - tls_mask = ((struct ppc_link_hash_entry *) h)->tls_mask; + tls_mask = h->tls_mask; else if (local_got_ents != NULL) { char *lgot_masks; @@ -7531,8 +9837,8 @@ ppc64_elf_relocate_section (bfd *output_bfd, if (r_symndx != 0 && r_type != R_PPC64_NONE && (h == NULL - || h->root.type == bfd_link_hash_defined - || h->root.type == bfd_link_hash_defweak) + || h->elf.root.type == bfd_link_hash_defined + || h->elf.root.type == bfd_link_hash_defweak) && IS_PPC64_TLS_RELOC (r_type) != (sym_type == STT_TLS)) { if (r_type == R_PPC64_TLS && tls_mask != 0) @@ -7541,10 +9847,10 @@ ppc64_elf_relocate_section (bfd *output_bfd, else (*_bfd_error_handler) (sym_type == STT_TLS - ? _("%s(%s+0x%lx): %s used with TLS symbol %s") - : _("%s(%s+0x%lx): %s used with non-TLS symbol %s"), - bfd_archive_filename (input_bfd), - input_section->name, + ? _("%B(%A+0x%lx): %s used with TLS symbol %s") + : _("%B(%A+0x%lx): %s used with non-TLS symbol %s"), + input_bfd, + input_section, (long) rel->r_offset, ppc64_elf_howto_table[r_type]->name, sym_name); @@ -7749,7 +10055,8 @@ ppc64_elf_relocate_section (bfd *output_bfd, while (h2->root.type == bfd_link_hash_indirect || h2->root.type == bfd_link_hash_warning) h2 = (struct elf_link_hash_entry *) h2->root.u.i.link; - if (h2 == NULL || h2 != htab->tls_get_addr) + if (h2 == NULL || (h2 != &htab->tls_get_addr->elf + && h2 != &htab->tls_get_addr_fd->elf)) break; /* OK, it checks out. Replace the call. */ @@ -7853,6 +10160,8 @@ ppc64_elf_relocate_section (bfd *output_bfd, /* Handle other relocations that tweak non-addend part of insn. */ insn = 0; + max_br_offset = 1 << 25; + addend = rel->r_addend; switch (r_type) { default: @@ -7869,31 +10178,11 @@ ppc64_elf_relocate_section (bfd *output_bfd, case R_PPC64_REL14_BRNTAKEN: insn |= bfd_get_32 (output_bfd, contents + rel->r_offset) & ~(0x01 << 21); - if (is_power4) - { - /* Set 'a' bit. This is 0b00010 in BO field for branch - on CR(BI) insns (BO == 001at or 011at), and 0b01000 - for branch on CTR insns (BO == 1a00t or 1a01t). */ - if ((insn & (0x14 << 21)) == (0x04 << 21)) - insn |= 0x02 << 21; - else if ((insn & (0x14 << 21)) == (0x10 << 21)) - insn |= 0x08 << 21; - else - break; - } - else - { - from = (rel->r_offset - + input_section->output_offset - + input_section->output_section->vma); - - /* Invert 'y' bit if not the default. */ - if ((bfd_signed_vma) (relocation + rel->r_addend - from) < 0) - insn ^= 0x01 << 21; - } + /* Fall thru. */ - bfd_put_32 (output_bfd, insn, contents + rel->r_offset); - break; + case R_PPC64_REL14: + max_br_offset = 1 << 15; + /* Fall thru. */ case R_PPC64_REL24: /* Calls to functions with a different TOC, such as calls to @@ -7902,11 +10191,15 @@ ppc64_elf_relocate_section (bfd *output_bfd, linkage stubs needs to be followed by a nop, as the nop will be replaced with an instruction to restore the TOC base pointer. */ + stub_entry = NULL; + fdh = h; if (((h != NULL - && (fdh = ((struct ppc_link_hash_entry *) h)->oh) != NULL - && fdh->plt.plist != NULL) - || ((fdh = h, sec) != NULL + && (((fdh = h->oh) != NULL + && fdh->elf.plt.plist != NULL) + || (fdh = h)->elf.plt.plist != NULL)) + || (sec != NULL && sec->output_section != NULL + && sec->id <= htab->top_id && (htab->stub_group[sec->id].toc_off != htab->stub_group[input_section->id].toc_off))) && (stub_entry = ppc_get_stub_entry (input_section, sec, fdh, @@ -7915,17 +10208,18 @@ ppc64_elf_relocate_section (bfd *output_bfd, || stub_entry->stub_type == ppc_stub_plt_branch_r2off || stub_entry->stub_type == ppc_stub_long_branch_r2off)) { - bfd_boolean can_plt_call = 0; + bfd_boolean can_plt_call = FALSE; - if (rel->r_offset + 8 <= input_section->_cooked_size) + if (rel->r_offset + 8 <= input_section->size) { - insn = bfd_get_32 (input_bfd, contents + rel->r_offset + 4); - if (insn == NOP - || insn == CROR_151515 || insn == CROR_313131) + unsigned long nop; + nop = bfd_get_32 (input_bfd, contents + rel->r_offset + 4); + if (nop == NOP + || nop == CROR_151515 || nop == CROR_313131) { bfd_put_32 (input_bfd, LD_R2_40R1, contents + rel->r_offset + 4); - can_plt_call = 1; + can_plt_call = TRUE; } } @@ -7934,17 +10228,22 @@ ppc64_elf_relocate_section (bfd *output_bfd, if (stub_entry->stub_type == ppc_stub_plt_call) { /* If this is a plain branch rather than a branch - and link, don't require a nop. */ - insn = bfd_get_32 (input_bfd, contents + rel->r_offset); - if ((insn & 1) == 0) - can_plt_call = 1; + and link, don't require a nop. However, don't + allow tail calls in a shared library as they + will result in r2 being corrupted. */ + unsigned long br; + br = bfd_get_32 (input_bfd, contents + rel->r_offset); + if (info->executable && (br & 1) == 0) + can_plt_call = TRUE; + else + stub_entry = NULL; } else if (h != NULL - && strcmp (h->root.root.string, + && strcmp (h->elf.root.root.string, ".__libc_start_main") == 0) { /* Allow crt1 branch to go via a toc adjusting stub. */ - can_plt_call = 1; + can_plt_call = TRUE; } else { @@ -7953,21 +10252,21 @@ ppc64_elf_relocate_section (bfd *output_bfd, || strcmp (input_section->output_section->name, ".fini") == 0) (*_bfd_error_handler) - (_("%s(%s+0x%lx): automatic multiple TOCs " + (_("%B(%A+0x%lx): automatic multiple TOCs " "not supported using your crt files; " "recompile with -mminimal-toc or upgrade gcc"), - bfd_archive_filename (input_bfd), - input_section->name, + input_bfd, + input_section, (long) rel->r_offset); else (*_bfd_error_handler) - (_("%s(%s+0x%lx): sibling call optimization to `%s' " + (_("%B(%A+0x%lx): sibling call optimization to `%s' " "does not allow automatic multiple TOCs; " "recompile with -mminimal-toc or " "-fno-optimize-sibling-calls, " "or make `%s' extern"), - bfd_archive_filename (input_bfd), - input_section->name, + input_bfd, + input_section, (long) rel->r_offset, sym_name, sym_name); @@ -7976,51 +10275,97 @@ ppc64_elf_relocate_section (bfd *output_bfd, } } - if (can_plt_call) + if (can_plt_call + && stub_entry->stub_type == ppc_stub_plt_call) + unresolved_reloc = FALSE; + } + + if (stub_entry == NULL + && get_opd_info (sec) != NULL) + { + /* The branch destination is the value of the opd entry. */ + bfd_vma off = (relocation + addend + - sec->output_section->vma + - sec->output_offset); + bfd_vma dest = opd_entry_value (sec, off, NULL, NULL); + if (dest != (bfd_vma) -1) { - relocation = (stub_entry->stub_offset - + stub_entry->stub_sec->output_offset - + stub_entry->stub_sec->output_section->vma); - if (stub_entry->stub_type == ppc_stub_plt_call) - unresolved_reloc = FALSE; + relocation = dest; + addend = 0; } } - if (h != NULL - && h->root.type == bfd_link_hash_undefweak - && relocation == 0 - && rel->r_addend == 0) + /* If the branch is out of reach we ought to have a long + branch stub. */ + from = (rel->r_offset + + input_section->output_offset + + input_section->output_section->vma); + + if (stub_entry == NULL + && (relocation + addend - from + max_br_offset + >= 2 * max_br_offset) + && r_type != R_PPC64_ADDR14_BRTAKEN + && r_type != R_PPC64_ADDR14_BRNTAKEN) + stub_entry = ppc_get_stub_entry (input_section, sec, h, rel, + htab); + + if (stub_entry != NULL) { - /* Tweak calls to undefined weak functions to point at a - blr. We can thus call a weak function without first - checking whether the function is defined. We have a - blr at the end of .sfpr. */ - BFD_ASSERT (htab->sfpr->_raw_size != 0); - relocation = (htab->sfpr->_raw_size - 4 - + htab->sfpr->output_offset - + htab->sfpr->output_section->vma); - from = (rel->r_offset - + input_section->output_offset - + input_section->output_section->vma); - - /* But let's not be silly about it. If the blr isn't in - reach, just go to the next instruction. */ - if (relocation - from + (1 << 25) >= (1 << 26) - || htab->sfpr->_raw_size == 0) - relocation = from + 4; + /* Munge up the value and addend so that we call the stub + rather than the procedure directly. */ + relocation = (stub_entry->stub_offset + + stub_entry->stub_sec->output_offset + + stub_entry->stub_sec->output_section->vma); + addend = 0; + } + + if (insn != 0) + { + if (is_power4) + { + /* Set 'a' bit. This is 0b00010 in BO field for branch + on CR(BI) insns (BO == 001at or 011at), and 0b01000 + for branch on CTR insns (BO == 1a00t or 1a01t). */ + if ((insn & (0x14 << 21)) == (0x04 << 21)) + insn |= 0x02 << 21; + else if ((insn & (0x14 << 21)) == (0x10 << 21)) + insn |= 0x08 << 21; + else + break; + } + else + { + /* Invert 'y' bit if not the default. */ + if ((bfd_signed_vma) (relocation + addend - from) < 0) + insn ^= 0x01 << 21; + } + + bfd_put_32 (output_bfd, insn, contents + rel->r_offset); + } + + /* NOP out calls to undefined weak functions. + We can thus call a weak function without first + checking whether the function is defined. */ + else if (h != NULL + && h->elf.root.type == bfd_link_hash_undefweak + && r_type == R_PPC64_REL24 + && relocation == 0 + && addend == 0) + { + bfd_put_32 (output_bfd, NOP, contents + rel->r_offset); + continue; } break; } /* Set `addend'. */ tls_type = 0; - addend = rel->r_addend; switch (r_type) { default: (*_bfd_error_handler) - (_("%s: unknown relocation type %d for symbol %s"), - bfd_archive_filename (input_bfd), (int) r_type, sym_name); + (_("%B: unknown relocation type %d for symbol %s"), + input_bfd, (int) r_type, sym_name); bfd_set_error (bfd_error_bad_value); ret = FALSE; @@ -8081,7 +10426,7 @@ ppc64_elf_relocate_section (bfd *output_bfd, if (tls_type == (TLS_TLS | TLS_LD) && (h == NULL - || !(h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC))) + || !h->elf.def_dynamic)) offp = &ppc64_tlsld_got (input_bfd)->offset; else { @@ -8090,9 +10435,10 @@ ppc64_elf_relocate_section (bfd *output_bfd, if (h != NULL) { bfd_boolean dyn = htab->elf.dynamic_sections_created; - if (!WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, h) + if (!WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, + &h->elf) || (info->shared - && SYMBOL_REFERENCES_LOCAL (info, h))) + && SYMBOL_REFERENCES_LOCAL (info, &h->elf))) /* This is actually a static link, or it is a -Bsymbolic link and the symbol is defined locally, or the symbol was forced to be local @@ -8100,10 +10446,10 @@ ppc64_elf_relocate_section (bfd *output_bfd, ; else { - indx = h->dynindx; + indx = h->elf.dynindx; unresolved_reloc = FALSE; } - ent = h->got.glist; + ent = h->elf.got.glist; } else { @@ -8113,7 +10459,7 @@ ppc64_elf_relocate_section (bfd *output_bfd, } for (; ent != NULL; ent = ent->next) - if (ent->addend == rel->r_addend + if (ent->addend == orig_addend && ent->owner == input_bfd && ent->tls_type == tls_type) break; @@ -8142,13 +10488,13 @@ ppc64_elf_relocate_section (bfd *output_bfd, *offp = off | 1; if ((info->shared || indx != 0) && (h == NULL - || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT - || h->root.type != bfd_link_hash_undefweak)) + || ELF_ST_VISIBILITY (h->elf.other) == STV_DEFAULT + || h->elf.root.type != bfd_link_hash_undefweak)) { outrel.r_offset = (got->output_section->vma + got->output_offset + off); - outrel.r_addend = rel->r_addend; + outrel.r_addend = addend; if (tls_type & (TLS_LD | TLS_GD)) { outrel.r_addend = 0; @@ -8161,7 +10507,7 @@ ppc64_elf_relocate_section (bfd *output_bfd, bfd_elf64_swap_reloca_out (output_bfd, &outrel, loc); outrel.r_offset += 8; - outrel.r_addend = rel->r_addend; + outrel.r_addend = addend; outrel.r_info = ELF64_R_INFO (indx, R_PPC64_DTPREL64); } @@ -8199,7 +10545,7 @@ ppc64_elf_relocate_section (bfd *output_bfd, emitting a reloc. */ else { - relocation += rel->r_addend; + relocation += addend; if (tls_type == (TLS_TLS | TLS_LD)) relocation = 1; else if (tls_type != 0) @@ -8251,8 +10597,8 @@ ppc64_elf_relocate_section (bfd *output_bfd, if (htab->plt != NULL) { struct plt_entry *ent; - for (ent = h->plt.plist; ent != NULL; ent = ent->next) - if (ent->addend == rel->r_addend + for (ent = h->elf.plt.plist; ent != NULL; ent = ent->next) + if (ent->addend == orig_addend && ent->plt.offset != (bfd_vma) -1) { relocation = (htab->plt->output_section->vma @@ -8391,17 +10737,17 @@ ppc64_elf_relocate_section (bfd *output_bfd, if ((info->shared && (h == NULL - || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT - || h->root.type != bfd_link_hash_undefweak) + || ELF_ST_VISIBILITY (h->elf.other) == STV_DEFAULT + || h->elf.root.type != bfd_link_hash_undefweak) && (MUST_BE_DYN_RELOC (r_type) - || !SYMBOL_CALLS_LOCAL (info, h))) + || !SYMBOL_CALLS_LOCAL (info, &h->elf))) || (ELIMINATE_COPY_RELOCS && !info->shared && h != NULL - && h->dynindx != -1 - && (h->elf_link_hash_flags & ELF_LINK_NON_GOT_REF) == 0 - && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) != 0 - && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)) + && h->elf.dynindx != -1 + && !h->elf.non_got_ref + && h->elf.def_dynamic + && !h->elf.def_regular)) { Elf_Internal_Rela outrel; bfd_boolean skip, relocate; @@ -8440,10 +10786,10 @@ ppc64_elf_relocate_section (bfd *output_bfd, if (skip) memset (&outrel, 0, sizeof outrel); - else if (!SYMBOL_REFERENCES_LOCAL (info, h) + else if (!SYMBOL_REFERENCES_LOCAL (info, &h->elf) && !is_opd && r_type != R_PPC64_TOC) - outrel.r_info = ELF64_R_INFO (h->dynindx, r_type); + outrel.r_info = ELF64_R_INFO (h->elf.dynindx, r_type); else { /* This symbol is local, or marked to become local, @@ -8508,6 +10854,9 @@ ppc64_elf_relocate_section (bfd *output_bfd, if (sreloc == NULL) abort (); + if (sreloc->reloc_count * sizeof (Elf64_External_Rela) + >= sreloc->size) + abort (); loc = sreloc->contents; loc += sreloc->reloc_count++ * sizeof (Elf64_External_Rela); bfd_elf64_swap_reloca_out (output_bfd, &outrel, loc); @@ -8559,8 +10908,8 @@ ppc64_elf_relocate_section (bfd *output_bfd, /* These ones haven't been implemented yet. */ (*_bfd_error_handler) - (_("%s: relocation %s is not supported for symbol %s."), - bfd_archive_filename (input_bfd), + (_("%B: relocation %s is not supported for symbol %s."), + input_bfd, ppc64_elf_howto_table[r_type]->name, sym_name); bfd_set_error (bfd_error_invalid_operation); @@ -8638,8 +10987,8 @@ ppc64_elf_relocate_section (bfd *output_bfd, if (((relocation + addend) & mask) != 0) { (*_bfd_error_handler) - (_("%s: error: relocation %s not a multiple of %d"), - bfd_archive_filename (input_bfd), + (_("%B: error: relocation %s not a multiple of %d"), + input_bfd, ppc64_elf_howto_table[r_type]->name, mask + 1); bfd_set_error (bfd_error_bad_value); @@ -8647,40 +10996,6 @@ ppc64_elf_relocate_section (bfd *output_bfd, continue; } break; - - case R_PPC64_REL14: - case R_PPC64_REL14_BRNTAKEN: - case R_PPC64_REL14_BRTAKEN: - max_br_offset = 1 << 15; - goto branch_check; - - case R_PPC64_REL24: - max_br_offset = 1 << 25; - - branch_check: - /* If the branch is out of reach or the TOC register needs - adjusting, then redirect the call to the local stub for - this function. */ - from = (rel->r_offset - + input_section->output_offset - + input_section->output_section->vma); - if ((relocation + addend - from + max_br_offset >= 2 * max_br_offset - || (sec != NULL - && sec->output_section != NULL - && sec->id <= htab->top_id - && (htab->stub_group[sec->id].toc_off - != htab->stub_group[input_section->id].toc_off))) - && (stub_entry = ppc_get_stub_entry (input_section, sec, h, - rel, htab)) != NULL) - { - /* Munge up the value and addend so that we call the stub - rather than the procedure directly. */ - relocation = (stub_entry->stub_offset - + stub_entry->stub_sec->output_offset - + stub_entry->stub_sec->output_section->vma); - addend = 0; - } - break; } /* Dynamic relocs are not propagated for SEC_DEBUGGING sections @@ -8688,15 +11003,15 @@ ppc64_elf_relocate_section (bfd *output_bfd, not process them. */ if (unresolved_reloc && !((input_section->flags & SEC_DEBUGGING) != 0 - && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) != 0)) + && h->elf.def_dynamic)) { (*_bfd_error_handler) - (_("%s(%s+0x%lx): unresolvable %s relocation against symbol `%s'"), - bfd_archive_filename (input_bfd), - bfd_get_section_name (input_bfd, input_section), + (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"), + input_bfd, + input_section, (long) rel->r_offset, ppc64_elf_howto_table[(int) r_type]->name, - h->root.root.string); + h->elf.root.root.string); ret = FALSE; } @@ -8717,7 +11032,7 @@ ppc64_elf_relocate_section (bfd *output_bfd, if (warned) continue; if (h != NULL - && h->root.type == bfd_link_hash_undefweak + && h->elf.root.type == bfd_link_hash_undefweak && ppc64_elf_howto_table[r_type]->pc_relative) { /* Assume this is a call protected by other code that @@ -8730,16 +11045,17 @@ ppc64_elf_relocate_section (bfd *output_bfd, } if (!((*info->callbacks->reloc_overflow) - (info, sym_name, ppc64_elf_howto_table[r_type]->name, - rel->r_addend, input_bfd, input_section, rel->r_offset))) + (info, (h ? &h->elf.root : NULL), sym_name, + ppc64_elf_howto_table[r_type]->name, + orig_addend, input_bfd, input_section, rel->r_offset))) return FALSE; } else { (*_bfd_error_handler) - (_("%s(%s+0x%lx): %s reloc against `%s': error %d"), - bfd_archive_filename (input_bfd), - bfd_get_section_name (input_bfd, input_section), + (_("%B(%A+0x%lx): %s reloc against `%s': error %d"), + input_bfd, + input_section, (long) rel->r_offset, ppc64_elf_howto_table[r_type]->name, sym_name, @@ -8749,6 +11065,22 @@ ppc64_elf_relocate_section (bfd *output_bfd, } } + /* If we're emitting relocations, then shortly after this function + returns, reloc offsets and addends for this section will be + adjusted. Worse, reloc symbol indices will be for the output + file rather than the input. Save a copy of the relocs for + opd_entry_value. */ + if (is_opd && (info->emitrelocations || info->relocatable)) + { + bfd_size_type amt; + amt = input_section->reloc_count * sizeof (Elf_Internal_Rela); + rel = bfd_alloc (input_bfd, amt); + BFD_ASSERT (ppc64_elf_tdata (input_bfd)->opd_relocs == NULL); + ppc64_elf_tdata (input_bfd)->opd_relocs = rel; + if (rel == NULL) + return FALSE; + memcpy (rel, relocs, amt); + } return ret; } @@ -8761,20 +11093,25 @@ ppc64_elf_output_symbol_hook (struct bfd_link_info *info, asection *input_sec, struct elf_link_hash_entry *h) { - long *adjust; + long *opd_adjust, adjust; bfd_vma value; - if (h != NULL - || input_sec == NULL - || ppc64_elf_section_data (input_sec) == NULL - || (adjust = ppc64_elf_section_data (input_sec)->opd.adjust) == NULL) + if (h != NULL) + return TRUE; + + opd_adjust = get_opd_info (input_sec); + if (opd_adjust == NULL) return TRUE; value = elfsym->st_value - input_sec->output_offset; if (!info->relocatable) value -= input_sec->output_section->vma; - elfsym->st_value += adjust[value / 24]; + adjust = opd_adjust[value / 8]; + if (adjust == -1) + elfsym->st_value = 0; + else + elfsym->st_value += adjust; return TRUE; } @@ -8789,43 +11126,39 @@ ppc64_elf_finish_dynamic_symbol (bfd *output_bfd, { struct ppc_link_hash_table *htab; bfd *dynobj; + struct plt_entry *ent; + Elf_Internal_Rela rela; + bfd_byte *loc; htab = ppc_hash_table (info); dynobj = htab->elf.dynobj; - if (((struct ppc_link_hash_entry *) h)->is_func_descriptor) - { - struct plt_entry *ent; - Elf_Internal_Rela rela; - bfd_byte *loc; - - for (ent = h->plt.plist; ent != NULL; ent = ent->next) - if (ent->plt.offset != (bfd_vma) -1) - { - /* This symbol has an entry in the procedure linkage - table. Set it up. */ - - if (htab->plt == NULL - || htab->relplt == NULL - || htab->glink == NULL) - abort (); - - /* Create a JMP_SLOT reloc to inform the dynamic linker to - fill in the PLT entry. */ - rela.r_offset = (htab->plt->output_section->vma - + htab->plt->output_offset - + ent->plt.offset); - rela.r_info = ELF64_R_INFO (h->dynindx, R_PPC64_JMP_SLOT); - rela.r_addend = ent->addend; - - loc = htab->relplt->contents; - loc += ((ent->plt.offset - PLT_INITIAL_ENTRY_SIZE) / PLT_ENTRY_SIZE - * sizeof (Elf64_External_Rela)); - bfd_elf64_swap_reloca_out (output_bfd, &rela, loc); - } - } + for (ent = h->plt.plist; ent != NULL; ent = ent->next) + if (ent->plt.offset != (bfd_vma) -1) + { + /* This symbol has an entry in the procedure linkage + table. Set it up. */ + + if (htab->plt == NULL + || htab->relplt == NULL + || htab->glink == NULL) + abort (); + + /* Create a JMP_SLOT reloc to inform the dynamic linker to + fill in the PLT entry. */ + rela.r_offset = (htab->plt->output_section->vma + + htab->plt->output_offset + + ent->plt.offset); + rela.r_info = ELF64_R_INFO (h->dynindx, R_PPC64_JMP_SLOT); + rela.r_addend = ent->addend; + + loc = htab->relplt->contents; + loc += ((ent->plt.offset - PLT_INITIAL_ENTRY_SIZE) / PLT_ENTRY_SIZE + * sizeof (Elf64_External_Rela)); + bfd_elf64_swap_reloca_out (output_bfd, &rela, loc); + } - if ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_COPY) != 0) + if (h->needs_copy) { Elf_Internal_Rela rela; bfd_byte *loc; @@ -8899,7 +11232,7 @@ ppc64_elf_finish_dynamic_sections (bfd *output_bfd, abort (); dyncon = (Elf64_External_Dyn *) sdyn->contents; - dynconend = (Elf64_External_Dyn *) (sdyn->contents + sdyn->_raw_size); + dynconend = (Elf64_External_Dyn *) (sdyn->contents + sdyn->size); for (; dyncon < dynconend; dyncon++) { Elf_Internal_Dyn dyn; @@ -8933,7 +11266,7 @@ ppc64_elf_finish_dynamic_sections (bfd *output_bfd, s = bfd_get_section_by_name (output_bfd, ".opd"); if (s == NULL) continue; - dyn.d_un.d_val = s->_raw_size; + dyn.d_un.d_val = s->size; break; case DT_PLTGOT: @@ -8947,7 +11280,7 @@ ppc64_elf_finish_dynamic_sections (bfd *output_bfd, break; case DT_PLTRELSZ: - dyn.d_un.d_val = htab->relplt->_raw_size; + dyn.d_un.d_val = htab->relplt->size; break; case DT_RELASZ: @@ -8956,7 +11289,7 @@ ppc64_elf_finish_dynamic_sections (bfd *output_bfd, s = htab->relplt; if (s == NULL) continue; - dyn.d_un.d_val -= s->_raw_size; + dyn.d_un.d_val -= s->size; break; case DT_RELA: @@ -8968,7 +11301,7 @@ ppc64_elf_finish_dynamic_sections (bfd *output_bfd, continue; if (dyn.d_un.d_ptr != s->output_section->vma + s->output_offset) continue; - dyn.d_un.d_ptr += s->_raw_size; + dyn.d_un.d_ptr += s->size; break; } @@ -8976,7 +11309,7 @@ ppc64_elf_finish_dynamic_sections (bfd *output_bfd, } } - if (htab->got != NULL && htab->got->_raw_size != 0) + if (htab->got != NULL && htab->got->size != 0) { /* Fill in the first entry in the global offset table. We use it to hold the link-time TOCbase. */ @@ -8988,7 +11321,7 @@ ppc64_elf_finish_dynamic_sections (bfd *output_bfd, elf_section_data (htab->got->output_section)->this_hdr.sh_entsize = 8; } - if (htab->plt != NULL && htab->plt->_raw_size != 0) + if (htab->plt != NULL && htab->plt->size != 0) { /* Set .plt entry size. */ elf_section_data (htab->plt->output_section)->this_hdr.sh_entsize @@ -8996,25 +11329,30 @@ ppc64_elf_finish_dynamic_sections (bfd *output_bfd, } /* We need to handle writing out multiple GOT sections ourselves, - since we didn't add them to DYNOBJ. */ + since we didn't add them to DYNOBJ. We know dynobj is the first + bfd. */ while ((dynobj = dynobj->link_next) != NULL) { asection *s; + + if (!is_ppc64_elf_target (dynobj->xvec)) + continue; + s = ppc64_elf_tdata (dynobj)->got; if (s != NULL - && s->_raw_size != 0 + && s->size != 0 && s->output_section != bfd_abs_section_ptr && !bfd_set_section_contents (output_bfd, s->output_section, s->contents, s->output_offset, - s->_raw_size)) + s->size)) return FALSE; s = ppc64_elf_tdata (dynobj)->relgot; if (s != NULL - && s->_raw_size != 0 + && s->size != 0 && s->output_section != bfd_abs_section_ptr && !bfd_set_section_contents (output_bfd, s->output_section, s->contents, s->output_offset, - s->_raw_size)) + s->size)) return FALSE; } |