diff options
| author | Ian Lance Taylor <ian@airs.com> | 2011-04-18 05:39:43 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@airs.com> | 2011-04-18 05:39:43 +0000 |
| commit | 308ecdc7cee575abd597cbbc4465c67376bd14e5 (patch) | |
| tree | 524a5e9574f82cc56f96bc40465ba5c919b299ba /gold/errors.cc | |
| parent | 517fc7200cf7915162319ae53d86c12111cb330a (diff) | |
| download | ppe42-binutils-308ecdc7cee575abd597cbbc4465c67376bd14e5.tar.gz ppe42-binutils-308ecdc7cee575abd597cbbc4465c67376bd14e5.zip | |
* object.cc (Relocate_info::location): Simplify location string.
* errors.cc (Errors::error_at_location): Don't print program
name.
(Errors::warning_at_location): Likewise.
(Errors::undefined_symbol): Likewise.
* testsuite/debug_msg.sh: Update accordingly.
Diffstat (limited to 'gold/errors.cc')
| -rw-r--r-- | gold/errors.cc | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/gold/errors.cc b/gold/errors.cc index b8031b1ba7..b586504882 100644 --- a/gold/errors.cc +++ b/gold/errors.cc @@ -1,6 +1,6 @@ // errors.cc -- handle errors for gold -// Copyright 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +// Copyright 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. // Written by Ian Lance Taylor <iant@google.com>. // This file is part of gold. @@ -125,7 +125,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: error: "), this->program_name_, + fprintf(stderr, _("%s: error: "), relinfo->location(relnum, reloffset).c_str()); vfprintf(stderr, format, args); fputc('\n', stderr); @@ -141,7 +141,7 @@ Errors::warning_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: warning: "), this->program_name_, + fprintf(stderr, _("%s: warning: "), relinfo->location(relnum, reloffset).c_str()); vfprintf(stderr, format, args); fputc('\n', stderr); @@ -176,14 +176,12 @@ Errors::undefined_symbol(const Symbol* sym, const std::string& location) const char* const version = sym->version(); if (version == NULL) - fprintf(stderr, _("%s: %s: %s: undefined reference to '%s'\n"), - this->program_name_, location.c_str(), zmsg, - sym->demangled_name().c_str()); + fprintf(stderr, _("%s: %s: undefined reference to '%s'\n"), + location.c_str(), zmsg, sym->demangled_name().c_str()); else fprintf(stderr, - _("%s: %s: %s: undefined reference to '%s', version '%s'\n"), - this->program_name_, location.c_str(), zmsg, - sym->demangled_name().c_str(), version); + _("%s: %s: undefined reference to '%s', version '%s'\n"), + location.c_str(), zmsg, sym->demangled_name().c_str(), version); } // Issue a debugging message. |
