diff options
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 4 | ||||
| -rw-r--r-- | bfd/elflink.c | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 43c7305..81e6835 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -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): diff --git a/bfd/elflink.c b/bfd/elflink.c index 8297a40..02f10ee 100644 --- a/bfd/elflink.c +++ b/bfd/elflink.c @@ -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); |