2009-02-06 Chris Demetriou <cgd@google.com>

	* gold.h (gold_undefined_symbol): Change to take only a Symbol
	pointer and to report location as the file name associated with
	the symbol.
	(gold_undefined_symbol_at_location): New function to replace the
	old gold_undefined_symbol functionality.
	* target-reloc.h (relocate_section): Update to use
	gold_undefined_symbol_at_location.
	* symtab.cc (Symbol_table::warn_about_undefined_dynobj_symbol):
	Call gold_undefined_symbol function rather than gold_error.
	* errors.h (Errors::undefined_symbol): Take location as a
	string, rather than calculating it from a relocation.
	* errors.cc (Errors::fatal): Print "fatal error:" before the
	formatted message.
	(Errors::error, Errors::error_at_location): Print "error: "
	before the formatted message.
	(Errors::undefined_symbol): Take location as a string, rather
	than calculating it from a relocation.
	(gold_undefined_symbol_at_location): New function akin to
	old gold_undefined_symbol, calculates location from relocation.
	(gold_undefined_symbol): Change to take only a Symbol pointer
	and to report location as the file name associated with the symbol.
	* testsuite/debug_msg.sh: Update for changed error messages.
	* testsuite/undef_symbol.sh: Likewise.

8 files changed, 100 insertions, 67 deletions

diff --git a/gold/ChangeLog b/gold/ChangeLog
index b6a7d844a25..7af0d90722f 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,29 @@
+2009-02-06  Chris Demetriou  <cgd@google.com>
+
+	* gold.h (gold_undefined_symbol): Change to take only a Symbol
+	pointer and to report location as the file name associated with
+	the symbol.
+	(gold_undefined_symbol_at_location): New function to replace the
+	old gold_undefined_symbol functionality.
+	* target-reloc.h (relocate_section): Update to use
+	gold_undefined_symbol_at_location.
+	* symtab.cc (Symbol_table::warn_about_undefined_dynobj_symbol):
+	Call gold_undefined_symbol function rather than gold_error.
+	* errors.h (Errors::undefined_symbol): Take location as a
+	string, rather than calculating it from a relocation.
+	* errors.cc (Errors::fatal): Print "fatal error:" before the
+	formatted message.
+	(Errors::error, Errors::error_at_location): Print "error: "
+	before the formatted message.
+	(Errors::undefined_symbol): Take location as a string, rather
+	than calculating it from a relocation.
+	(gold_undefined_symbol_at_location): New function akin to
+	old gold_undefined_symbol, calculates location from relocation.
+	(gold_undefined_symbol): Change to take only a Symbol pointer
+	and to report location as the file name associated with the symbol.
+	* testsuite/debug_msg.sh: Update for changed error messages.
+	* testsuite/undef_symbol.sh: Likewise.
+
 2009-02-04  Duncan Sands  <baldrick@free.fr>
 
 	PR 9812
diff --git a/gold/errors.cc b/gold/errors.cc
index 01ce97f5eb9..d45d6a58b61 100644
--- a/gold/errors.cc
+++ b/gold/errors.cc
@@ -80,7 +80,7 @@ Errors::increment_counter(int *counter)
 void
 Errors::fatal(const char* format, va_list args)
 {
-  fprintf(stderr, "%s: ", this->program_name_);
+  fprintf(stderr, _("%s: fatal error: "), this->program_name_);
   vfprintf(stderr, format, args);
   fputc('\n', stderr);
   gold_exit(false);
@@ -91,7 +91,7 @@ Errors::fatal(const char* format, va_list args)
 void
 Errors::error(const char* format, va_list args)
 {
-  fprintf(stderr, "%s: ", this->program_name_);
+  fprintf(stderr, _("%s: error: "), this->program_name_);
   vfprintf(stderr, format, args);
   fputc('\n', stderr);
 
@@ -127,7 +127,7 @@ Errors::error_at_location(const Relocate_info<size, big_endian>* relinfo,
 			  size_t relnum, off_t reloffset,
 			  const char* format, va_list args)
 {
-  fprintf(stderr, "%s: %s: ", this->program_name_,
+  fprintf(stderr, _("%s: %s: error: "), this->program_name_,
 	  relinfo->location(relnum, reloffset).c_str());
   vfprintf(stderr, format, args);
   fputc('\n', stderr);
@@ -151,13 +151,10 @@ Errors::warning_at_location(const Relocate_info<size, big_endian>* relinfo,
   this->increment_counter(&this->warning_count_);
 }
 
-// Issue an undefined symbol error.
+// Issue an undefined symbol error with a caller-supplied location string.
 
-template<int size, bool big_endian>
 void
-Errors::undefined_symbol(const Symbol* sym,
-			 const Relocate_info<size, big_endian>* relinfo,
-			 size_t relnum, off_t reloffset)
+Errors::undefined_symbol(const Symbol* sym, const std::string& location)
 {
   bool initialized = this->initialize_lock();
   gold_assert(initialized);
@@ -169,12 +166,13 @@ Errors::undefined_symbol(const Symbol* sym,
   }
   const char* const version = sym->version();
   if (version == NULL)
-    fprintf(stderr, _("%s: %s: undefined reference to '%s'\n"),
-	    this->program_name_, relinfo->location(relnum, reloffset).c_str(),
+    fprintf(stderr, _("%s: %s: error: undefined reference to '%s'\n"),
+	    this->program_name_, location.c_str(),
 	    sym->demangled_name().c_str());
   else
-    fprintf(stderr, _("%s: %s: undefined reference to '%s', version '%s'\n"),
-	    this->program_name_, relinfo->location(relnum, reloffset).c_str(),
+    fprintf(stderr,
+            _("%s: %s: error: undefined reference to '%s', version '%s'\n"),
+	    this->program_name_, location.c_str(),
 	    sym->demangled_name().c_str(), version);
 }
 
@@ -271,13 +269,22 @@ gold_warning_at_location(const Relocate_info<size, big_endian>* relinfo,
 
 // Report an undefined symbol.
 
+void
+gold_undefined_symbol(const Symbol* sym)
+{
+  parameters->errors()->undefined_symbol(sym, sym->object()->name().c_str());
+}
+
+// Report an undefined symbol at a reloc location
+
 template<int size, bool big_endian>
 void
-gold_undefined_symbol(const Symbol* sym,
+gold_undefined_symbol_at_location(const Symbol* sym,
 		      const Relocate_info<size, big_endian>* relinfo,
 		      size_t relnum, off_t reloffset)
 {
-  parameters->errors()->undefined_symbol(sym, relinfo, relnum, reloffset);
+  parameters->errors()->undefined_symbol(sym,
+                                         relinfo->location(relnum, reloffset));
 }
 
 #ifdef HAVE_TARGET_32_LITTLE
@@ -347,33 +354,37 @@ gold_warning_at_location<64, true>(const Relocate_info<64, true>* relinfo,
 #ifdef HAVE_TARGET_32_LITTLE
 template
 void
-gold_undefined_symbol<32, false>(const Symbol* sym,
-				 const Relocate_info<32, false>* relinfo,
-				 size_t relnum, off_t reloffset);
+gold_undefined_symbol_at_location<32, false>(
+    const Symbol* sym,
+    const Relocate_info<32, false>* relinfo,
+    size_t relnum, off_t reloffset);
 #endif
 
 #ifdef HAVE_TARGET_32_BIG
 template
 void
-gold_undefined_symbol<32, true>(const Symbol* sym,
-				const Relocate_info<32, true>* relinfo,
-				size_t relnum, off_t reloffset);
+gold_undefined_symbol_at_location<32, true>(
+    const Symbol* sym,
+    const Relocate_info<32, true>* relinfo,
+    size_t relnum, off_t reloffset);
 #endif
 
 #ifdef HAVE_TARGET_64_LITTLE
 template
 void
-gold_undefined_symbol<64, false>(const Symbol* sym,
-				 const Relocate_info<64, false>* relinfo,
-				 size_t relnum, off_t reloffset);
+gold_undefined_symbol_at_location<64, false>(
+    const Symbol* sym,
+    const Relocate_info<64, false>* relinfo,
+    size_t relnum, off_t reloffset);
 #endif
 
 #ifdef HAVE_TARGET_64_BIG
 template
 void
-gold_undefined_symbol<64, true>(const Symbol* sym,
-				const Relocate_info<64, true>* relinfo,
-				size_t relnum, off_t reloffset);
+gold_undefined_symbol_at_location<64, true>(
+    const Symbol* sym,
+    const Relocate_info<64, true>* relinfo,
+    size_t relnum, off_t reloffset);
 #endif
 
 } // End namespace gold.
diff --git a/gold/errors.h b/gold/errors.h
index b373a06a4f7..4b71e6cf86d 100644
--- a/gold/errors.h
+++ b/gold/errors.h
@@ -75,14 +75,10 @@ class Errors
 		      size_t relnum, off_t reloffset,
 		      const char* format, va_list);
 
-  // Issue an undefined symbol error.  SYM is the undefined symbol.
-  // RELINFO is the general relocation info.  RELNUM is the number of
-  // the reloc, and RELOFFSET is the reloc's offset.
-  template<int size, bool big_endian>
+  // Issue an undefined symbol error.  LOCATION is the location of
+  // the error (typically an object file name or relocation info).
   void
-  undefined_symbol(const Symbol* sym,
-		   const Relocate_info<size, big_endian>* relinfo,
-		   size_t relnum, off_t reloffset);
+  undefined_symbol(const Symbol* sym, const std::string& location);
 
   // Report a debugging message.
   void
diff --git a/gold/gold.h b/gold/gold.h
index 964de32aff9..a0cc62deb3a 100644
--- a/gold/gold.h
+++ b/gold/gold.h
@@ -202,12 +202,22 @@ gold_warning_at_location(const Relocate_info<size, big_endian>*,
 			 size_t, off_t, const char* format, ...)
   TEMPLATE_ATTRIBUTE_PRINTF_4;
 
-// This function is called to report an undefined symbol.
+// This function is called to report an undefined symbol without
+// a relocation (e.g., referenced by a dynamic object).  SYM is
+// the undefined symbol.  The file name associated with the SYM
+// is used to print a location for the undefined symbol.
+extern void
+gold_undefined_symbol(const Symbol*);
+
+// This function is called to report an undefined symbol resulting
+// from a relocation.  SYM is the undefined symbol.  RELINFO is the
+// general relocation info.  RELNUM is the number of the reloc,
+// and RELOFFSET is the reloc's offset.
 template<int size, bool big_endian>
 extern void
-gold_undefined_symbol(const Symbol*,
-		      const Relocate_info<size, big_endian>*,
-		      size_t, off_t);
+gold_undefined_symbol_at_location(const Symbol*,
+		                  const Relocate_info<size, big_endian>*,
+		                  size_t, off_t);
 
 // This is function is called in some cases if we run out of memory.
 extern void
diff --git a/gold/symtab.cc b/gold/symtab.cc
index 11feb03072c..54083850925 100644
--- a/gold/symtab.cc
+++ b/gold/symtab.cc
@@ -2634,17 +2634,7 @@ Symbol_table::warn_about_undefined_dynobj_symbol(
       // A very ugly cast.
       Dynobj* dynobj = static_cast<Dynobj*>(sym->object());
       if (!dynobj->has_unknown_needed_entries())
-        {
-          if (sym->version())
-            gold_error(_("%s: undefined reference to '%s', version '%s'"),
-                       sym->object()->name().c_str(),
-                       sym->demangled_name().c_str(),
-                       sym->version());
-          else
-            gold_error(_("%s: undefined reference to '%s'"),
-                       sym->object()->name().c_str(),
-                       sym->demangled_name().c_str());
-        }
+        gold_undefined_symbol(sym);
     }
 }
 
diff --git a/gold/target-reloc.h b/gold/target-reloc.h
index b9ecf9fd6da..3e788e1bc9c 100644
--- a/gold/target-reloc.h
+++ b/gold/target-reloc.h
@@ -286,7 +286,7 @@ relocate_section(
           && !target->is_defined_by_abi(sym)
 	  && (!parameters->options().shared()       // -shared
               || parameters->options().defs()))     // -z defs
-	gold_undefined_symbol(sym, relinfo, i, offset);
+	gold_undefined_symbol_at_location(sym, relinfo, i, offset);
 
       if (sym != NULL && sym->has_warning())
 	relinfo->symtab->issue_warning(sym, relinfo, i, offset);
diff --git a/gold/testsuite/debug_msg.sh b/gold/testsuite/debug_msg.sh
index 23da5a214e1..7339b413c56 100755
--- a/gold/testsuite/debug_msg.sh
+++ b/gold/testsuite/debug_msg.sh
@@ -55,18 +55,18 @@ check_missing()
 
 # We don't know how the compiler might order these variables, so we
 # can't test for the actual offset from .data, hence the regexp.
-check debug_msg.err "debug_msg.o: in function fn_array:debug_msg.cc(.data+0x[0-9a-fA-F]*): undefined reference to 'undef_fn1()'"
-check debug_msg.err "debug_msg.o: in function fn_array:debug_msg.cc(.data+0x[0-9a-fA-F]*): undefined reference to 'undef_fn2()'"
-check debug_msg.err "debug_msg.o: in function badref1:debug_msg.cc(.data+0x[0-9a-fA-F]*): undefined reference to 'undef_int'"
+check debug_msg.err "debug_msg.o: in function fn_array:debug_msg.cc(.data+0x[0-9a-fA-F]*): error: undefined reference to 'undef_fn1()'"
+check debug_msg.err "debug_msg.o: in function fn_array:debug_msg.cc(.data+0x[0-9a-fA-F]*): error: undefined reference to 'undef_fn2()'"
+check debug_msg.err "debug_msg.o: in function badref1:debug_msg.cc(.data+0x[0-9a-fA-F]*): error: undefined reference to 'undef_int'"
 
-check debug_msg.err "debug_msg.o: in function Base::virtfn():${srcdir}/debug_msg.cc:50: undefined reference to 'undef_fn1()'"
-check debug_msg.err "debug_msg.o: in function Derived::virtfn():${srcdir}/debug_msg.cc:55: undefined reference to 'undef_fn2()'"
-check debug_msg.err "debug_msg.o: in function int testfn<int>(int):${srcdir}/debug_msg.cc:43: undefined reference to 'undef_fn1()'"
-check debug_msg.err "debug_msg.o: in function int testfn<int>(int):${srcdir}/debug_msg.cc:44: undefined reference to 'undef_fn2()'"
-check debug_msg.err "debug_msg.o: in function int testfn<int>(int):${srcdir}/debug_msg.cc:45: undefined reference to 'undef_int'"
-check debug_msg.err "debug_msg.o: in function int testfn<double>(double):${srcdir}/debug_msg.cc:43: undefined reference to 'undef_fn1()'"
-check debug_msg.err "debug_msg.o: in function int testfn<double>(double):${srcdir}/debug_msg.cc:44: undefined reference to 'undef_fn2()'"
-check debug_msg.err "debug_msg.o: in function int testfn<double>(double):${srcdir}/debug_msg.cc:45: undefined reference to 'undef_int'"
+check debug_msg.err "debug_msg.o: in function Base::virtfn():${srcdir}/debug_msg.cc:50: error: undefined reference to 'undef_fn1()'"
+check debug_msg.err "debug_msg.o: in function Derived::virtfn():${srcdir}/debug_msg.cc:55: error: undefined reference to 'undef_fn2()'"
+check debug_msg.err "debug_msg.o: in function int testfn<int>(int):${srcdir}/debug_msg.cc:43: error: undefined reference to 'undef_fn1()'"
+check debug_msg.err "debug_msg.o: in function int testfn<int>(int):${srcdir}/debug_msg.cc:44: error: undefined reference to 'undef_fn2()'"
+check debug_msg.err "debug_msg.o: in function int testfn<int>(int):${srcdir}/debug_msg.cc:45: error: undefined reference to 'undef_int'"
+check debug_msg.err "debug_msg.o: in function int testfn<double>(double):${srcdir}/debug_msg.cc:43: error: undefined reference to 'undef_fn1()'"
+check debug_msg.err "debug_msg.o: in function int testfn<double>(double):${srcdir}/debug_msg.cc:44: error: undefined reference to 'undef_fn2()'"
+check debug_msg.err "debug_msg.o: in function int testfn<double>(double):${srcdir}/debug_msg.cc:45: error: undefined reference to 'undef_int'"
 
 # Check we detected the ODR (One Definition Rule) violation.
 check debug_msg.err ": symbol 'Ordering::operator()(int, int)' defined in multiple places (possible ODR violation):"
@@ -75,17 +75,17 @@ check debug_msg.err "odr_violation2.cc:5"
 
 # When linking together .so's, we don't catch the line numbers, but we
 # still find all the undefined variables, and the ODR violation.
-check debug_msg_so.err "debug_msg.so: undefined reference to 'undef_fn1()'"
-check debug_msg_so.err "debug_msg.so: undefined reference to 'undef_fn2()'"
-check debug_msg_so.err "debug_msg.so: undefined reference to 'undef_int'"
+check debug_msg_so.err "debug_msg.so: error: undefined reference to 'undef_fn1()'"
+check debug_msg_so.err "debug_msg.so: error: undefined reference to 'undef_fn2()'"
+check debug_msg_so.err "debug_msg.so: error: undefined reference to 'undef_int'"
 check debug_msg_so.err ": symbol 'Ordering::operator()(int, int)' defined in multiple places (possible ODR violation):"
 check debug_msg_so.err "odr_violation1.cc:5"
 check debug_msg_so.err "odr_violation2.cc:5"
 
 # These messages shouldn't need any debug info to detect:
-check debug_msg_ndebug.err "debug_msg_ndebug.so: undefined reference to 'undef_fn1()'"
-check debug_msg_ndebug.err "debug_msg_ndebug.so: undefined reference to 'undef_fn2()'"
-check debug_msg_ndebug.err "debug_msg_ndebug.so: undefined reference to 'undef_int'"
+check debug_msg_ndebug.err "debug_msg_ndebug.so: error: undefined reference to 'undef_fn1()'"
+check debug_msg_ndebug.err "debug_msg_ndebug.so: error: undefined reference to 'undef_fn2()'"
+check debug_msg_ndebug.err "debug_msg_ndebug.so: error: undefined reference to 'undef_int'"
 # However, we shouldn't detect or declare any ODR violation
 check_missing debug_msg_ndebug.err "(possible ODR violation)"
 
diff --git a/gold/testsuite/undef_symbol.sh b/gold/testsuite/undef_symbol.sh
index 03c15768d81..b689edcec2e 100755
--- a/gold/testsuite/undef_symbol.sh
+++ b/gold/testsuite/undef_symbol.sh
@@ -40,6 +40,6 @@ check()
     fi
 }
 
-check "undef_symbol.so: undefined reference to 'a'"
+check "undef_symbol.so: error: undefined reference to 'a'"
 
 exit 0