2005-08-24 H.J. Lu <hongjiu.lu@intel.com>

	PR ld/1208
	* elf-hppa.h (elf_hppa_relocate_section): Print out the name
	of unresolvable relocation.
	* elf-m10300.c (mn10300_elf_relocate_section): Likewise.
	* elf32-arm.c (elf32_arm_relocate_section): Likewise.
	* elf32-i386.c (elf_i386_relocate_section): Likewise.
	* elf32-m32r.c (m32r_elf_relocate_section): Likewise.
	* elf32-m68k.c (elf_m68k_relocate_section): Likewise.
	* elf32-s390.c (elf_s390_relocate_section): Likewise.
	* elf32-sh.c (sh_elf_relocate_section): Likewise.
	* elf32-xtensa.c (elf_xtensa_relocate_section): Likewise.
	* elf64-s390.c (elf_s390_relocate_section): Likewise.
	* elf64-sh64.c (sh_elf64_relocate_section): Likewise.
	* elf64-x86-64.c (elf64_x86_64_relocate_section): Likewise.
	* elfxx-sparc.c (_bfd_sparc_elf_relocate_section): Likewise.

14 files changed, 68 insertions, 23 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 1fbc8929f13..f24769324d7 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,21 @@
+2005-08-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/1208
+	* elf-hppa.h (elf_hppa_relocate_section): Print out the name
+	of unresolvable relocation.
+	* elf-m10300.c (mn10300_elf_relocate_section): Likewise.
+	* elf32-arm.c (elf32_arm_relocate_section): Likewise.
+	* elf32-i386.c (elf_i386_relocate_section): Likewise.
+	* elf32-m32r.c (m32r_elf_relocate_section): Likewise.
+	* elf32-m68k.c (elf_m68k_relocate_section): Likewise.
+	* elf32-s390.c (elf_s390_relocate_section): Likewise.
+	* elf32-sh.c (sh_elf_relocate_section): Likewise.
+	* elf32-xtensa.c (elf_xtensa_relocate_section): Likewise.
+	* elf64-s390.c (elf_s390_relocate_section): Likewise.
+	* elf64-sh64.c (sh_elf64_relocate_section): Likewise.
+	* elf64-x86-64.c (elf64_x86_64_relocate_section): Likewise.
+	* elfxx-sparc.c (_bfd_sparc_elf_relocate_section): Likewise.
+
 2005-08-18  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
 
 	* config.bfd: Add bfd_elf32_shnbsd_vec and bfd_elf32_shlnbsd_vec
diff --git a/bfd/elf-hppa.h b/bfd/elf-hppa.h
index 92f13e682c4..c4ad5ad712e 100644
--- a/bfd/elf-hppa.h
+++ b/bfd/elf-hppa.h
@@ -1410,8 +1410,12 @@ elf_hppa_relocate_section (bfd *output_bfd,
 	      if (sym_sec->output_section == NULL && dyn_h == NULL)
 		{
 		  (*_bfd_error_handler)
-		    (_("%B(%A): warning: unresolvable relocation against symbol `%s'"),
-		     input_bfd, input_section, h->root.root.string);
+		    (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
+		     input_bfd,
+		     input_section,
+		     (long) rel->r_offset,
+		     howto->name,
+		     h->root.root.string);
 		  relocation = 0;
 		}
 	      else if (sym_sec->output_section)
diff --git a/bfd/elf-m10300.c b/bfd/elf-m10300.c
index 3935c85edda..86ffb78a36c 100644
--- a/bfd/elf-m10300.c
+++ b/bfd/elf-m10300.c
@@ -1457,9 +1457,12 @@ mn10300_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 
 	  else if (unresolved_reloc)
 	    (*_bfd_error_handler)
-	      (_("%s: warning: unresolvable relocation against symbol `%s' from %s section"),
-	       bfd_get_filename (input_bfd), h->root.root.root.string,
-	       bfd_get_section_name (input_bfd, input_section));
+	      (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
+	       input_bfd,
+	       input_section,
+	       (long) rel->r_offset,
+	       howto->name,
+	       h->root.root.root.string);
 	}
 
       r = mn10300_elf_final_link_relocate (howto, input_bfd, output_bfd,
diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
index 9bc7eefe4bb..a1370e22afb 100644
--- a/bfd/elf32-arm.c
+++ b/bfd/elf32-arm.c
@@ -4175,9 +4175,12 @@ elf32_arm_relocate_section (bfd *                  output_bfd,
                && h->def_dynamic))
 	{
 	  (*_bfd_error_handler)
-	    (_("%B(%A+0x%lx): warning: unresolvable relocation %d against symbol `%s'"),
-	     input_bfd, input_section, (long) rel->r_offset,
-	     r_type, h->root.root.string);
+	    (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
+	     input_bfd,
+	     input_section,
+	     (long) rel->r_offset,
+	     howto->name,
+	     h->root.root.string);
 	  return FALSE;
 	}
 
diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
index a2f1b1c6603..78c4fa34672 100644
--- a/bfd/elf32-i386.c
+++ b/bfd/elf32-i386.c
@@ -3037,10 +3037,11 @@ elf_i386_relocate_section (bfd *output_bfd,
 	       && h->def_dynamic))
 	{
 	  (*_bfd_error_handler)
-	    (_("%B(%A+0x%lx): unresolvable relocation against symbol `%s'"),
+	    (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
 	     input_bfd,
 	     input_section,
 	     (long) rel->r_offset,
+	     howto->name,
 	     h->root.root.string);
 	  return FALSE;
 	}
diff --git a/bfd/elf32-m32r.c b/bfd/elf32-m32r.c
index d2f850891e3..cb6716f3a4d 100644
--- a/bfd/elf32-m32r.c
+++ b/bfd/elf32-m32r.c
@@ -2653,9 +2653,12 @@ m32r_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
 		  else if (sec->output_section == NULL)
                     {
                       (*_bfd_error_handler)
-                        (_("%s: warning: unresolvable relocation against symbol `%s' from %s section"),
-                         bfd_get_filename (input_bfd), h->root.root.string,
-                         bfd_get_section_name (input_bfd, input_section));
+                        (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
+			 input_bfd,
+			 input_section,
+			 (long) rel->r_offset,
+			 howto->name,
+			 h->root.root.string);
 
 		       relocation = 0;
                     }
diff --git a/bfd/elf32-m68k.c b/bfd/elf32-m68k.c
index 71f98bb6716..146a86d3120 100644
--- a/bfd/elf32-m68k.c
+++ b/bfd/elf32-m68k.c
@@ -1732,10 +1732,11 @@ elf_m68k_relocate_section (output_bfd, info, input_bfd, input_section,
 	       && h->def_dynamic))
 	{
 	  (*_bfd_error_handler)
-	    (_("%B(%A+0x%lx): unresolvable relocation against symbol `%s'"),
+	    (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
 	     input_bfd,
 	     input_section,
 	     (long) rel->r_offset,
+	     howto->name,
 	     h->root.root.string);
 	  return FALSE;
 	}
diff --git a/bfd/elf32-s390.c b/bfd/elf32-s390.c
index 9001a51cde8..a2433636ffc 100644
--- a/bfd/elf32-s390.c
+++ b/bfd/elf32-s390.c
@@ -3014,10 +3014,11 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 	  && !((input_section->flags & SEC_DEBUGGING) != 0
 	       && h->def_dynamic))
 	(*_bfd_error_handler)
-	  (_("%B(%A+0x%lx): unresolvable relocation against symbol `%s'"),
+	  (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
 	   input_bfd,
 	   input_section,
 	   (long) rel->r_offset,
+	   howto->name,
 	   h->root.root.string);
 
       if (r_type == R_390_20
diff --git a/bfd/elf32-sh.c b/bfd/elf32-sh.c
index 364ef237dd1..7bee661b154 100644
--- a/bfd/elf32-sh.c
+++ b/bfd/elf32-sh.c
@@ -4714,8 +4714,12 @@ sh_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
 	      else if (sec->output_section == NULL)
 		{
 		  (*_bfd_error_handler)
-		    (_("%B(%A): unresolvable relocation against symbol `%s'"),
-		     input_bfd, input_section, h->root.root.string);
+		    (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
+		     input_bfd,
+		     input_section,
+		     (long) rel->r_offset,
+		     howto->name,
+		     h->root.root.string);
 		  return FALSE;
 		}
 	      else
diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
index 507557da61d..fc235deeb53 100644
--- a/bfd/elf32-xtensa.c
+++ b/bfd/elf32-xtensa.c
@@ -2308,10 +2308,11 @@ elf_xtensa_relocate_section (bfd *output_bfd,
 	  && !((input_section->flags & SEC_DEBUGGING) != 0
 	       && h->def_dynamic))
 	(*_bfd_error_handler)
-	  (_("%B(%A+0x%lx): unresolvable relocation against symbol `%s'"),
+	  (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
 	   input_bfd,
 	   input_section,
 	   (long) rel->r_offset,
+	   howto->name,
 	   h->root.root.string);
 
       /* There's no point in calling bfd_perform_relocation here.
diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c
index 38ce556446a..1c5a5f73e9e 100644
--- a/bfd/elf64-s390.c
+++ b/bfd/elf64-s390.c
@@ -3011,10 +3011,11 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 	  && !((input_section->flags & SEC_DEBUGGING) != 0
 	       && h->def_dynamic))
 	(*_bfd_error_handler)
-	  (_("%B(%A+0x%lx): unresolvable relocation against symbol `%s'"),
+	  (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
 	   input_bfd,
 	   input_section,
 	   (long) rel->r_offset,
+	   howto->name,
 	   h->root.root.string);
 
       if (r_type == R_390_20
diff --git a/bfd/elf64-sh64.c b/bfd/elf64-sh64.c
index 337b1809c8b..df157237148 100644
--- a/bfd/elf64-sh64.c
+++ b/bfd/elf64-sh64.c
@@ -1623,9 +1623,12 @@ sh_elf64_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
 	      else if (sec->output_section == NULL)
 		{
 		  (*_bfd_error_handler)
-		    (_("%s: warning: unresolvable relocation against symbol `%s' from %s section"),
-		     bfd_get_filename (input_bfd), h->root.root.string,
-		     bfd_get_section_name (input_bfd, input_section));
+		    (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
+		     input_bfd,
+		     input_section,
+		     (long) rel->r_offset,
+		     howto->name,
+		     h->root.root.string);
 		  relocation = 0;
 		}
 	      else
diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
index 8511a1643c2..4c7a49e3a75 100644
--- a/bfd/elf64-x86-64.c
+++ b/bfd/elf64-x86-64.c
@@ -2519,10 +2519,11 @@ elf64_x86_64_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
 	  && !((input_section->flags & SEC_DEBUGGING) != 0
 	       && h->def_dynamic))
 	(*_bfd_error_handler)
-	  (_("%B(%A+0x%lx): unresolvable relocation against symbol `%s'"),
+	  (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
 	   input_bfd,
 	   input_section,
 	   (long) rel->r_offset,
+	   howto->name,
 	   h->root.root.string);
 
       r = _bfd_final_link_relocate (howto, input_bfd, input_section,
diff --git a/bfd/elfxx-sparc.c b/bfd/elfxx-sparc.c
index b83cd140d8f..264f2627af9 100644
--- a/bfd/elfxx-sparc.c
+++ b/bfd/elfxx-sparc.c
@@ -3138,10 +3138,11 @@ _bfd_sparc_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
 	  && !((input_section->flags & SEC_DEBUGGING) != 0
 	       && h->def_dynamic))
 	(*_bfd_error_handler)
-	  (_("%B(%A+0x%lx): unresolvable relocation against symbol `%s'"),
+	  (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
 	   input_bfd,
 	   input_section,
 	   (long) rel->r_offset,
+	   howto->name,
 	   h->root.root.string);
 
       r = bfd_reloc_continue;