From 580a2b6ef36f848f0661ecf07fdc6ae5c97470a4 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 5 Apr 2006 13:36:32 +0000 Subject: [PATCH] 2006-04-05 H.J. Lu PR ld/2404 * elflink.c (_bfd_elf_merge_symbol): Skip the default indirect symbol from the dynamic definition with the default version if its type and the type of existing regular definition mismatch. --- bfd/ChangeLog | 7 +++++++ bfd/elflink.c | 20 ++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 322b77facd3..9f371a802d2 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,10 @@ +2006-04-05 H.J. Lu + + PR ld/2404 + * elflink.c (_bfd_elf_merge_symbol): Skip the default indirect + symbol from the dynamic definition with the default version if + its type and the type of existing regular definition mismatch. + 2006-04-05 Richard Sandiford Daniel Jacobowitz diff --git a/bfd/elflink.c b/bfd/elflink.c index 88e56da54d4..f3098aedfdf 100644 --- a/bfd/elflink.c +++ b/bfd/elflink.c @@ -889,6 +889,26 @@ _bfd_elf_merge_symbol (bfd *abfd, && h->root.type != bfd_link_hash_undefweak && h->root.type != bfd_link_hash_common); + /* When we try to create a default indirect symbol from the dynamic + definition with the default version, we skip it if its type and + the type of existing regular definition mismatch. We only do it + if the existing regular definition won't be dynamic. */ + if (pold_alignment == NULL + && !info->shared + && !info->export_dynamic + && !h->ref_dynamic + && newdyn + && newdef + && !olddyn + && (olddef || h->root.type == bfd_link_hash_common) + && ELF_ST_TYPE (sym->st_info) != h->type + && ELF_ST_TYPE (sym->st_info) != STT_NOTYPE + && h->type != STT_NOTYPE) + { + *skip = TRUE; + return TRUE; + } + /* Check TLS symbol. We don't check undefined symbol introduced by "ld -u". */ if ((ELF_ST_TYPE (sym->st_info) == STT_TLS || h->type == STT_TLS) -- 2.30.2