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

diff --git a/bfd/elf32-cris.c b/bfd/elf32-cris.c
index 0a94c12f..e50d05c 100644
--- a/bfd/elf32-cris.c
+++ b/bfd/elf32-cris.c
@@ -876,21 +876,12 @@ cris_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 			      + sec->output_offset);
 	      else
 		{
-		  if (input_bfd->my_archive)
-		    (*_bfd_error_handler)
-		      (_("%s(%s): unresolvable relocation %s against symbol `%s' from %s section"),
-		       bfd_get_filename (bfd_my_archive (input_bfd)),
-		       bfd_get_filename (input_bfd),
-		       cris_elf_howto_table[r_type].name,
-		       symname,
-		       bfd_get_section_name (input_bfd, input_section));
-		  else
-		    (*_bfd_error_handler)
-		      (_("%s: unresolvable relocation %s against symbol `%s' from %s section"),
-		       bfd_get_filename (input_bfd),
-		       cris_elf_howto_table[r_type].name,
-		       symname,
-		       bfd_get_section_name (input_bfd, input_section));
+		  (*_bfd_error_handler)
+		    (_("%s: unresolvable relocation %s against symbol `%s' from %s section"),
+		     bfd_archive_filename (input_bfd),
+		     cris_elf_howto_table[r_type].name,
+		     symname,
+		     bfd_get_section_name (input_bfd, input_section));
 		  bfd_set_error (bfd_error_bad_value);
 		  return false;
 		}
@@ -950,7 +941,7 @@ cris_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	    {
 	      (*_bfd_error_handler)
 		(_("%s: No PLT nor GOT for relocation %s against symbol `%s' from %s section"),
-		 bfd_get_filename (input_bfd),
+		 bfd_archive_filename (input_bfd),
 		 cris_elf_howto_table[r_type].name,
 		 symname[0] != '\0' ? symname : _("[whose name is lost]"),
 		 bfd_get_section_name (input_bfd, input_section));
@@ -1069,14 +1060,14 @@ cris_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 		if (h == NULL)
 		  (*_bfd_error_handler)
 		    (_("%s: relocation %s with non-zero addend %d against local symbol from %s section"),
-		     bfd_get_filename (input_bfd),
+		     bfd_archive_filename (input_bfd),
 		     cris_elf_howto_table[r_type].name,
 		     rel->r_addend,
 		     bfd_get_section_name (input_bfd, input_section));
 		else
 		  (*_bfd_error_handler)
 		    (_("%s: relocation %s with non-zero addend %d against symbol `%s' from %s section"),
-		     bfd_get_filename (input_bfd),
+		     bfd_archive_filename (input_bfd),
 		     cris_elf_howto_table[r_type].name,
 		     rel->r_addend,
 		     symname[0] != '\0' ? symname : _("[whose name is lost]"),
@@ -1094,7 +1085,7 @@ cris_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	    {
 	      (*_bfd_error_handler)
 		(_("%s: relocation %s is not allowed for global symbol: `%s' from %s section"),
-		 bfd_get_filename (input_bfd),
+		 bfd_archive_filename (input_bfd),
 		 cris_elf_howto_table[r_type].name,
 		 symname,
 		 bfd_get_section_name (input_bfd, input_section));
@@ -1212,7 +1203,7 @@ cris_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 		    {
 		      (*_bfd_error_handler)
 			(_("%s: Internal inconsistency; no relocation section %s"),
-			 bfd_get_filename (input_bfd),
+			 bfd_archive_filename (input_bfd),
 			 name);
 
 		      bfd_set_error (bfd_error_bad_value);
@@ -2470,19 +2461,11 @@ cris_elf_check_relocs (abfd, info, sec, relocs)
 	      && (sec->flags & SEC_READONLY) != 0)
 	    {
 	      /* FIXME: How do we make this optionally a warning only?  */
-	      if (abfd->my_archive)
-		(*_bfd_error_handler)
-		  (_("%s(%s), section %s:\n  relocation %s should not be used in a shared object; recompile with -fPIC"),
-		   bfd_get_filename (bfd_my_archive (abfd)),
-		   bfd_get_filename (abfd),
-		   sec->name,
-		   cris_elf_howto_table[r_type].name);
-	      else
-		(*_bfd_error_handler)
-		  (_("%s, section %s:\n  relocation %s should not be used in a shared object; recompile with -fPIC"),
-		   bfd_get_filename (abfd),
-		   sec->name,
-		   cris_elf_howto_table[r_type].name);
+	      (*_bfd_error_handler)
+		(_("%s, section %s:\n  relocation %s should not be used in a shared object; recompile with -fPIC"),
+		 bfd_archive_filename (abfd),
+		 sec->name,
+		 cris_elf_howto_table[r_type].name);
 	    }
 	  /* Fall through.  */
 
@@ -2988,7 +2971,7 @@ cris_elf_merge_private_bfd_data (ibfd, obfd)
 	((new_flags & EF_CRIS_UNDERSCORE)
 	 ? _("%s: uses _-prefixed symbols, but writing file with non-prefixed symbols")
 	 : _("%s: uses non-prefixed symbols, but writing file with _-prefixed symbols"),
-	 bfd_get_filename (ibfd));
+	 bfd_archive_filename (ibfd));
       bfd_set_error (bfd_error_bad_value);
       return false;
     }