This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
[GOLD] Fix powerpc64 optimization of TOC accesses
- From: Alan Modra <amodra at gmail dot com>
- To: binutils at sourceware dot org
- Cc: Kyle Butt <iteratee at google dot com>
- Date: Wed, 18 Oct 2017 08:49:04 +1030
- Subject: [GOLD] Fix powerpc64 optimization of TOC accesses
- Authentication-results: sourceware.org; auth=none
Fixes a thinko. Given code that puts variables into the TOC (a bad
idea, but some see the TOC as a small data section) this bug could
result in an attempt to optimize a sequence that should not be
optimized.
* powerpc.cc (Target_powerpc::Scan::local): Correct dst_off
calculation for TOC16 relocs.
(Target_powerpc::Scan::global): Likewise.
diff --git a/gold/ChangeLog b/gold/ChangeLog
index 697a40a..a47ae96 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,10 @@
+2017-10-18 Kyle Butt <iteratee@google.com>
+ Alan Modra <amodra@gmail.com>
+
+ * powerpc.cc (Target_powerpc::Scan::local): Correct dst_off
+ calculation for TOC16 relocs.
+ (Target_powerpc::Scan::global): Likewise.
+
2017-09-26 Cary Coutant <ccoutant@gmail.com>
PR gold/22213
diff --git a/gold/powerpc.cc b/gold/powerpc.cc
index c529dbf..244c221 100644
--- a/gold/powerpc.cc
+++ b/gold/powerpc.cc
@@ -6917,7 +6917,7 @@ Target_powerpc<size, big_endian>::Scan::local(
shndx = ppc_object->adjust_sym_shndx(r_sym, shndx, &is_ordinary);
if (is_ordinary && shndx == ppc_object->toc_shndx())
{
- Address dst_off = lsym.get_st_value() + reloc.get_r_offset();
+ Address dst_off = lsym.get_st_value() + reloc.get_r_addend();
if (dst_off < ppc_object->section_size(shndx))
{
bool ok = false;
@@ -7591,7 +7591,7 @@ Target_powerpc<size, big_endian>::Scan::global(
if (shndx == sym_object->toc_shndx())
{
Sized_symbol<size>* sym = symtab->get_sized_symbol<size>(gsym);
- Address dst_off = sym->value() + reloc.get_r_offset();
+ Address dst_off = sym->value() + reloc.get_r_addend();
if (dst_off < sym_object->section_size(shndx))
{
bool ok = false;
--
Alan Modra
Australia Development Lab, IBM