From 68f49ba3355656a7050c2e50ba1e3f359207c51c Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 7 Sep 2005 05:01:16 +0000 Subject: [PATCH] 2005-09-06 H.J. Lu PR ld/1301 * elflink.c (_bfd_elf_merge_symbol): Don't check undefined symbol introduced by "ld -u" for TLS. --- bfd/ChangeLog | 6 ++++++ bfd/elflink.c | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 43668d553e..4f4ae5a257 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2005-09-06 H.J. Lu + + PR ld/1301 + * elflink.c (_bfd_elf_merge_symbol): Don't check undefined + symbol introduced by "ld -u" for TLS. + 2005-09-02 Paul Brook * libbdf.h: Regenerate. diff --git a/bfd/elflink.c b/bfd/elflink.c index 4414f0df61..b74851698c 100644 --- a/bfd/elflink.c +++ b/bfd/elflink.c @@ -902,9 +902,11 @@ _bfd_elf_merge_symbol (bfd *abfd, else olddef = TRUE; - /* Check TLS symbol. */ + /* 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) - && ELF_ST_TYPE (sym->st_info) != h->type) + && ELF_ST_TYPE (sym->st_info) != h->type + && oldbfd != NULL) { bfd *ntbfd, *tbfd; bfd_boolean ntdef, tdef;