* 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, 6 insertions, 6 deletions

diff --git a/bfd/elf64-alpha.c b/bfd/elf64-alpha.c
index 00d8184..4642bac 100644
--- a/bfd/elf64-alpha.c
+++ b/bfd/elf64-alpha.c
@@ -1010,8 +1010,8 @@ elf64_alpha_relax_with_lituse (info, symval, irel, irelend)
     {
       ((*_bfd_error_handler)
        ("%s: %s+0x%lx: warning: LITERAL relocation against unexpected insn",
-	bfd_get_filename (info->abfd), info->sec->name,
-	(unsigned long)irel->r_offset));
+	bfd_archive_filename (info->abfd), info->sec->name,
+	(unsigned long) irel->r_offset));
       return irel;
     }
 
@@ -1307,7 +1307,7 @@ elf64_alpha_relax_without_lituse (info, symval, irel)
     {
       ((*_bfd_error_handler)
        ("%s: %s+0x%lx: warning: LITERAL relocation against unexpected insn",
-	bfd_get_filename (info->abfd), info->sec->name,
+	bfd_archive_filename (info->abfd), info->sec->name,
 	(unsigned long) irel->r_offset));
       return true;
     }
@@ -2907,7 +2907,7 @@ elf64_alpha_size_got_sections (output_bfd, info)
 	      /* Yikes! A single object file has too many entries.  */
 	      (*_bfd_error_handler)
 	        (_("%s: .got subsegment exceeds 64K (size %d)"),
-	         bfd_get_filename (i),
+	         bfd_archive_filename (i),
 	         alpha_elf_tdata (this_got)->total_got_entries * 8);
 	      return false;
 	    }
@@ -3461,7 +3461,7 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
             {
               (*_bfd_error_handler)
                 (_("%s: gp-relative relocation against dynamic symbol %s"),
-                 bfd_get_filename (input_bfd), h->root.root.root.string);
+                 bfd_archive_filename (input_bfd), h->root.root.root.string);
               ret_val = false;
             }
 	  BFD_ASSERT(gp != 0);
@@ -3473,7 +3473,7 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
             {
               (*_bfd_error_handler)
                 (_("%s: gp-relative relocation against dynamic symbol %s"),
-                 bfd_get_filename (input_bfd), h->root.root.root.string);
+                 bfd_archive_filename (input_bfd), h->root.root.root.string);
               ret_val = false;
             }
 	  BFD_ASSERT(gp != 0);