From bc4e12ded1d4c8d589d82b2a10ade6b47f219db3 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Tue, 16 May 2017 07:58:14 +0930 Subject: Rename non_ir_ref to non_ir_ref_regular Since the flag is now set only for regular object refs. include/ * bfdlink.h (struct bfd_link_hash_entry ): Rename to non_ir_ref_regular. bfd/ * elf-m10300.c: Rename occurrences of non_ir_ref. * elf32-arm.c: Likewise. * elf32-bfin.c: Likewise. * elf32-cr16.c: Likewise. * elf32-cris.c: Likewise. * elf32-d10v.c: Likewise. * elf32-dlx.c: Likewise. * elf32-fr30.c: Likewise. * elf32-frv.c: Likewise. * elf32-hppa.c: Likewise. * elf32-i370.c: Likewise. * elf32-i386.c: Likewise. * elf32-iq2000.c: Likewise. * elf32-lm32.c: Likewise. * elf32-m32c.c: Likewise. * elf32-m32r.c: Likewise. * elf32-m68hc1x.c: Likewise. * elf32-m68k.c: Likewise. * elf32-mcore.c: Likewise. * elf32-metag.c: Likewise. * elf32-microblaze.c: Likewise. * elf32-moxie.c: Likewise. * elf32-msp430.c: Likewise. * elf32-mt.c: Likewise. * elf32-nios2.c: Likewise. * elf32-or1k.c: Likewise. * elf32-ppc.c: Likewise. * elf32-rl78.c: Likewise. * elf32-s390.c: Likewise. * elf32-score.c: Likewise. * elf32-score7.c: Likewise. * elf32-sh.c: Likewise. * elf32-tic6x.c: Likewise. * elf32-tilepro.c: Likewise. * elf32-v850.c: Likewise. * elf32-vax.c: Likewise. * elf32-xstormy16.c: Likewise. * elf32-xtensa.c: Likewise. * elf64-alpha.c: Likewise. * elf64-hppa.c: Likewise. * elf64-ia64-vms.c: Likewise. * elf64-mmix.c: Likewise. * elf64-ppc.c: Likewise. * elf64-s390.c: Likewise. * elf64-sh64.c: Likewise. * elf64-x86-64.c: Likewise. * elflink.c: Likewise. * elfnn-aarch64.c: Likewise. * elfnn-ia64.c: Likewise. * elfnn-riscv.c: Likewise. * elfxx-mips.c: Likewise. * elfxx-sparc.c: Likewise. * elfxx-tilegx.c: Likewise. * linker.c: Likewise. ld/ * plugin.c: Rename occurrences of non_ir_ref. --- ld/ChangeLog | 4 ++++ ld/plugin.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'ld') diff --git a/ld/ChangeLog b/ld/ChangeLog index 9fdd758..a1df77a 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,5 +1,9 @@ 2017-05-16 Alan Modra + * plugin.c: Rename occurrences of non_ir_ref. + +2017-05-16 Alan Modra + * plugin.c (is_visible_from_outside): Use non_ir_ref_dynamic. (plugin_notice): Set non_ir_ref for references from regular objects, non_ir_ref_dynamic for references from dynamic objects. diff --git a/ld/plugin.c b/ld/plugin.c index 087cedc..9abeaf0 100644 --- a/ld/plugin.c +++ b/ld/plugin.c @@ -774,7 +774,7 @@ get_symbols (const void *handle, int nsyms, struct ld_plugin_symbol *syms, even potentially-referenced, perhaps in a future final link if this is a partial one, perhaps dynamically at load-time if the symbol is externally visible. */ - if (blhe->non_ir_ref) + if (blhe->non_ir_ref_regular) res = LDPR_PREVAILING_DEF; else if (is_visible_from_outside (&syms[n], blhe)) res = def_ironly_exp; @@ -1266,7 +1266,7 @@ plugin_call_cleanup (void) /* To determine which symbols should be resolved LDPR_PREVAILING_DEF and which LDPR_PREVAILING_DEF_IRONLY, we notice all the symbols as the linker adds them to the linker hash table. Mark those - referenced from a non-IR file with non_ir_ref or + referenced from a non-IR file with non_ir_ref_regular or non_ir_ref_dynamic as appropriate. We have to notice_all symbols, because we won't necessarily know until later which ones will be contributed by IR files. */ @@ -1304,7 +1304,7 @@ plugin_notice (struct bfd_link_info *info, || inh->type == bfd_link_hash_new) { if ((abfd->flags & DYNAMIC) == 0) - inh->non_ir_ref = TRUE; + inh->non_ir_ref_regular = TRUE; else inh->non_ir_ref_dynamic = TRUE; } @@ -1362,7 +1362,7 @@ plugin_notice (struct bfd_link_info *info, if (ref) { if ((abfd->flags & DYNAMIC) == 0) - h->non_ir_ref = TRUE; + h->non_ir_ref_regular = TRUE; else h->non_ir_ref_dynamic = TRUE; } -- cgit v1.1