From 65281396861dfcfa993eb5af4769d6837104890d Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 6 Dec 2017 17:31:15 +1030 Subject: [PATCH] Fix Common symbol override test fails Fixes fails on SH and NDS32 introduced by dyn_reloc tidy. * elf32-lm32.c (lm32_elf_check_relocs): Skip non-ALLOC sections. * elf32-m32r.c (m32r_elf_check_relocs): Likewise. * elf32-nds32.c (nds32_elf_check_relocs): Likewise. * elf32-or1k.c (or1k_elf_check_relocs): Likewise. * elf32-sh.c (sh_elf_check_relocs): Likewise. --- bfd/ChangeLog | 8 ++++++++ bfd/elf32-lm32.c | 9 +++++++++ bfd/elf32-m32r.c | 9 +++++++++ bfd/elf32-nds32.c | 9 +++++++++ bfd/elf32-or1k.c | 9 +++++++++ bfd/elf32-sh.c | 9 +++++++++ 6 files changed, 53 insertions(+) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index c5882809b50..91027d29423 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,11 @@ +2017-12-06 Alan Modra + + * elf32-lm32.c (lm32_elf_check_relocs): Skip non-ALLOC sections. + * elf32-m32r.c (m32r_elf_check_relocs): Likewise. + * elf32-nds32.c (nds32_elf_check_relocs): Likewise. + * elf32-or1k.c (or1k_elf_check_relocs): Likewise. + * elf32-sh.c (sh_elf_check_relocs): Likewise. + 2017-12-06 Alan Modra * elf32-hppa.c (struct elf32_hppa_dyn_reloc_entry): Delete. Use diff --git a/bfd/elf32-lm32.c b/bfd/elf32-lm32.c index 386754241d2..17b188be8a9 100644 --- a/bfd/elf32-lm32.c +++ b/bfd/elf32-lm32.c @@ -1165,6 +1165,15 @@ lm32_elf_check_relocs (bfd *abfd, if (bfd_link_relocatable (info)) return TRUE; + /* Don't do anything special with non-loaded, non-alloced sections. + In particular, any relocs in such sections should not affect GOT + and PLT reference counting (ie. we don't allow them to create GOT + or PLT entries), there's no possibility or desire to optimize TLS + relocs, and there's not much point in propagating relocs to shared + libs that the dynamic linker won't relocate. */ + if ((sec->flags & SEC_ALLOC) == 0) + return TRUE; + symtab_hdr = &elf_tdata (abfd)->symtab_hdr; sym_hashes = elf_sym_hashes (abfd); sym_hashes_end = sym_hashes + symtab_hdr->sh_size/sizeof (Elf32_External_Sym); diff --git a/bfd/elf32-m32r.c b/bfd/elf32-m32r.c index 39c7f75689e..cd9f9d26347 100644 --- a/bfd/elf32-m32r.c +++ b/bfd/elf32-m32r.c @@ -3547,6 +3547,15 @@ m32r_elf_check_relocs (bfd *abfd, if (bfd_link_relocatable (info)) return TRUE; + /* Don't do anything special with non-loaded, non-alloced sections. + In particular, any relocs in such sections should not affect GOT + and PLT reference counting (ie. we don't allow them to create GOT + or PLT entries), there's no possibility or desire to optimize TLS + relocs, and there's not much point in propagating relocs to shared + libs that the dynamic linker won't relocate. */ + if ((sec->flags & SEC_ALLOC) == 0) + return TRUE; + sreloc = NULL; symtab_hdr = &elf_tdata (abfd)->symtab_hdr; sym_hashes = elf_sym_hashes (abfd); diff --git a/bfd/elf32-nds32.c b/bfd/elf32-nds32.c index bfd21aecbe6..80765c74650 100644 --- a/bfd/elf32-nds32.c +++ b/bfd/elf32-nds32.c @@ -6100,6 +6100,15 @@ nds32_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, if (bfd_link_relocatable (info)) return TRUE; + /* Don't do anything special with non-loaded, non-alloced sections. + In particular, any relocs in such sections should not affect GOT + and PLT reference counting (ie. we don't allow them to create GOT + or PLT entries), there's no possibility or desire to optimize TLS + relocs, and there's not much point in propagating relocs to shared + libs that the dynamic linker won't relocate. */ + if ((sec->flags & SEC_ALLOC) == 0) + return TRUE; + symtab_hdr = &elf_tdata (abfd)->symtab_hdr; sym_hashes = elf_sym_hashes (abfd); sym_hashes_end = diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c index d1d27f1ed3e..424a2d31d36 100644 --- a/bfd/elf32-or1k.c +++ b/bfd/elf32-or1k.c @@ -1301,6 +1301,15 @@ or1k_elf_check_relocs (bfd *abfd, if (bfd_link_relocatable (info)) return TRUE; + /* Don't do anything special with non-loaded, non-alloced sections. + In particular, any relocs in such sections should not affect GOT + and PLT reference counting (ie. we don't allow them to create GOT + or PLT entries), there's no possibility or desire to optimize TLS + relocs, and there's not much point in propagating relocs to shared + libs that the dynamic linker won't relocate. */ + if ((sec->flags & SEC_ALLOC) == 0) + return TRUE; + symtab_hdr = &elf_tdata (abfd)->symtab_hdr; sym_hashes = elf_sym_hashes (abfd); diff --git a/bfd/elf32-sh.c b/bfd/elf32-sh.c index 420931bfc31..0ed0debdf44 100644 --- a/bfd/elf32-sh.c +++ b/bfd/elf32-sh.c @@ -5782,6 +5782,15 @@ sh_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec, if (bfd_link_relocatable (info)) return TRUE; + /* Don't do anything special with non-loaded, non-alloced sections. + In particular, any relocs in such sections should not affect GOT + and PLT reference counting (ie. we don't allow them to create GOT + or PLT entries), there's no possibility or desire to optimize TLS + relocs, and there's not much point in propagating relocs to shared + libs that the dynamic linker won't relocate. */ + if ((sec->flags & SEC_ALLOC) == 0) + return TRUE; + BFD_ASSERT (is_sh_elf (abfd)); symtab_hdr = &elf_symtab_hdr (abfd); -- 2.30.2