From 93f77fed97d65fcf56b98ba52eee3390f395daac Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Thu, 20 Sep 2001 23:30:37 +0000 Subject: * 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. --- bfd/elf32-gen.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'bfd/elf32-gen.c') diff --git a/bfd/elf32-gen.c b/bfd/elf32-gen.c index 7832d110ef..58b5fc6273 100644 --- a/bfd/elf32-gen.c +++ b/bfd/elf32-gen.c @@ -79,15 +79,9 @@ elf32_generic_link_add_symbols (abfd, info) Elf_Internal_Ehdr *ehdrp; ehdrp = elf_elfheader (abfd); - if (abfd->my_archive) - (*_bfd_error_handler) (_("%s(%s): Relocations in generic ELF (EM: %d)"), - bfd_get_filename (abfd->my_archive), - bfd_get_filename (abfd), - ehdrp->e_machine); - else - (*_bfd_error_handler) (_("%s: Relocations in generic ELF (EM: %d)"), - bfd_get_filename (abfd), - ehdrp->e_machine); + (*_bfd_error_handler) (_("%s: Relocations in generic ELF (EM: %d)"), + bfd_archive_filename (abfd), + ehdrp->e_machine); bfd_set_error (bfd_error_wrong_format); return false; -- cgit v1.2.1