diff options
| author | Cary Coutant <ccoutant@gmail.com> | 2018-04-24 21:57:37 -0700 |
|---|---|---|
| committer | Cary Coutant <ccoutant@gmail.com> | 2018-04-24 22:13:56 -0700 |
| commit | 651d16203867f8013a0f78a2f2e24df8c02d1377 (patch) | |
| tree | 80412e416cf3ffc70a81030fb558eae8f233dda0 /gold/gc.h | |
| parent | 2ac93be706418f3b2aebeb22159a328023faed52 (diff) | |
| download | binutils-gdb-651d16203867f8013a0f78a2f2e24df8c02d1377.tar.gz | |
Fix bug with relocation addends and merge sections with --icf.
During --icf processing, gold was incorrectly processing the relocation
addend for references to items in a merge section. PC-relative references
and other forms of reference with a biased base address require a
non-section local symbol, where the addend is purely the bias.
gold/
PR gold/20642
PR gold/22820
* gc.h (gc_process_relocs): Flag STT_SECTION symbols in symvec.
* icf.cc (get_section_contents): For merge sections, ignore the
addend for relocations against non-section symbols.
Diffstat (limited to 'gold/gc.h')
| -rw-r--r-- | gold/gc.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gold/gc.h b/gold/gc.h index 7c79c23aa95..78ead4132f9 100644 --- a/gold/gc.h +++ b/gold/gc.h @@ -247,7 +247,12 @@ gc_process_relocs( (*secvec).push_back(Section_id(src_obj, dst_indx)); else (*secvec).push_back(Section_id(NULL, 0)); - (*symvec).push_back(NULL); + // If the target of the relocation is an STT_SECTION symbol, + // make a note of that by storing -1 in the symbol vector. + if (lsym.get_st_type() == elfcpp::STT_SECTION) + (*symvec).push_back(reinterpret_cast<Symbol*>(-1)); + else + (*symvec).push_back(NULL); (*addendvec).push_back(std::make_pair( static_cast<long long>(symvalue), static_cast<long long>(addend))); |