2005-09-06 H.J. Lu <hongjiu.lu@intel.com>

PR ld/1301
	* elflink.c (_bfd_elf_merge_symbol): Don't check undefined
	symbol introduced by "ld -u" for TLS.
This commit is contained in:
H.J. Lu 2005-09-07 05:01:16 +00:00
parent 2016dfccf9
commit 68f49ba335
2 changed files with 10 additions and 2 deletions

View file

@ -1,3 +1,9 @@
2005-09-06 H.J. Lu <hongjiu.lu@intel.com>
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 <paul@codesourcery.com> 2005-09-02 Paul Brook <paul@codesourcery.com>
* libbdf.h: Regenerate. * libbdf.h: Regenerate.

View file

@ -902,9 +902,11 @@ _bfd_elf_merge_symbol (bfd *abfd,
else else
olddef = TRUE; 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) 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 *ntbfd, *tbfd;
bfd_boolean ntdef, tdef; bfd_boolean ntdef, tdef;