From 1d5316ab67e12d6fb58c29728eb72fa937521e94 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 19 Oct 2011 07:17:21 +0000 Subject: [PATCH] PR ld/13177 bfd/ * elflink.c (_bfd_elf_gc_mark_rsec): Set symbol "mark". (elf_gc_sweep_symbol): Don't test plt/got refcounts, instead test "mark". Hide undefweak too. Clear def_regular and ref_regular. * elf-m10300.c (mn10300_elf_relocate_section): Ignore unresolved reloc errors from garbage-collected code. * elf32-arm.c (elf32_arm_relocate_section): Likewise. * elf32-bfin.c (bfin_relocate_section): Likewise. (bfinfdpic_relocate_section): Likewise. * elf32-cris.c (cris_elf_relocate_section): Likewise. * elf32-frv.c (elf32_frv_relocate_section): Likewise. * elf32-i386.c (elf_i386_relocate_section): Likewise. * elf32-m32r.c (m32r_elf_relocate_section): Likewise. * elf32-m68k.c (elf_m68k_relocate_section): Likewise. * elf32-ppc.c (ppc_elf_relocate_section): Likewise. * elf32-s390.c (elf_s390_relocate_section): Likewise. * elf32-sh.c (sh_elf_relocate_section): Likewise. * elf32-spu.c (spu_elf_relocate_section): Likewise. * elf32-tilepro.c (tilepro_elf_relocate_section): Likewise. * elf32-xtensa.c (elf_xtensa_relocate_section): Likewise. * elf64-alpha.c (elf64_alpha_relocate_section): Likewise. * elf64-ppc.c (ppc64_elf_relocate_section): Likewise. * elf64-s390.c (elf_s390_relocate_section): Likewise. * elf64-sh64.c (sh_elf64_relocate_section): Likewise. * elf64-x86-64.c (elf_x86_64_relocate_section): Likewise. * elfxx-sparc.c (_bfd_sparc_elf_relocate_section): Likewise. * elfxx-tilegx.c (tilegx_elf_relocate_section): Likewise. ld/testsuite/ * ld-elf/elf.exp: Move test for shared lib support.. * lib/ld-lib.exp (check_shared_lib_support): ..to here. Add m68hc1*, and s/ms1/mt/. (check_gc_sections_available): Match hppa*64 not hppa64. Comment. * ld-gc/libpersonality.s: New. * ld-gc/personality.s, * ld-gc/personality.d: New. * ld-gc/gc.exp: Run personality test. --- bfd/ChangeLog | 30 ++++++++++++++++++ bfd/elf-m10300.c | 5 ++- bfd/elf32-arm.c | 4 ++- bfd/elf32-bfin.c | 8 +++-- bfd/elf32-cris.c | 6 +++- bfd/elf32-frv.c | 5 ++- bfd/elf32-i386.c | 4 ++- bfd/elf32-m32r.c | 6 +++- bfd/elf32-m68k.c | 4 ++- bfd/elf32-ppc.c | 4 ++- bfd/elf32-s390.c | 4 ++- bfd/elf32-sh.c | 6 +++- bfd/elf32-spu.c | 4 ++- bfd/elf32-tilepro.c | 4 ++- bfd/elf32-xtensa.c | 4 ++- bfd/elf64-alpha.c | 15 +++++++-- bfd/elf64-ppc.c | 4 ++- bfd/elf64-s390.c | 4 ++- bfd/elf64-sh64.c | 6 +++- bfd/elf64-x86-64.c | 4 ++- bfd/elflink.c | 26 ++++++++-------- bfd/elfxx-sparc.c | 4 ++- bfd/elfxx-tilegx.c | 4 ++- ld/testsuite/ChangeLog | 10 ++++++ ld/testsuite/ld-elf/elf.exp | 35 +-------------------- ld/testsuite/ld-gc/gc.exp | 14 +++++++++ ld/testsuite/ld-gc/libpersonality.s | 11 +++++++ ld/testsuite/ld-gc/personality.d | 10 ++++++ ld/testsuite/ld-gc/personality.s | 28 +++++++++++++++++ ld/testsuite/lib/ld-lib.exp | 48 ++++++++++++++++++++++++++++- 30 files changed, 250 insertions(+), 71 deletions(-) create mode 100644 ld/testsuite/ld-gc/libpersonality.s create mode 100644 ld/testsuite/ld-gc/personality.d create mode 100644 ld/testsuite/ld-gc/personality.s diff --git a/bfd/ChangeLog b/bfd/ChangeLog index ec54e217ecf..38ddcab6bca 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,33 @@ +2011-10-19 Alan Modra + + PR ld/13177 + * elflink.c (_bfd_elf_gc_mark_rsec): Set symbol "mark". + (elf_gc_sweep_symbol): Don't test plt/got refcounts, instead test + "mark". Hide undefweak too. Clear def_regular and ref_regular. + * elf-m10300.c (mn10300_elf_relocate_section): Ignore unresolved + reloc errors from garbage-collected code. + * elf32-arm.c (elf32_arm_relocate_section): Likewise. + * elf32-bfin.c (bfin_relocate_section): Likewise. + (bfinfdpic_relocate_section): Likewise. + * elf32-cris.c (cris_elf_relocate_section): Likewise. + * elf32-frv.c (elf32_frv_relocate_section): Likewise. + * elf32-i386.c (elf_i386_relocate_section): Likewise. + * elf32-m32r.c (m32r_elf_relocate_section): Likewise. + * elf32-m68k.c (elf_m68k_relocate_section): Likewise. + * elf32-ppc.c (ppc_elf_relocate_section): Likewise. + * elf32-s390.c (elf_s390_relocate_section): Likewise. + * elf32-sh.c (sh_elf_relocate_section): Likewise. + * elf32-spu.c (spu_elf_relocate_section): Likewise. + * elf32-tilepro.c (tilepro_elf_relocate_section): Likewise. + * elf32-xtensa.c (elf_xtensa_relocate_section): Likewise. + * elf64-alpha.c (elf64_alpha_relocate_section): Likewise. + * elf64-ppc.c (ppc64_elf_relocate_section): Likewise. + * elf64-s390.c (elf_s390_relocate_section): Likewise. + * elf64-sh64.c (sh_elf64_relocate_section): Likewise. + * elf64-x86-64.c (elf_x86_64_relocate_section): Likewise. + * elfxx-sparc.c (_bfd_sparc_elf_relocate_section): Likewise. + * elfxx-tilegx.c (tilegx_elf_relocate_section): Likewise. + 2011-10-19 Alan Modra PR ld/13311 diff --git a/bfd/elf-m10300.c b/bfd/elf-m10300.c index 8276a2fb0bf..c2dc5835ea6 100644 --- a/bfd/elf-m10300.c +++ b/bfd/elf-m10300.c @@ -1499,7 +1499,10 @@ mn10300_elf_relocate_section (bfd *output_bfd, obscure cases sec->output_section will be NULL. */ relocation = 0; - else if (!info->relocatable && unresolved_reloc) + else if (!info->relocatable && unresolved_reloc + && _bfd_elf_section_offset (output_bfd, info, input_section, + rel->r_offset) != (bfd_vma) -1) + (*_bfd_error_handler) (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"), input_bfd, diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c index bcf0aac3196..b32163e93cb 100644 --- a/bfd/elf32-arm.c +++ b/bfd/elf32-arm.c @@ -10386,7 +10386,9 @@ elf32_arm_relocate_section (bfd * output_bfd, not process them. */ if (unresolved_reloc && !((input_section->flags & SEC_DEBUGGING) != 0 - && h->def_dynamic)) + && h->def_dynamic) + && _bfd_elf_section_offset (output_bfd, info, input_section, + rel->r_offset) != (bfd_vma) -1) { (*_bfd_error_handler) (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"), diff --git a/bfd/elf32-bfin.c b/bfd/elf32-bfin.c index b112dfc267f..f88e5d49919 100644 --- a/bfd/elf32-bfin.c +++ b/bfd/elf32-bfin.c @@ -1585,7 +1585,9 @@ bfin_relocate_section (bfd * output_bfd, because such sections are not SEC_ALLOC and thus ld.so will not process them. */ if (unresolved_reloc - && !((input_section->flags & SEC_DEBUGGING) != 0 && h->def_dynamic)) + && !((input_section->flags & SEC_DEBUGGING) != 0 && h->def_dynamic) + && _bfd_elf_section_offset (output_bfd, info, input_section, + rel->r_offset) != (bfd_vma) -1) { (*_bfd_error_handler) (_("%B(%A+0x%lx): unresolvable relocation against symbol `%s'"), @@ -2731,7 +2733,9 @@ bfinfdpic_relocate_section (bfd * output_bfd, default: non_fdpic: picrel = NULL; - if (h && ! BFINFDPIC_SYM_LOCAL (info, h)) + if (h && ! BFINFDPIC_SYM_LOCAL (info, h) + && _bfd_elf_section_offset (output_bfd, info, input_section, + rel->r_offset) != (bfd_vma) -1) { info->callbacks->warning (info, _("relocation references symbol not defined in the module"), diff --git a/bfd/elf32-cris.c b/bfd/elf32-cris.c index 243a8ec140d..033d1c8b791 100644 --- a/bfd/elf32-cris.c +++ b/bfd/elf32-cris.c @@ -1166,7 +1166,11 @@ cris_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED, || r_type == R_CRIS_16_PCREL || r_type == R_CRIS_32_PCREL)) relocation = 0; - else if (!info->relocatable && unresolved_reloc) + else if (!info->relocatable && unresolved_reloc + && (_bfd_elf_section_offset (output_bfd, info, + input_section, + rel->r_offset) + != (bfd_vma) -1)) { _bfd_error_handler (_("%B, section %A: unresolvable relocation %s against symbol `%s'"), diff --git a/bfd/elf32-frv.c b/bfd/elf32-frv.c index 7f3c4dd23eb..e4e7f2408ce 100644 --- a/bfd/elf32-frv.c +++ b/bfd/elf32-frv.c @@ -2896,7 +2896,10 @@ elf32_frv_relocate_section (output_bfd, info, input_bfd, input_section, default: non_fdpic: picrel = NULL; - if (h && ! FRVFDPIC_SYM_LOCAL (info, h)) + if (h + && ! FRVFDPIC_SYM_LOCAL (info, h) + && _bfd_elf_section_offset (output_bfd, info, input_section, + rel->r_offset) != (bfd_vma) -1) { info->callbacks->einfo (_("%H: relocation references symbol" diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c index 38c7c5a6109..74343560fdc 100644 --- a/bfd/elf32-i386.c +++ b/bfd/elf32-i386.c @@ -4244,7 +4244,9 @@ elf_i386_relocate_section (bfd *output_bfd, not process them. */ if (unresolved_reloc && !((input_section->flags & SEC_DEBUGGING) != 0 - && h->def_dynamic)) + && h->def_dynamic) + && _bfd_elf_section_offset (output_bfd, info, input_section, + rel->r_offset) != (bfd_vma) -1) { (*_bfd_error_handler) (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"), diff --git a/bfd/elf32-m32r.c b/bfd/elf32-m32r.c index 51ef61e6b49..37d995d14c3 100644 --- a/bfd/elf32-m32r.c +++ b/bfd/elf32-m32r.c @@ -2589,7 +2589,11 @@ m32r_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED, relocation = (h->root.u.def.value + sec->output_section->vma + sec->output_offset); - else if (!info->relocatable) + else if (!info->relocatable + && (_bfd_elf_section_offset (output_bfd, info, + input_section, + rel->r_offset) + != (bfd_vma) -1)) { (*_bfd_error_handler) (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"), diff --git a/bfd/elf32-m68k.c b/bfd/elf32-m68k.c index 612525c2ad6..8c935485fac 100644 --- a/bfd/elf32-m68k.c +++ b/bfd/elf32-m68k.c @@ -4148,7 +4148,9 @@ elf_m68k_relocate_section (output_bfd, info, input_bfd, input_section, not process them. */ if (unresolved_reloc && !((input_section->flags & SEC_DEBUGGING) != 0 - && h->def_dynamic)) + && h->def_dynamic) + && _bfd_elf_section_offset (output_bfd, info, input_section, + rel->r_offset) != (bfd_vma) -1) { (*_bfd_error_handler) (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"), diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c index cfb473479f9..ab50f1a9ed2 100644 --- a/bfd/elf32-ppc.c +++ b/bfd/elf32-ppc.c @@ -8150,7 +8150,9 @@ ppc_elf_relocate_section (bfd *output_bfd, if (unresolved_reloc && !((input_section->flags & SEC_DEBUGGING) != 0 - && h->def_dynamic)) + && h->def_dynamic) + && _bfd_elf_section_offset (output_bfd, info, input_section, + rel->r_offset) != (bfd_vma) -1) { info->callbacks->einfo (_("%P: %H: unresolvable %s relocation against symbol `%s'\n"), diff --git a/bfd/elf32-s390.c b/bfd/elf32-s390.c index 98437d0df90..2cfd53ee1b0 100644 --- a/bfd/elf32-s390.c +++ b/bfd/elf32-s390.c @@ -2996,7 +2996,9 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section, not process them. */ if (unresolved_reloc && !((input_section->flags & SEC_DEBUGGING) != 0 - && h->def_dynamic)) + && h->def_dynamic) + && _bfd_elf_section_offset (output_bfd, info, input_section, + rel->r_offset) != (bfd_vma) -1) (*_bfd_error_handler) (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"), input_bfd, diff --git a/bfd/elf32-sh.c b/bfd/elf32-sh.c index ca2c4af9058..780a3bf6b0f 100644 --- a/bfd/elf32-sh.c +++ b/bfd/elf32-sh.c @@ -4208,7 +4208,11 @@ sh_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info, STT_DATALABEL on the way to it. */ | ((h->other & STO_SH5_ISA32) != 0 && ! seen_stt_datalabel)); - else if (!info->relocatable) + else if (!info->relocatable + && (_bfd_elf_section_offset (output_bfd, info, + input_section, + rel->r_offset) + != (bfd_vma) -1)) { (*_bfd_error_handler) (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"), diff --git a/bfd/elf32-spu.c b/bfd/elf32-spu.c index ae3ed10c4ed..cff91858eda 100644 --- a/bfd/elf32-spu.c +++ b/bfd/elf32-spu.c @@ -5000,7 +5000,9 @@ spu_elf_relocate_section (bfd *output_bfd, else if (is_ea_sym) unresolved_reloc = TRUE; - if (unresolved_reloc) + if (unresolved_reloc + && _bfd_elf_section_offset (output_bfd, info, input_section, + rel->r_offset) != (bfd_vma) -1) { (*_bfd_error_handler) (_("%B(%s+0x%lx): unresolvable %s relocation against symbol `%s'"), diff --git a/bfd/elf32-tilepro.c b/bfd/elf32-tilepro.c index f2aed9cf1e1..7b08aff04ed 100644 --- a/bfd/elf32-tilepro.c +++ b/bfd/elf32-tilepro.c @@ -3110,7 +3110,9 @@ tilepro_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info, not process them. */ if (unresolved_reloc && !((input_section->flags & SEC_DEBUGGING) != 0 - && h->def_dynamic)) + && h->def_dynamic) + && _bfd_elf_section_offset (output_bfd, info, input_section, + rel->r_offset) != (bfd_vma) -1) (*_bfd_error_handler) (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"), input_bfd, diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c index c6e4fb43a01..877ab6ffcfe 100644 --- a/bfd/elf32-xtensa.c +++ b/bfd/elf32-xtensa.c @@ -3058,7 +3058,9 @@ elf_xtensa_relocate_section (bfd *output_bfd, not process them. */ if (unresolved_reloc && !((input_section->flags & SEC_DEBUGGING) != 0 - && h->def_dynamic)) + && h->def_dynamic) + && _bfd_elf_section_offset (output_bfd, info, input_section, + rel->r_offset) != (bfd_vma) -1) { (*_bfd_error_handler) (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"), diff --git a/bfd/elf64-alpha.c b/bfd/elf64-alpha.c index 528476bdddf..94ea6858d5b 100644 --- a/bfd/elf64-alpha.c +++ b/bfd/elf64-alpha.c @@ -4213,6 +4213,7 @@ elf64_alpha_relocate_section (bfd *output_bfd, struct bfd_link_info *info, bfd_vma value; bfd_vma addend; bfd_boolean dynamic_symbol_p; + bfd_boolean unresolved_reloc = FALSE; bfd_boolean undef_weak_ref = FALSE; unsigned long r_type; @@ -4294,7 +4295,6 @@ elf64_alpha_relocate_section (bfd *output_bfd, struct bfd_link_info *info, else { bfd_boolean warned; - bfd_boolean unresolved_reloc; struct elf_link_hash_entry *hh; struct elf_link_hash_entry **sym_hashes = elf_sym_hashes (input_bfd); @@ -4527,7 +4527,12 @@ elf64_alpha_relocate_section (bfd *output_bfd, struct bfd_link_info *info, else if (info->shared && r_symndx != STN_UNDEF && (input_section->flags & SEC_ALLOC) - && !undef_weak_ref) + && !undef_weak_ref + && !(unresolved_reloc + && (_bfd_elf_section_offset (output_bfd, info, + input_section, + rel->r_offset) + == (bfd_vma) -1))) { if (r_type == R_ALPHA_REFLONG) { @@ -4573,7 +4578,11 @@ elf64_alpha_relocate_section (bfd *output_bfd, struct bfd_link_info *info, /* ??? .eh_frame references to discarded sections will be smashed to relocations against SHN_UNDEF. The .eh_frame format allows NULL to be encoded as 0 in any format, so this works here. */ - if (r_symndx == STN_UNDEF) + if (r_symndx == STN_UNDEF + || (unresolved_reloc + && _bfd_elf_section_offset (output_bfd, info, + input_section, + rel->r_offset) == (bfd_vma) -1)) howto = (elf64_alpha_howto_table + (r_type - R_ALPHA_SREL32 + R_ALPHA_REFLONG)); goto default_reloc; diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c index 837568cef18..dfe10fa28c7 100644 --- a/bfd/elf64-ppc.c +++ b/bfd/elf64-ppc.c @@ -13459,7 +13459,9 @@ ppc64_elf_relocate_section (bfd *output_bfd, not process them. */ if (unresolved_reloc && !((input_section->flags & SEC_DEBUGGING) != 0 - && h->elf.def_dynamic)) + && h->elf.def_dynamic) + && _bfd_elf_section_offset (output_bfd, info, input_section, + rel->r_offset) != (bfd_vma) -1) { info->callbacks->einfo (_("%P: %H: unresolvable %s relocation against symbol `%s'\n"), diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c index 9884da03b61..7d3e8821d93 100644 --- a/bfd/elf64-s390.c +++ b/bfd/elf64-s390.c @@ -2971,7 +2971,9 @@ elf_s390_relocate_section (bfd *output_bfd, not process them. */ if (unresolved_reloc && !((input_section->flags & SEC_DEBUGGING) != 0 - && h->def_dynamic)) + && h->def_dynamic) + && _bfd_elf_section_offset (output_bfd, info, input_section, + rel->r_offset) != (bfd_vma) -1) (*_bfd_error_handler) (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"), input_bfd, diff --git a/bfd/elf64-sh64.c b/bfd/elf64-sh64.c index bbef2a216cf..92024772676 100644 --- a/bfd/elf64-sh64.c +++ b/bfd/elf64-sh64.c @@ -1630,7 +1630,11 @@ sh_elf64_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED, STT_DATALABEL on the way to it. */ | ((h->other & STO_SH5_ISA32) != 0 && ! seen_stt_datalabel)); - else if (!info->relocatable) + else if (!info->relocatable + && (_bfd_elf_section_offset (output_bfd, info, + input_section, + rel->r_offset) + != (bfd_vma) -1)) { (*_bfd_error_handler) (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"), diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c index 238c7bd29b6..092f447f495 100644 --- a/bfd/elf64-x86-64.c +++ b/bfd/elf64-x86-64.c @@ -4103,7 +4103,9 @@ elf_x86_64_relocate_section (bfd *output_bfd, not process them. */ if (unresolved_reloc && !((input_section->flags & SEC_DEBUGGING) != 0 - && h->def_dynamic)) + && h->def_dynamic) + && _bfd_elf_section_offset (output_bfd, info, input_section, + rel->r_offset) != (bfd_vma) -1) (*_bfd_error_handler) (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"), input_bfd, diff --git a/bfd/elflink.c b/bfd/elflink.c index 9956e814817..4f55d9aa151 100644 --- a/bfd/elflink.c +++ b/bfd/elflink.c @@ -11577,6 +11577,7 @@ _bfd_elf_gc_mark_rsec (struct bfd_link_info *info, asection *sec, 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; + h->mark = 1; return (*gc_mark_hook) (sec, info, cookie->rel, h, NULL); } @@ -11724,19 +11725,20 @@ struct elf_gc_sweep_symbol_info static bfd_boolean elf_gc_sweep_symbol (struct elf_link_hash_entry *h, void *data) { - if (((h->root.type == bfd_link_hash_defined - || h->root.type == bfd_link_hash_defweak) - && !h->root.u.def.section->gc_mark - && (!(h->root.u.def.section->owner->flags & DYNAMIC) - || (h->plt.refcount <= 0 - && h->got.refcount <= 0))) - || (h->root.type == bfd_link_hash_undefined - && h->plt.refcount <= 0 - && h->got.refcount <= 0)) - { - struct elf_gc_sweep_symbol_info *inf = - (struct elf_gc_sweep_symbol_info *) data; + if (!h->mark + && (((h->root.type == bfd_link_hash_defined + || h->root.type == bfd_link_hash_defweak) + && !h->root.u.def.section->gc_mark) + || h->root.type == bfd_link_hash_undefined + || h->root.type == bfd_link_hash_undefweak)) + { + struct elf_gc_sweep_symbol_info *inf; + + inf = (struct elf_gc_sweep_symbol_info *) data; (*inf->hide_symbol) (inf->info, h, TRUE); + h->def_regular = 0; + h->ref_regular = 0; + h->ref_regular_nonweak = 0; } return TRUE; diff --git a/bfd/elfxx-sparc.c b/bfd/elfxx-sparc.c index 9a151247d1b..fe18a62cc99 100644 --- a/bfd/elfxx-sparc.c +++ b/bfd/elfxx-sparc.c @@ -3828,7 +3828,9 @@ _bfd_sparc_elf_relocate_section (bfd *output_bfd, not process them. */ if (unresolved_reloc && !((input_section->flags & SEC_DEBUGGING) != 0 - && h->def_dynamic)) + && h->def_dynamic) + && _bfd_elf_section_offset (output_bfd, info, input_section, + rel->r_offset) != (bfd_vma) -1) (*_bfd_error_handler) (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"), input_bfd, diff --git a/bfd/elfxx-tilegx.c b/bfd/elfxx-tilegx.c index c484562da92..2aaa3d31757 100644 --- a/bfd/elfxx-tilegx.c +++ b/bfd/elfxx-tilegx.c @@ -3493,7 +3493,9 @@ tilegx_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info, not process them. */ if (unresolved_reloc && !((input_section->flags & SEC_DEBUGGING) != 0 - && h->def_dynamic)) + && h->def_dynamic) + && _bfd_elf_section_offset (output_bfd, info, input_section, + rel->r_offset) != (bfd_vma) -1) (*_bfd_error_handler) (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"), input_bfd, diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 791250803db..26ea036975a 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,13 @@ +2011-10-19 Alan Modra + + * ld-elf/elf.exp: Move test for shared lib support.. + * lib/ld-lib.exp (check_shared_lib_support): ..to here. Add m68hc1*, + and s/ms1/mt/. + (check_gc_sections_available): Match hppa*64 not hppa64. Comment. + * ld-gc/libpersonality.s: New. + * ld-gc/personality.s, * ld-gc/personality.d: New. + * ld-gc/gc.exp: Run personality test. + 2011-10-18 David S. Miller * ld-sparc/tlssunbin32.dd: Update for TLS call relaxation fix diff --git a/ld/testsuite/ld-elf/elf.exp b/ld/testsuite/ld-elf/elf.exp index b993c965f36..42b554138b3 100644 --- a/ld/testsuite/ld-elf/elf.exp +++ b/ld/testsuite/ld-elf/elf.exp @@ -58,40 +58,7 @@ if { ![istarget hppa64*-hpux*] } { # should not seg-fault whilst creating the binary. # # Only run the test on targets thats support creating shared libraries. -if { ! [istarget arc-*-*] - && ! [istarget avr-*-*] - && ! [istarget cr16-*-*] - && ! [istarget cris*-*-*] - && ! [istarget crx-*-*] - && ! [istarget d10v-*-*] - && ! [istarget d30v-*-*] - && ! [istarget dlx-*-*] - && ! [istarget fr30-*-*] - && ! [istarget frv-*-*] - && ! [istarget h8300-*-*] - && ! [istarget i860-*-*] - && ! [istarget i960-*-*] - && ! [istarget ip2k-*-*] - && ! [istarget iq2000-*-*] - && ! [istarget lm32-*-*] - && ! [istarget m32c-*-*] - && ! [istarget m32r-*-*] - && ! [istarget mcore*-*-*] - && ! [istarget mep-*-*] - && ! [istarget microblaze-*-*] - && ! [istarget mn10200-*-*] - && ! [istarget moxie-*-*] - && ! [istarget ms1-*-*] - && ! [istarget msp430-*-*] - && ! [istarget openrisc-*-*] - && ! [istarget or32-*-*] - && ! [istarget pj-*-*] - && ! [istarget rx-*-*] - && ! [istarget spu-*-*] - && ! [istarget v850*-*-*] - && ! [istarget xstormy16-*-*] - && ! [istarget *-*-irix*] - && ! [istarget *-*-rtems] } { +if { [check_shared_lib_support] } then { run_ld_link_tests { {"Build shared library for next test" "-shared" "" "note-3.s" {} "note-3.so" } diff --git a/ld/testsuite/ld-gc/gc.exp b/ld/testsuite/ld-gc/gc.exp index b7d6dffd90b..57f0ec3f7c9 100644 --- a/ld/testsuite/ld-gc/gc.exp +++ b/ld/testsuite/ld-gc/gc.exp @@ -97,6 +97,20 @@ test_gc "Check --gc-section/-r/-u" "gcrel" $ld "-r --gc-sections -u used_func" run_dump_test "noent" run_dump_test "abi-note" run_dump_test "start" + +if { [is_elf_format] && [check_shared_lib_support] } then { + set gasopt "" + if { [istarget tic6x-*] } then { + set gasopt "-mpic -mpid=near" + } + if {![ld_assemble_flags $as $gasopt $srcdir/$subdir/libpersonality.s tmpdir/libpersonality.o] + || ![ld_simple_link $ld tmpdir/libpersonality.so "-shared tmpdir/libpersonality.o"] } then { + fail libpersonality + } else { + run_dump_test "personality" + } +} + if { [is_remote host] || [which $CC] != 0 } { if { [istarget "*-*-linux*"] || [istarget "*-*-gnu*"] } { diff --git a/ld/testsuite/ld-gc/libpersonality.s b/ld/testsuite/ld-gc/libpersonality.s new file mode 100644 index 00000000000..b19ce2b34c6 --- /dev/null +++ b/ld/testsuite/ld-gc/libpersonality.s @@ -0,0 +1,11 @@ + .weak __gxx_personality_v0 + .type __gxx_personality_v0,%function +__gxx_personality_v0: + .long 0 + .size __gxx_personality_v0, . - __gxx_personality_v0 + + .globl __gxx_personality_v1 + .type __gxx_personality_v1,%function +__gxx_personality_v1: + .long 0 + .size __gxx_personality_v1, . - __gxx_personality_v1 diff --git a/ld/testsuite/ld-gc/personality.d b/ld/testsuite/ld-gc/personality.d new file mode 100644 index 00000000000..89fe8b48fe2 --- /dev/null +++ b/ld/testsuite/ld-gc/personality.d @@ -0,0 +1,10 @@ +#name: --gc-sections with __gxx_personality +#ld: --gc-sections -e main -L tmpdir -lpersonality +#nm: -n +#xfail: bfin-*-* cris*-*-* frv-*-* mn10300-*-* vax-*-* xtensa-*-* +# above targets don't support cfi + +#failif +#... +.*gxx_personality.* +#... diff --git a/ld/testsuite/ld-gc/personality.s b/ld/testsuite/ld-gc/personality.s new file mode 100644 index 00000000000..6fac355f893 --- /dev/null +++ b/ld/testsuite/ld-gc/personality.s @@ -0,0 +1,28 @@ + .section .text.loseme,"ax",%progbits + .globl loseme + .type loseme,%function +loseme: + .cfi_startproc + .cfi_personality 0,__gxx_personality_v0 + .long 0 + .cfi_endproc + .size loseme, . - loseme + + .section .text.loseme2,"ax",%progbits + .globl loseme2 + .type loseme2,%function +loseme2: + .cfi_startproc + .cfi_personality 0,__gxx_personality_v1 + .long 0 + .cfi_endproc + .size loseme2, . - loseme2 + + .section .text.main,"ax",%progbits + .globl main + .type main, %function +main: + .cfi_startproc + .long 0 + .cfi_endproc + .size main, . - main diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp index 3e77a5a4220..e76459185e1 100644 --- a/ld/testsuite/lib/ld-lib.exp +++ b/ld/testsuite/lib/ld-lib.exp @@ -1418,7 +1418,7 @@ proc check_gc_sections_available { } { || [istarget or32-*-*] || [istarget pj*-*-*] || [istarget alpha-*-*] - || [istarget hppa64-*-*] + || [istarget hppa*64-*-*] || [istarget i370-*-*] || [istarget i860-*-*] || [istarget ia64-*-*] @@ -1439,6 +1439,8 @@ proc check_gc_sections_available { } { } # Check if the ld used by gcc supports --gc-sections. + # FIXME: this test is useless since ld --help always says + # --gc-sections is available set ld_output [remote_exec host $ld "--help"] if { [ string first "--gc-sections" $ld_output ] >= 0 } { set gc_sections_available_saved 1 @@ -1449,6 +1451,50 @@ proc check_gc_sections_available { } { return $gc_sections_available_saved } +# Returns true if -shared is supported on the target +# Only used and accurate for ELF targets at the moment + +proc check_shared_lib_support { } { + if {![istarget arc-*-*] + && ![istarget avr-*-*] + && ![istarget cr16-*-*] + && ![istarget cris*-*-*] + && ![istarget crx-*-*] + && ![istarget d10v-*-*] + && ![istarget d30v-*-*] + && ![istarget dlx-*-*] + && ![istarget fr30-*-*] + && ![istarget frv-*-*] + && ![istarget h8300-*-*] + && ![istarget i860-*-*] + && ![istarget i960-*-*] + && ![istarget ip2k-*-*] + && ![istarget iq2000-*-*] + && ![istarget lm32-*-*] + && ![istarget m32c-*-*] + && ![istarget m32r-*-*] + && ![istarget m68hc1*-*-*] + && ![istarget mcore*-*-*] + && ![istarget mep-*-*] + && ![istarget microblaze-*-*] + && ![istarget mn10200-*-*] + && ![istarget moxie-*-*] + && ![istarget msp430-*-*] + && ![istarget mt-*-*] + && ![istarget openrisc-*-*] + && ![istarget or32-*-*] + && ![istarget pj-*-*] + && ![istarget rx-*-*] + && ![istarget spu-*-*] + && ![istarget v850*-*-*] + && ![istarget xstormy16-*-*] + && ![istarget *-*-irix*] + && ![istarget *-*-rtems] } { + return 1 + } + return 0 +} + # Returns true if the target ld supports the plugin API. proc check_plugin_api_available { } { global plugin_api_available_saved -- 2.30.2