From 65ff7b01a0e14727c47dbdd7ad097428ac6c5d6a Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 13 Oct 2009 02:35:08 +0000 Subject: [PATCH] Fix %s that should be %B in several message formats. --- bfd/ChangeLog | 7 ++++++- bfd/elflink.c | 12 ++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index d97d5546ed..43c7305314 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2009-10-12 Roland McGrath + + * elflink.c (elf_link_add_object_symbols, _bfd_elf_merge_symbol): + Fix %s that should be %B in several message formats. + 2009-10-10 Alan Modra * cofflink.c (_bfd_coff_link_input_bfd): Skip section symbols for @@ -135,7 +140,7 @@ 2009-09-29 M R Swami Reddy * elf32-cr16.c (elf32_cr16_relocate_section): Removed - info->relocatable to fix the ld/testsuites/ld-elf/linkonce1 test case. + info->relocatable to fix the ld/testsuites/ld-elf/linkonce1 test case. 2009-09-28 Nick Clifton diff --git a/bfd/elflink.c b/bfd/elflink.c index f8029b0c38..8297a40457 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) - (_("%s: TLS definition in %B section %A mismatches non-TLS definition in %B section %A"), + (_("%B: 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) - (_("%s: TLS reference in %B mismatches non-TLS reference in %B"), + (_("%B: TLS reference in %B mismatches non-TLS reference in %B"), tbfd, ntbfd, h->root.root.string); else if (tdef) (*_bfd_error_handler) - (_("%s: TLS definition in %B section %A mismatches non-TLS reference in %B"), + (_("%B: TLS definition in %B section %A mismatches non-TLS reference in %B"), tbfd, tsec, ntbfd, h->root.root.string); else (*_bfd_error_handler) - (_("%s: TLS reference in %B mismatches non-TLS definition in %B section %A"), + (_("%B: 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); @@ -4448,7 +4448,7 @@ error_free_dyn: if ((elf_dyn_lib_class (abfd) & DYN_NO_NEEDED) != 0) { (*_bfd_error_handler) - (_("%s: invalid DSO for symbol `%s' definition"), + (_("%B: invalid DSO for symbol `%s' definition"), abfd, name); bfd_set_error (bfd_error_bad_value); goto error_free_vers; @@ -12532,7 +12532,7 @@ _bfd_elf_get_dynamic_reloc_section (bfd * abfd, section does not exist it is created and attached to the DYNOBJ bfd and stored in the SRELOC field of SEC's elf_section_data structure. - + ALIGNMENT is the alignment for the newly created section and IS_RELA defines whether the name should be .rela. or .rel.. The section name is looked up in the -- 2.11.0