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

diff --git a/bfd/peicode.h b/bfd/peicode.h
index 0430059..323b30d 100644
--- a/bfd/peicode.h
+++ b/bfd/peicode.h
@@ -783,12 +783,12 @@ pe_ILF_build_a_bfd (bfd *           abfd,
     case IMPORT_CONST:
       /* XXX code yet to be written.  */
       _bfd_error_handler (_("%s: Unhandled import type; %x"),
-			  bfd_get_filename (abfd), import_type);
+			  bfd_archive_filename (abfd), import_type);
       return false;
 
     default:
       _bfd_error_handler (_("%s: Unrecognised import type; %x"),
-			  bfd_get_filename (abfd), import_type);
+			  bfd_archive_filename (abfd), import_type);
       return false;
     }
 
@@ -802,7 +802,7 @@ pe_ILF_build_a_bfd (bfd *           abfd,
 
     default:
       _bfd_error_handler (_("%s: Unrecognised import name type; %x"),
-			  bfd_get_filename (abfd), import_name_type);
+			  bfd_archive_filename (abfd), import_name_type);
       return false;
     }
 
@@ -1160,7 +1160,7 @@ pe_ILF_object_p (bfd * abfd)
       _bfd_error_handler
 	(
 _("%s: Unrecognised machine type (0x%x) in Import Library Format archive"),
-         bfd_get_filename (abfd), machine);
+         bfd_archive_filename (abfd), machine);
       bfd_set_error (bfd_error_malformed_archive);
 
       return NULL;
@@ -1172,7 +1172,7 @@ _("%s: Unrecognised machine type (0x%x) in Import Library Format archive"),
       _bfd_error_handler
 	(
 _("%s: Recognised but unhandled machine type (0x%x) in Import Library Format archive"),
-	 bfd_get_filename (abfd), machine);
+	 bfd_archive_filename (abfd), machine);
       bfd_set_error (bfd_error_wrong_format);
 
       return NULL;
@@ -1189,7 +1189,7 @@ _("%s: Recognised but unhandled machine type (0x%x) in Import Library Format arc
     {
       _bfd_error_handler
 	(_("%s: size field is zero in Import Library Format header"),
-	 bfd_get_filename (abfd));
+	 bfd_archive_filename (abfd));
       bfd_set_error (bfd_error_malformed_archive);
 
       return NULL;
@@ -1217,7 +1217,7 @@ _("%s: Recognised but unhandled machine type (0x%x) in Import Library Format arc
     {
       _bfd_error_handler
 	(_("%s: string not null terminated in ILF object file."),
-	 bfd_get_filename (abfd));
+	 bfd_archive_filename (abfd));
       bfd_set_error (bfd_error_malformed_archive);
 
       return NULL;