From bc4e12ded1d4c8d589d82b2a10ade6b47f219db3 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Tue, 16 May 2017 07:58:14 +0930 Subject: [PATCH] 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. --- bfd/ChangeLog | 57 ++++++++++++++++++++++++++++++++++++++++++ bfd/elf-m10300.c | 2 +- bfd/elf32-arm.c | 2 +- bfd/elf32-bfin.c | 2 +- bfd/elf32-cr16.c | 2 +- bfd/elf32-cris.c | 2 +- bfd/elf32-d10v.c | 2 +- bfd/elf32-dlx.c | 2 +- bfd/elf32-fr30.c | 2 +- bfd/elf32-frv.c | 2 +- bfd/elf32-hppa.c | 2 +- bfd/elf32-i370.c | 2 +- bfd/elf32-i386.c | 2 +- bfd/elf32-iq2000.c | 2 +- bfd/elf32-lm32.c | 2 +- bfd/elf32-m32c.c | 2 +- bfd/elf32-m32r.c | 2 +- bfd/elf32-m68hc1x.c | 2 +- bfd/elf32-m68k.c | 2 +- bfd/elf32-mcore.c | 2 +- bfd/elf32-metag.c | 2 +- bfd/elf32-microblaze.c | 2 +- bfd/elf32-moxie.c | 2 +- bfd/elf32-msp430.c | 2 +- bfd/elf32-mt.c | 2 +- bfd/elf32-nios2.c | 2 +- bfd/elf32-or1k.c | 2 +- bfd/elf32-ppc.c | 2 +- bfd/elf32-rl78.c | 2 +- bfd/elf32-s390.c | 2 +- bfd/elf32-score.c | 2 +- bfd/elf32-score7.c | 2 +- bfd/elf32-sh.c | 2 +- bfd/elf32-tic6x.c | 2 +- bfd/elf32-tilepro.c | 2 +- bfd/elf32-v850.c | 2 +- bfd/elf32-vax.c | 2 +- bfd/elf32-xstormy16.c | 2 +- bfd/elf32-xtensa.c | 2 +- bfd/elf64-alpha.c | 2 +- bfd/elf64-hppa.c | 2 +- bfd/elf64-ia64-vms.c | 2 +- bfd/elf64-mmix.c | 2 +- bfd/elf64-ppc.c | 6 ++--- bfd/elf64-s390.c | 2 +- bfd/elf64-sh64.c | 2 +- bfd/elf64-x86-64.c | 2 +- bfd/elflink.c | 2 +- bfd/elfnn-aarch64.c | 4 +-- bfd/elfnn-ia64.c | 2 +- bfd/elfnn-riscv.c | 2 +- bfd/elfxx-mips.c | 2 +- bfd/elfxx-sparc.c | 2 +- bfd/elfxx-tilegx.c | 2 +- bfd/linker.c | 2 +- include/ChangeLog | 5 ++++ include/bfdlink.h | 2 +- ld/ChangeLog | 4 +++ ld/plugin.c | 8 +++--- 59 files changed, 128 insertions(+), 62 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 8b3f1a5b12..532ba0c65c 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,60 @@ +2017-05-16 Alan Modra + + * 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. + 2017-05-16 Alan Modra * elf64-ppc.c (add_symbol_adjust): Transfer non_ir_ref_dynamic. diff --git a/bfd/elf-m10300.c b/bfd/elf-m10300.c index f9d8089704..b0a783a525 100644 --- a/bfd/elf-m10300.c +++ b/bfd/elf-m10300.c @@ -1094,7 +1094,7 @@ mn10300_elf_check_relocs (bfd *abfd, /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; } r_type = ELF32_R_TYPE (rel->r_info); diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c index 23a02c03f2..1725c22269 100644 --- a/bfd/elf32-arm.c +++ b/bfd/elf32-arm.c @@ -14556,7 +14556,7 @@ elf32_arm_check_relocs (bfd *abfd, struct bfd_link_info *info, /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; } } diff --git a/bfd/elf32-bfin.c b/bfd/elf32-bfin.c index ff1bcc6f43..b21a146db3 100644 --- a/bfd/elf32-bfin.c +++ b/bfd/elf32-bfin.c @@ -1191,7 +1191,7 @@ bfin_check_relocs (bfd * abfd, /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; } switch (ELF32_R_TYPE (rel->r_info)) diff --git a/bfd/elf32-cr16.c b/bfd/elf32-cr16.c index 92aa0c83af..c36388eb76 100644 --- a/bfd/elf32-cr16.c +++ b/bfd/elf32-cr16.c @@ -738,7 +738,7 @@ cr16_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec, /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; } /* Some relocs require a global offset table. */ diff --git a/bfd/elf32-cris.c b/bfd/elf32-cris.c index d4bbcebecc..83c410181c 100644 --- a/bfd/elf32-cris.c +++ b/bfd/elf32-cris.c @@ -3178,7 +3178,7 @@ cris_elf_check_relocs (bfd *abfd, /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; } r_type = ELF32_R_TYPE (rel->r_info); diff --git a/bfd/elf32-d10v.c b/bfd/elf32-d10v.c index 6b6fb347ad..d284d4f565 100644 --- a/bfd/elf32-d10v.c +++ b/bfd/elf32-d10v.c @@ -294,7 +294,7 @@ elf32_d10v_check_relocs (bfd *abfd, /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; } switch (ELF32_R_TYPE (rel->r_info)) diff --git a/bfd/elf32-dlx.c b/bfd/elf32-dlx.c index 965d8666f8..b12d24a3e4 100644 --- a/bfd/elf32-dlx.c +++ b/bfd/elf32-dlx.c @@ -454,7 +454,7 @@ elf32_dlx_check_relocs (bfd *abfd, /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; } switch (ELF32_R_TYPE (rel->r_info)) diff --git a/bfd/elf32-fr30.c b/bfd/elf32-fr30.c index f668074eea..94070d8ef2 100644 --- a/bfd/elf32-fr30.c +++ b/bfd/elf32-fr30.c @@ -673,7 +673,7 @@ fr30_elf_check_relocs (bfd *abfd, /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; } switch (ELF32_R_TYPE (rel->r_info)) diff --git a/bfd/elf32-frv.c b/bfd/elf32-frv.c index d4b77275d5..ef609ff540 100644 --- a/bfd/elf32-frv.c +++ b/bfd/elf32-frv.c @@ -6041,7 +6041,7 @@ elf32_frv_check_relocs (bfd *abfd, /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; } switch (ELF32_R_TYPE (rel->r_info)) diff --git a/bfd/elf32-hppa.c b/bfd/elf32-hppa.c index 1deebf4f03..0087c71a60 100644 --- a/bfd/elf32-hppa.c +++ b/bfd/elf32-hppa.c @@ -1171,7 +1171,7 @@ elf32_hppa_check_relocs (bfd *abfd, /* PR15323, ref flags aren't set for references in the same object. */ - hh->eh.root.non_ir_ref = 1; + hh->eh.root.non_ir_ref_regular = 1; } r_type = ELF32_R_TYPE (rela->r_info); diff --git a/bfd/elf32-i370.c b/bfd/elf32-i370.c index f8e825fba5..4c40b790bb 100644 --- a/bfd/elf32-i370.c +++ b/bfd/elf32-i370.c @@ -839,7 +839,7 @@ i370_elf_check_relocs (bfd *abfd, /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; } if (bfd_link_pic (info)) diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c index 513e296840..1fdc06c3ce 100644 --- a/bfd/elf32-i386.c +++ b/bfd/elf32-i386.c @@ -1971,7 +1971,7 @@ elf_i386_check_relocs (bfd *abfd, /* It is referenced by a non-shared object. */ h->ref_regular = 1; - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; if (h->type == STT_GNU_IFUNC) elf_tdata (info->output_bfd)->has_gnu_symbols diff --git a/bfd/elf32-iq2000.c b/bfd/elf32-iq2000.c index 1f88726e33..c17097d647 100644 --- a/bfd/elf32-iq2000.c +++ b/bfd/elf32-iq2000.c @@ -486,7 +486,7 @@ iq2000_elf_check_relocs (bfd *abfd, /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; } switch (ELF32_R_TYPE (rel->r_info)) diff --git a/bfd/elf32-lm32.c b/bfd/elf32-lm32.c index a6fafefd50..aabf49fb4b 100644 --- a/bfd/elf32-lm32.c +++ b/bfd/elf32-lm32.c @@ -1272,7 +1272,7 @@ lm32_elf_check_relocs (bfd *abfd, /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; } /* Some relocs require a global offset table. */ diff --git a/bfd/elf32-m32c.c b/bfd/elf32-m32c.c index 0ee67b7aeb..9658d17d17 100644 --- a/bfd/elf32-m32c.c +++ b/bfd/elf32-m32c.c @@ -689,7 +689,7 @@ m32c_elf_check_relocs /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; } switch (ELF32_R_TYPE (rel->r_info)) diff --git a/bfd/elf32-m32r.c b/bfd/elf32-m32r.c index 7ecf95fb03..90408237d4 100644 --- a/bfd/elf32-m32r.c +++ b/bfd/elf32-m32r.c @@ -3706,7 +3706,7 @@ m32r_elf_check_relocs (bfd *abfd, /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; } /* Some relocs require a global offset table. */ diff --git a/bfd/elf32-m68hc1x.c b/bfd/elf32-m68hc1x.c index 86e52d88c6..96fc96ff74 100644 --- a/bfd/elf32-m68hc1x.c +++ b/bfd/elf32-m68hc1x.c @@ -879,7 +879,7 @@ elf32_m68hc11_check_relocs (bfd *abfd, struct bfd_link_info *info, /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; } switch (ELF32_R_TYPE (rel->r_info)) diff --git a/bfd/elf32-m68k.c b/bfd/elf32-m68k.c index 20e63621b8..932d8ffff9 100644 --- a/bfd/elf32-m68k.c +++ b/bfd/elf32-m68k.c @@ -2590,7 +2590,7 @@ elf_m68k_check_relocs (bfd *abfd, /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; } switch (ELF32_R_TYPE (rel->r_info)) diff --git a/bfd/elf32-mcore.c b/bfd/elf32-mcore.c index 79c0da606a..0037129e94 100644 --- a/bfd/elf32-mcore.c +++ b/bfd/elf32-mcore.c @@ -629,7 +629,7 @@ mcore_elf_check_relocs (bfd * abfd, /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; } switch (ELF32_R_TYPE (rel->r_info)) diff --git a/bfd/elf32-metag.c b/bfd/elf32-metag.c index c45d719269..94eda95309 100644 --- a/bfd/elf32-metag.c +++ b/bfd/elf32-metag.c @@ -2132,7 +2132,7 @@ elf_metag_check_relocs (bfd *abfd, /* PR15323, ref flags aren't set for references in the same object. */ - hh->eh.root.non_ir_ref = 1; + hh->eh.root.non_ir_ref_regular = 1; } /* Some relocs require a global offset table. */ diff --git a/bfd/elf32-microblaze.c b/bfd/elf32-microblaze.c index f2796b4aa7..265773675c 100644 --- a/bfd/elf32-microblaze.c +++ b/bfd/elf32-microblaze.c @@ -2315,7 +2315,7 @@ microblaze_elf_check_relocs (bfd * abfd, /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; } switch (r_type) diff --git a/bfd/elf32-moxie.c b/bfd/elf32-moxie.c index fde9b6437b..f955096880 100644 --- a/bfd/elf32-moxie.c +++ b/bfd/elf32-moxie.c @@ -359,7 +359,7 @@ moxie_elf_check_relocs (bfd *abfd, /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; } } diff --git a/bfd/elf32-msp430.c b/bfd/elf32-msp430.c index 25bbdc8e32..9fae01573e 100644 --- a/bfd/elf32-msp430.c +++ b/bfd/elf32-msp430.c @@ -698,7 +698,7 @@ elf32_msp430_check_relocs (bfd * abfd, struct bfd_link_info * info, /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; } } diff --git a/bfd/elf32-mt.c b/bfd/elf32-mt.c index 9e58a7f1c7..db89f8c86e 100644 --- a/bfd/elf32-mt.c +++ b/bfd/elf32-mt.c @@ -458,7 +458,7 @@ mt_elf_check_relocs /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; } } diff --git a/bfd/elf32-nios2.c b/bfd/elf32-nios2.c index a2045bf366..50a09ead81 100644 --- a/bfd/elf32-nios2.c +++ b/bfd/elf32-nios2.c @@ -4734,7 +4734,7 @@ nios2_elf32_check_relocs (bfd *abfd, struct bfd_link_info *info, /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; } r_type = ELF32_R_TYPE (rel->r_info); diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c index 224cbb892c..583f2d49ae 100644 --- a/bfd/elf32-or1k.c +++ b/bfd/elf32-or1k.c @@ -1404,7 +1404,7 @@ or1k_elf_check_relocs (bfd *abfd, /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; } switch (ELF32_R_TYPE (rel->r_info)) diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c index 7a462337dd..a4814fcdbb 100644 --- a/bfd/elf32-ppc.c +++ b/bfd/elf32-ppc.c @@ -4055,7 +4055,7 @@ ppc_elf_check_relocs (bfd *abfd, /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; } /* If a relocation refers to _GLOBAL_OFFSET_TABLE_, create the .got. diff --git a/bfd/elf32-rl78.c b/bfd/elf32-rl78.c index 0326445bea..bc1f3c72cc 100644 --- a/bfd/elf32-rl78.c +++ b/bfd/elf32-rl78.c @@ -1328,7 +1328,7 @@ rl78_elf_check_relocs /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; } switch (ELF32_R_TYPE (rel->r_info)) diff --git a/bfd/elf32-s390.c b/bfd/elf32-s390.c index 8a09a319ab..fc4992e887 100644 --- a/bfd/elf32-s390.c +++ b/bfd/elf32-s390.c @@ -996,7 +996,7 @@ elf_s390_check_relocs (bfd *abfd, /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; } /* Create got section and local_got_refcounts array if they diff --git a/bfd/elf32-score.c b/bfd/elf32-score.c index 98856e8e00..44682766a9 100644 --- a/bfd/elf32-score.c +++ b/bfd/elf32-score.c @@ -2842,7 +2842,7 @@ s3_bfd_score_elf_check_relocs (bfd *abfd, /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; } } diff --git a/bfd/elf32-score7.c b/bfd/elf32-score7.c index 2698c10aa2..abf9b32084 100644 --- a/bfd/elf32-score7.c +++ b/bfd/elf32-score7.c @@ -2651,7 +2651,7 @@ s7_bfd_score_elf_check_relocs (bfd *abfd, /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; } } diff --git a/bfd/elf32-sh.c b/bfd/elf32-sh.c index 3c30032714..3b1cc67ee2 100644 --- a/bfd/elf32-sh.c +++ b/bfd/elf32-sh.c @@ -5823,7 +5823,7 @@ sh_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec, /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; } r_type = sh_elf_optimized_tls_reloc (info, r_type, h == NULL); diff --git a/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c index f65e24f44b..e2a29618cd 100644 --- a/bfd/elf32-tic6x.c +++ b/bfd/elf32-tic6x.c @@ -2835,7 +2835,7 @@ elf32_tic6x_check_relocs (bfd *abfd, struct bfd_link_info *info, /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; } switch (r_type) diff --git a/bfd/elf32-tilepro.c b/bfd/elf32-tilepro.c index fb06a47739..63d0cbe5f5 100644 --- a/bfd/elf32-tilepro.c +++ b/bfd/elf32-tilepro.c @@ -1504,7 +1504,7 @@ tilepro_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; } r_type = tilepro_elf_tls_transition (info, r_type, h == NULL); diff --git a/bfd/elf32-v850.c b/bfd/elf32-v850.c index 823ba982aa..0e9ed5f05a 100644 --- a/bfd/elf32-v850.c +++ b/bfd/elf32-v850.c @@ -86,7 +86,7 @@ v850_elf_check_relocs (bfd *abfd, /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; } r_type = ELF32_R_TYPE (rel->r_info); diff --git a/bfd/elf32-vax.c b/bfd/elf32-vax.c index 0e4d2e4d9d..367e41559e 100644 --- a/bfd/elf32-vax.c +++ b/bfd/elf32-vax.c @@ -591,7 +591,7 @@ elf_vax_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec, /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; } switch (ELF32_R_TYPE (rel->r_info)) diff --git a/bfd/elf32-xstormy16.c b/bfd/elf32-xstormy16.c index af4175cd8a..d6aab8f27c 100644 --- a/bfd/elf32-xstormy16.c +++ b/bfd/elf32-xstormy16.c @@ -438,7 +438,7 @@ xstormy16_elf_check_relocs (bfd *abfd, /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; } switch (ELF32_R_TYPE (rel->r_info)) diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c index 80f50e3104..d11d43be93 100644 --- a/bfd/elf32-xtensa.c +++ b/bfd/elf32-xtensa.c @@ -1015,7 +1015,7 @@ elf_xtensa_check_relocs (bfd *abfd, /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; } eh = elf_xtensa_hash_entry (h); diff --git a/bfd/elf64-alpha.c b/bfd/elf64-alpha.c index 43c6ed8d3d..ada26f5255 100644 --- a/bfd/elf64-alpha.c +++ b/bfd/elf64-alpha.c @@ -1838,7 +1838,7 @@ elf64_alpha_check_relocs (bfd *abfd, struct bfd_link_info *info, /* PR15323, ref flags aren't set for references in the same object. */ - h->root.root.non_ir_ref = 1; + h->root.root.non_ir_ref_regular = 1; h->root.ref_regular = 1; } diff --git a/bfd/elf64-hppa.c b/bfd/elf64-hppa.c index 96e03ba40a..834855ab59 100644 --- a/bfd/elf64-hppa.c +++ b/bfd/elf64-hppa.c @@ -644,7 +644,7 @@ elf64_hppa_check_relocs (bfd *abfd, /* PR15323, ref flags aren't set for references in the same object. */ - hh->eh.root.non_ir_ref = 1; + hh->eh.root.non_ir_ref_regular = 1; hh->eh.ref_regular = 1; } else diff --git a/bfd/elf64-ia64-vms.c b/bfd/elf64-ia64-vms.c index 5dd83a3cca..4dff255e42 100644 --- a/bfd/elf64-ia64-vms.c +++ b/bfd/elf64-ia64-vms.c @@ -2099,7 +2099,7 @@ elf64_ia64_check_relocs (bfd *abfd, struct bfd_link_info *info, /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; h->ref_regular = 1; } else diff --git a/bfd/elf64-mmix.c b/bfd/elf64-mmix.c index 2ebe0aa3b9..b4ff5a337c 100644 --- a/bfd/elf64-mmix.c +++ b/bfd/elf64-mmix.c @@ -2018,7 +2018,7 @@ mmix_elf_check_relocs (bfd *abfd, /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; } switch (ELF64_R_TYPE (rel->r_info)) diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c index a2cc373b9f..948de12a3a 100644 --- a/bfd/elf64-ppc.c +++ b/bfd/elf64-ppc.c @@ -5118,7 +5118,7 @@ add_symbol_adjust (struct ppc_link_hash_entry *eh, struct bfd_link_info *info) /* Propagate reference flags from entry symbol to function descriptor symbol. */ - fdh->elf.root.non_ir_ref |= eh->elf.root.non_ir_ref; + fdh->elf.root.non_ir_ref_regular |= eh->elf.root.non_ir_ref_regular; fdh->elf.root.non_ir_ref_dynamic |= eh->elf.root.non_ir_ref_dynamic; fdh->elf.ref_regular |= eh->elf.ref_regular; fdh->elf.ref_regular_nonweak |= eh->elf.ref_regular_nonweak; @@ -5423,9 +5423,9 @@ ppc64_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; if (eh->is_func && eh->oh != NULL) - eh->oh->elf.root.non_ir_ref = 1; + eh->oh->elf.root.non_ir_ref_regular = 1; if (h == htab->elf.hgot) sec->has_toc_reloc = 1; diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c index ca3541f583..b1f5b89036 100644 --- a/bfd/elf64-s390.c +++ b/bfd/elf64-s390.c @@ -911,7 +911,7 @@ elf_s390_check_relocs (bfd *abfd, /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; } /* Create got section and local_got_refcounts array if they diff --git a/bfd/elf64-sh64.c b/bfd/elf64-sh64.c index e38333dd19..bc8e9e1af9 100644 --- a/bfd/elf64-sh64.c +++ b/bfd/elf64-sh64.c @@ -2384,7 +2384,7 @@ sh_elf64_check_relocs (bfd *abfd, struct bfd_link_info *info, /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; } /* Some relocs require a global offset table. */ diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c index 1b9337944e..00cf70ad72 100644 --- a/bfd/elf64-x86-64.c +++ b/bfd/elf64-x86-64.c @@ -2336,7 +2336,7 @@ elf_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info, { /* It is referenced by a non-shared object. */ h->ref_regular = 1; - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; if (h->type == STT_GNU_IFUNC) elf_tdata (info->output_bfd)->has_gnu_symbols diff --git a/bfd/elflink.c b/bfd/elflink.c index 8eaf533b75..60e0a32294 100644 --- a/bfd/elflink.c +++ b/bfd/elflink.c @@ -10472,7 +10472,7 @@ elf_link_input_bfd (struct elf_final_link_info *flinfo, bfd *input_bfd) linker may attach linker created dynamic sections to the plugin bfd. Symbols defined in linker created sections are not plugin symbols. */ - if ((h->root.non_ir_ref + if ((h->root.non_ir_ref_regular || h->root.non_ir_ref_dynamic) && (h->root.type == bfd_link_hash_defined || h->root.type == bfd_link_hash_defweak) diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c index 00f19e930d..aaa7748244 100644 --- a/bfd/elfnn-aarch64.c +++ b/bfd/elfnn-aarch64.c @@ -7135,7 +7135,7 @@ elfNN_aarch64_check_relocs (bfd *abfd, struct bfd_link_info *info, /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; } /* Could be done earlier, if h were already available. */ @@ -7191,7 +7191,7 @@ elfNN_aarch64_check_relocs (bfd *abfd, struct bfd_link_info *info, /* It is referenced by a non-shared object. */ h->ref_regular = 1; - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; } switch (bfd_r_type) diff --git a/bfd/elfnn-ia64.c b/bfd/elfnn-ia64.c index e5ba8f21f9..7f90c9325f 100644 --- a/bfd/elfnn-ia64.c +++ b/bfd/elfnn-ia64.c @@ -2359,7 +2359,7 @@ elfNN_ia64_check_relocs (bfd *abfd, struct bfd_link_info *info, /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; h->ref_regular = 1; } else diff --git a/bfd/elfnn-riscv.c b/bfd/elfnn-riscv.c index 38f12d0f58..5a0fae1511 100644 --- a/bfd/elfnn-riscv.c +++ b/bfd/elfnn-riscv.c @@ -539,7 +539,7 @@ riscv_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; } switch (r_type) diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c index 61e1adb1ff..cbf39c0630 100644 --- a/bfd/elfxx-mips.c +++ b/bfd/elfxx-mips.c @@ -8393,7 +8393,7 @@ _bfd_mips_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; } } diff --git a/bfd/elfxx-sparc.c b/bfd/elfxx-sparc.c index c978aad80b..185a8c1b53 100644 --- a/bfd/elfxx-sparc.c +++ b/bfd/elfxx-sparc.c @@ -1477,7 +1477,7 @@ _bfd_sparc_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; } if (h && h->type == STT_GNU_IFUNC) diff --git a/bfd/elfxx-tilegx.c b/bfd/elfxx-tilegx.c index 76dfcd8149..95c9a155b1 100644 --- a/bfd/elfxx-tilegx.c +++ b/bfd/elfxx-tilegx.c @@ -1721,7 +1721,7 @@ tilegx_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; } r_type = tilegx_elf_tls_transition (info, r_type, h == NULL, diff --git a/bfd/linker.c b/bfd/linker.c index 1f493a3e31..9861259ad9 100644 --- a/bfd/linker.c +++ b/bfd/linker.c @@ -1735,7 +1735,7 @@ _bfd_generic_link_add_one_symbol (struct bfd_link_info *info, otherwise add a warning. */ if ((!info->lto_plugin_active && (h->u.undef.next != NULL || info->hash->undefs_tail == h)) - || h->non_ir_ref + || h->non_ir_ref_regular || h->non_ir_ref_dynamic) { (*info->callbacks->warning) (info, string, h->root.string, diff --git a/include/ChangeLog b/include/ChangeLog index 84257609e4..9383cc4939 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,8 @@ +2017-05-16 Alan Modra + + * bfdlink.h (struct bfd_link_hash_entry ): Rename to + non_ir_ref_regular. + 2017-05-16 Alan Modra * bfdlink.h (struct bfd_link_hash_entry): Update non_ir_ref diff --git a/include/bfdlink.h b/include/bfdlink.h index 41f5338dc8..371822c5fc 100644 --- a/include/bfdlink.h +++ b/include/bfdlink.h @@ -102,7 +102,7 @@ struct bfd_link_hash_entry /* Symbol is referenced in a normal regular object file, as distinct from a LTO IR object file. */ - unsigned int non_ir_ref : 1; + unsigned int non_ir_ref_regular : 1; /* Symbol is referenced in a normal dynamic object file, as distinct from a LTO IR object file. */ diff --git a/ld/ChangeLog b/ld/ChangeLog index 9fdd75805f..a1df77a96f 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,7 @@ +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. diff --git a/ld/plugin.c b/ld/plugin.c index 087cedceed..9abeaf029d 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; } -- 2.34.1