* 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.

1 files changed, 5 insertions, 5 deletions

diff --git a/bfd/elf.c b/bfd/elf.c
index 89828f4..f5eb576 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -334,7 +334,7 @@ bfd_elf_string_from_elf_section (abfd, shindex, strindex)
     {
       (*_bfd_error_handler)
 	(_("%s: invalid string offset %u >= %lu for section `%s'"),
-	 bfd_get_filename (abfd), strindex, (unsigned long) hdr->sh_size,
+	 bfd_archive_filename (abfd), strindex, (unsigned long) hdr->sh_size,
 	 ((shindex == elf_elfheader(abfd)->e_shstrndx
 	   && strindex == hdr->sh_name)
 	  ? ".shstrtab"
@@ -1398,7 +1398,7 @@ bfd_section_from_shdr (abfd, shindex)
 	  {
 	    ((*_bfd_error_handler)
 	     (_("%s: invalid link %lu for reloc section %s (index %u)"),
-	      bfd_get_filename (abfd), hdr->sh_link, name, shindex));
+	      bfd_archive_filename (abfd), hdr->sh_link, name, shindex));
 	    return _bfd_elf_make_section_from_shdr (abfd, hdr, name);
 	  }
 
@@ -3595,7 +3595,7 @@ _bfd_elf_symbol_from_bfd_symbol (abfd, asym_ptr_ptr)
          which is used in a relocation entry.  */
       (*_bfd_error_handler)
 	(_("%s: symbol `%s' required but not present"),
-	 bfd_get_filename (abfd), bfd_asymbol_name (asym_ptr));
+	 bfd_archive_filename (abfd), bfd_asymbol_name (asym_ptr));
       bfd_set_error (bfd_error_no_symbols);
       return -1;
     }
@@ -3845,7 +3845,7 @@ copy_private_bfd_data (ibfd, obfd)
 	  if (segment->p_type == PT_LOAD)
 	      _bfd_error_handler
 		(_("%s: warning: Empty loadable segment detected\n"),
-		 bfd_get_filename (ibfd));
+		 bfd_archive_filename (ibfd));
 
 	  map->count = 0;
 	  *pointer_to_map = map;
@@ -5227,7 +5227,7 @@ _bfd_elf_validate_reloc (abfd, areloc)
  fail:
   (*_bfd_error_handler)
     (_("%s: unsupported relocation type %s"),
-     bfd_get_filename (abfd), areloc->howto->name);
+     bfd_archive_filename (abfd), areloc->howto->name);
   bfd_set_error (bfd_error_bad_value);
   return false;
 }