+2011-04-17 Ian Lance Taylor <iant@google.com>
+
+ * 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.
+
2011-04-14 Cary Coutant <ccoutant@google.com>
* gold/layout.cc (Layout::symtab_section_offset): New function.
// 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.
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);
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);
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.
// object.cc -- support for an object file for linking in 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.
// Relocate_info methods.
-// Return a string describing the location of a relocation. This is
-// only used in error messages.
+// Return a string describing the location of a relocation when file
+// and lineno information is not available. This is only used in
+// error messages.
template<int size, bool big_endian>
std::string
Relocate_info<size, big_endian>::location(size_t, off_t offset) const
{
- // See if we can get line-number information from debugging sections.
- std::string filename;
- std::string file_and_lineno; // Better than filename-only, if available.
-
Sized_dwarf_line_info<size, big_endian> line_info(this->object);
- // This will be "" if we failed to parse the debug info for any reason.
- file_and_lineno = line_info.addr2line(this->data_shndx, offset, NULL);
+ std::string ret = line_info.addr2line(this->data_shndx, offset, NULL);
+ if (!ret.empty())
+ return ret;
+
+ ret = this->object->name();
- std::string ret(this->object->name());
- ret += ':';
Symbol_location_info info;
if (this->object->get_symbol_location_info(this->data_shndx, offset, &info))
{
- ret += " in function ";
- ret += info.enclosing_symbol_name;
- ret += ":";
- filename = info.source_file;
- }
-
- if (!file_and_lineno.empty())
- ret += file_and_lineno;
- else
- {
- if (!filename.empty())
- ret += filename;
- ret += "(";
- ret += this->object->section_name(this->data_shndx);
- char buf[100];
- // Offsets into sections have to be positive.
- snprintf(buf, sizeof(buf), "+0x%lx", static_cast<long>(offset));
+ if (!info.source_file.empty())
+ {
+ ret += ":";
+ ret += info.source_file;
+ }
+ size_t len = info.enclosing_symbol_name.length() + 100;
+ char* buf = new char[len];
+ snprintf(buf, len, _(":function %s"),
+ info.enclosing_symbol_name.c_str());
ret += buf;
- ret += ")";
+ delete[] buf;
+ return ret;
}
+
+ ret += "(";
+ ret += this->object->section_name(this->data_shndx);
+ char buf[100];
+ snprintf(buf, sizeof buf, "+0x%lx)", static_cast<long>(offset));
+ ret += buf;
return ret;
}
# debug_msg.sh -- a test case for printing debug info for missing symbols.
-# Copyright 2006, 2007, 2008 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.
# 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]*): 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:debug_msg.cc:function fn_array: error: undefined reference to 'undef_fn1()'"
+check debug_msg.err "debug_msg.o:debug_msg.cc:function fn_array: error: undefined reference to 'undef_fn2()'"
+check debug_msg.err "debug_msg.o:debug_msg.cc:function badref1: error: undefined reference to 'undef_int'"
# These tests check only for the source file's file name (not the complete
# path) because use of -fdebug-prefix-map may change the path to the source
# file recorded in the objects.
-check debug_msg.err "debug_msg.o: in function Base::virtfn():.*/debug_msg.cc:50: error: undefined reference to 'undef_fn1()'"
-check debug_msg.err "debug_msg.o: in function Derived::virtfn():.*/debug_msg.cc:55: error: undefined reference to 'undef_fn2()'"
-check debug_msg.err "debug_msg.o: in function int testfn<int>(int):.*/debug_msg.cc:43: error: undefined reference to 'undef_fn1()'"
-check debug_msg.err "debug_msg.o: in function int testfn<int>(int):.*/debug_msg.cc:44: error: undefined reference to 'undef_fn2()'"
-check debug_msg.err "debug_msg.o: in function int testfn<int>(int):.*/debug_msg.cc:.*: error: undefined reference to 'undef_int'"
-check debug_msg.err "debug_msg.o: in function int testfn<double>(double):.*/debug_msg.cc:43: error: undefined reference to 'undef_fn1()'"
-check debug_msg.err "debug_msg.o: in function int testfn<double>(double):.*/debug_msg.cc:44: error: undefined reference to 'undef_fn2()'"
-check debug_msg.err "debug_msg.o: in function int testfn<double>(double):.*/debug_msg.cc:.*: error: undefined reference to 'undef_int'"
+check debug_msg.err ".*/debug_msg.cc:50: error: undefined reference to 'undef_fn1()'"
+check debug_msg.err ".*/debug_msg.cc:55: error: undefined reference to 'undef_fn2()'"
+check debug_msg.err ".*/debug_msg.cc:43: error: undefined reference to 'undef_fn1()'"
+check debug_msg.err ".*/debug_msg.cc:44: error: undefined reference to 'undef_fn2()'"
+check debug_msg.err ".*/debug_msg.cc:.*: error: undefined reference to 'undef_int'"
+check debug_msg.err ".*/debug_msg.cc:43: error: undefined reference to 'undef_fn1()'"
+check debug_msg.err ".*/debug_msg.cc:44: error: undefined reference to 'undef_fn2()'"
+check debug_msg.err ".*/debug_msg.cc:.*: 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):"
projects / binutils-gdb.git / commitdiff