OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* elflink.c (_bfd_elf_merge_symbol): Revert previous patch.

This commit is contained in:
Alan Modra 2009-10-13 04:06:20 +00:00
parent 6811fb560a
commit fc3e1e3c7e
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bfd/ChangeLog
View File

@ -1,3 +1,7 @@
2009-10-13 Alan Modra <amodra@bigpond.net.au>
* elflink.c (_bfd_elf_merge_symbol): Revert previous patch.
2009-10-12 Roland McGrath <roland@frob.com>
* elflink.c (elf_link_add_object_symbols, _bfd_elf_merge_symbol):

8
bfd/elflink.c
View File

@ -1110,19 +1110,19 @@ _bfd_elf_merge_symbol (bfd *abfd,
if (tdef && ntdef)
(*_bfd_error_handler)
(_("%B: TLS definition in %B section %A mismatches non-TLS definition in %B section %A"),
(_("%s: TLS definition in %B section %A mismatches non-TLS definition in %B section %A"),
tbfd, tsec, ntbfd, ntsec, h->root.root.string);
else if (!tdef && !ntdef)
(*_bfd_error_handler)
(_("%B: TLS reference in %B mismatches non-TLS reference in %B"),
(_("%s: TLS reference in %B mismatches non-TLS reference in %B"),
tbfd, ntbfd, h->root.root.string);
else if (tdef)
(*_bfd_error_handler)
(_("%B: TLS definition in %B section %A mismatches non-TLS reference in %B"),
(_("%s: TLS definition in %B section %A mismatches non-TLS reference in %B"),
tbfd, tsec, ntbfd, h->root.root.string);
else
(*_bfd_error_handler)
(_("%B: TLS reference in %B mismatches non-TLS definition in %B section %A"),
(_("%s: TLS reference in %B mismatches non-TLS definition in %B section %A"),
tbfd, ntbfd, ntsec, h->root.root.string);
bfd_set_error (bfd_error_bad_value);