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

diff --git a/bfd/xcofflink.c b/bfd/xcofflink.c
index 3a49918..af6ebb1 100644
--- a/bfd/xcofflink.c
+++ b/bfd/xcofflink.c
@@ -1239,7 +1239,7 @@ xcoff_link_add_symbols (abfd, info)
 		{
 		  (*_bfd_error_handler)
 		    (_("%s: `%s' has line numbers but no enclosing section"),
-		     bfd_get_filename (abfd), name);
+		     bfd_archive_filename (abfd), name);
 		  bfd_set_error (bfd_error_bad_value);
 		  goto error_return;
 		}
@@ -1292,7 +1292,7 @@ xcoff_link_add_symbols (abfd, info)
 	{
 	  (*_bfd_error_handler)
 	    (_("%s: class %d symbol `%s' has no aux entries"),
-	     bfd_get_filename (abfd), sym.n_sclass, name);
+	     bfd_archive_filename (abfd), sym.n_sclass, name);
 	  bfd_set_error (bfd_error_bad_value);
 	  goto error_return;
 	}
@@ -1315,7 +1315,7 @@ xcoff_link_add_symbols (abfd, info)
 	default:
 	  (*_bfd_error_handler)
 	    (_("%s: symbol `%s' has unrecognized csect type %d"),
-	     bfd_get_filename (abfd), name, smtyp);
+	     bfd_archive_filename (abfd), name, smtyp);
 	  bfd_set_error (bfd_error_bad_value);
 	  goto error_return;
 
@@ -1327,7 +1327,7 @@ xcoff_link_add_symbols (abfd, info)
 	    {
 	      (*_bfd_error_handler)
 		(_("%s: bad XTY_ER symbol `%s': class %d scnum %d scnlen %d"),
-		 bfd_get_filename (abfd), name, sym.n_sclass, sym.n_scnum,
+		 bfd_archive_filename (abfd), name, sym.n_sclass, sym.n_scnum,
 		 aux.x_csect.x_scnlen.l);
 	      bfd_set_error (bfd_error_bad_value);
 	      goto error_return;
@@ -1363,7 +1363,7 @@ xcoff_link_add_symbols (abfd, info)
 		{
 		  (*_bfd_error_handler)
 		    (_("%s: XMC_TC0 symbol `%s' is class %d scnlen %d"),
-		     bfd_get_filename (abfd), name, sym.n_sclass,
+		     bfd_archive_filename (abfd), name, sym.n_sclass,
 		     aux.x_csect.x_scnlen.l);
 		  bfd_set_error (bfd_error_bad_value);
 		  goto error_return;
@@ -1515,7 +1515,7 @@ xcoff_link_add_symbols (abfd, info)
 	      {
 		(*_bfd_error_handler)
 		  (_("%s: csect `%s' not in enclosing section"),
-		   bfd_get_filename (abfd), name);
+		   bfd_archive_filename (abfd), name);
 		bfd_set_error (bfd_error_bad_value);
 		goto error_return;
 	      }
@@ -1622,7 +1622,7 @@ xcoff_link_add_symbols (abfd, info)
 	      {
 		(*_bfd_error_handler)
 		  (_("%s: misplaced XTY_LD `%s'"),
-		   bfd_get_filename (abfd), name);
+		   bfd_archive_filename (abfd), name);
 		bfd_set_error (bfd_error_bad_value);
 		goto error_return;
 	      }
@@ -1946,7 +1946,7 @@ xcoff_link_add_symbols (abfd, info)
 		{
 		  (*_bfd_error_handler)
 		    (_("%s: reloc %s:%d not in csect"),
-		     bfd_get_filename (abfd), o->name, i);
+		     bfd_archive_filename (abfd), o->name, i);
 		  bfd_set_error (bfd_error_bad_value);
 		  goto error_return;
 		}
@@ -5259,7 +5259,7 @@ xcoff_link_input_bfd (finfo, input_bfd)
 			{
 			  (*_bfd_error_handler)
 			    (_("%s: loader reloc in unrecognized section `%s'"),
-			     bfd_get_filename (input_bfd),
+			     bfd_archive_filename (input_bfd),
 			     sec->name);
 			  bfd_set_error (bfd_error_nonrepresentable_section);
 			  return false;
@@ -5281,7 +5281,7 @@ xcoff_link_input_bfd (finfo, input_bfd)
 			{
 			  (*_bfd_error_handler)
 			    (_("%s: `%s' in loader reloc but not loader sym"),
-			     bfd_get_filename (input_bfd),
+			     bfd_archive_filename (input_bfd),
 			     h->root.root.string);
 			  bfd_set_error (bfd_error_bad_value);
 			  return false;
@@ -5296,7 +5296,7 @@ xcoff_link_input_bfd (finfo, input_bfd)
 		    {
 		      (*_bfd_error_handler)
 			(_("%s: loader reloc in read-only section %s"),
-			 bfd_get_filename (input_bfd),
+			 bfd_archive_filename (input_bfd),
 			 bfd_get_section_name (finfo->output_bfd,
 					       o->output_section));
 		      bfd_set_error (bfd_error_invalid_operation);