From 412294daf8786fd9060059b8be7fc59a35e13922 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 18 Oct 2017 00:33:05 +1030 Subject: [PATCH] [GOLD] Fix powerpc64 optimization of TOC accesses 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. --- gold/ChangeLog | 7 +++++++ gold/powerpc.cc | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) 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 + Alan Modra + + * powerpc.cc (Target_powerpc::Scan::local): Correct dst_off + calculation for TOC16 relocs. + (Target_powerpc::Scan::global): Likewise. + 2017-09-26 Cary Coutant 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::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::Scan::global( if (shndx == sym_object->toc_shndx()) { Sized_symbol* sym = symtab->get_sized_symbol(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; -- 2.7.4