forked from Imagelibrary/binutils-gdb
* bfd.c (bfd_archive_filename): New function.
* bfd-in2.h: Regenerate. * aout-adobe.c: Replace bfd_get_filename with bfd_archive_filename in error messages where the bfd is an input bfd. * aout-cris.c: Likewise. * coff-arm.c: Likewise. * coff-mcore.c: Likewise. * coff-ppc.c: Likewise. * coff-rs6000.c: Likewise. * coff-sh.c: Likewise. * coff-tic54x.c: Likewise. * coff-tic80.c: Likewise. * coff64-rs6000.c: Likewise. * coffcode.h: Likewise. * coffgen.c: Likewise. * cofflink.c: Likewise. * ecofflink.c: Likewise. * elf-hppa.h: Likewise. * elf.c: Likewise. * elf32-arm.h: Likewise. * elf32-cris.c: Likewise. * elf32-gen.c: Likewise. * elf32-hppa.c: Likewise. * elf32-i370.c: Likewise. * elf32-i386.c: Likewise. * elf32-m32r.c: Likewise. * elf32-mcore.c: Likewise. * elf32-mips.c: Likewise. * elf32-ppc.c: Likewise. * elf32-s390.c: Likewise. * elf32-sh.c: Likewise. * elf32-sparc.c: Likewise. * elf32-v850.c: Likewise. * elf64-alpha.c: Likewise. * elf64-gen.c: Likewise. * elf64-ppc.c: Likewise. * elf64-s390.c: Likewise. * elf64-sparc.c: Likewise. * elf64-x86-64.c: Likewise. * elflink.h: Likewise. * elfxx-ia64.c: Likewise. * ieee.c: Likewise. * ihex.c: Likewise. * libbfd.c: Likewise. * pdp11.c: Likewise. * pe-mips.c: Likewise. * peicode.h: Likewise. * srec.c: Likewise. * xcofflink.c: Likewise. * elf32-arm.h: Make _bfd_error_handler calls K&R compatible. * elflink.c (_bfd_elf_create_linker_section): Better grammar for error message. * coff-mcore.c (coff_mcore_relocate_section): Internalionalise error message. * elf64-sparc.c (sparc64_elf_add_symbol_hook): Constify stt_types. Consolidate error messages, and split long messages to two lines.
This commit is contained in:
@@ -1008,7 +1008,7 @@ m32r_elf_relocate_section (output_bfd, info, input_bfd, input_section,
|
||||
if (r_type < 0 || r_type >= (int) R_M32R_max)
|
||||
{
|
||||
(*_bfd_error_handler) (_("%s: unknown relocation type %d"),
|
||||
bfd_get_filename (input_bfd),
|
||||
bfd_archive_filename (input_bfd),
|
||||
(int) r_type);
|
||||
bfd_set_error (bfd_error_bad_value);
|
||||
ret = false;
|
||||
@@ -1215,11 +1215,12 @@ m32r_elf_relocate_section (output_bfd, info, input_bfd, input_section,
|
||||
}
|
||||
else
|
||||
{
|
||||
(*_bfd_error_handler) (_("%s: The target (%s) of an %s relocation is in the wrong section (%s)"),
|
||||
bfd_get_filename (input_bfd),
|
||||
sym_name,
|
||||
m32r_elf_howto_table[(int) r_type].name,
|
||||
bfd_get_section_name (abfd, sec));
|
||||
(*_bfd_error_handler)
|
||||
(_("%s: The target (%s) of an %s relocation is in the wrong section (%s)"),
|
||||
bfd_archive_filename (input_bfd),
|
||||
sym_name,
|
||||
m32r_elf_howto_table[(int) r_type].name,
|
||||
bfd_get_section_name (abfd, sec));
|
||||
/*bfd_set_error (bfd_error_bad_value); ??? why? */
|
||||
ret = false;
|
||||
continue;
|
||||
@@ -2016,8 +2017,9 @@ m32r_elf_merge_private_bfd_data (ibfd, obfd)
|
||||
{
|
||||
if ((in_flags & EF_M32R_ARCH) != E_M32R_ARCH)
|
||||
{
|
||||
_bfd_error_handler (_("%s: Instruction set mismatch with previous modules"),
|
||||
bfd_get_filename (ibfd));
|
||||
(*_bfd_error_handler)
|
||||
(_("%s: Instruction set mismatch with previous modules"),
|
||||
bfd_archive_filename (ibfd));
|
||||
|
||||
bfd_set_error (bfd_error_bad_value);
|
||||
return false;
|
||||
|
||||
Reference in New Issue
Block a user