aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCary Coutant <ccoutant@gmail.com>2016-02-07 10:17:01 -0800
committerCary Coutant <ccoutant@gmail.com>2016-02-07 10:17:01 -0800
commit17ecd016113c77c7fead1725d2d315fe7b42aced (patch)
tree8dba3cbc4b27623d56124db86f568aab958526d0
parent7c8b700c92444fca9ee81ab3844baadac0bdd4e3 (diff)
downloadgdb-17ecd016113c77c7fead1725d2d315fe7b42aced.zip
gdb-17ecd016113c77c7fead1725d2d315fe7b42aced.tar.gz
gdb-17ecd016113c77c7fead1725d2d315fe7b42aced.tar.bz2
Add additional information to relocation overflow errors.
gold/ PR gold/18695 * x86_64.cc (Target_x86_64::Relocate::relocate): Add additional information to relocation overflow errors.
-rw-r--r--gold/ChangeLog7
-rw-r--r--gold/x86_64.cc26
2 files changed, 31 insertions, 2 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog
index d824511..b796a24 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,5 +1,12 @@
+2016-02-07 Cary Coutant <ccoutant@gmail.com>
+
+ PR gold/18695
+ * x86_64.cc (Target_x86_64::Relocate::relocate): Add additional
+ information to relocation overflow errors.
+
2016-02-06 Cary Coutant <ccoutant@gmail.com>
+ PR gold/18695
* x86_64.cc (X86_64_relocate_functions::pcrela32_check): Fix x32
overflow checking when symbol value + addend < 0.
diff --git a/gold/x86_64.cc b/gold/x86_64.cc
index b0780af..81126ef 100644
--- a/gold/x86_64.cc
+++ b/gold/x86_64.cc
@@ -3701,8 +3701,30 @@ Target_x86_64<size>::Relocate::relocate(
}
if (rstatus == Reloc_funcs::RELOC_OVERFLOW)
- gold_error_at_location(relinfo, relnum, rela.get_r_offset(),
- _("relocation overflow"));
+ {
+ if (gsym == NULL)
+ {
+ unsigned int r_sym = elfcpp::elf_r_sym<size>(rela.get_r_info());
+ gold_error_at_location(relinfo, relnum, rela.get_r_offset(),
+ _("relocation overflow: "
+ "reference to local symbol %u in %s"),
+ r_sym, object->name().c_str());
+ }
+ else if (gsym->is_defined() && gsym->source() == Symbol::FROM_OBJECT)
+ {
+ gold_error_at_location(relinfo, relnum, rela.get_r_offset(),
+ _("relocation overflow: "
+ "reference to '%s' defined in %s"),
+ gsym->name(),
+ gsym->object()->name().c_str());
+ }
+ else
+ {
+ gold_error_at_location(relinfo, relnum, rela.get_r_offset(),
+ _("relocation overflow: reference to '%s'"),
+ gsym->name());
+ }
+ }
return true;
}