diff options
author | Arthur Eubanks <aeubanks@google.com> | 2023-06-29 21:19:07 -0700 |
---|---|---|
committer | Arthur Eubanks <aeubanks@google.com> | 2023-06-29 21:19:07 -0700 |
commit | 32ceee13035687e7c9530d1bb9a27e181a24e970 (patch) | |
tree | eb241a828b52c6ef23052172ac9b28240deb918a /llvm/lib/MC/ELFObjectWriter.cpp | |
parent | b4609b4106f3f12882434ac26d8c1c12f57d8dc7 (diff) | |
download | llvm-32ceee13035687e7c9530d1bb9a27e181a24e970.zip llvm-32ceee13035687e7c9530d1bb9a27e181a24e970.tar.gz llvm-32ceee13035687e7c9530d1bb9a27e181a24e970.tar.bz2 |
Revert "[MC,x86-32] Remove a gold<2.34 workaround"
This reverts commit a699921baa91e6c2979ec0f0482430c57f51761d.
Seems to cause miscompiles (https://crbug.com/1459232), following up with author.
Diffstat (limited to 'llvm/lib/MC/ELFObjectWriter.cpp')
-rw-r--r-- | llvm/lib/MC/ELFObjectWriter.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/llvm/lib/MC/ELFObjectWriter.cpp b/llvm/lib/MC/ELFObjectWriter.cpp index 66e2f0a..6a6befd 100644 --- a/llvm/lib/MC/ELFObjectWriter.cpp +++ b/llvm/lib/MC/ELFObjectWriter.cpp @@ -1386,6 +1386,12 @@ bool ELFObjectWriter::shouldRelocateWithSymbol(const MCAssembler &Asm, if (C != 0) return true; + // gold<2.34 incorrectly ignored the addend for R_386_GOTOFF (9) + // (http://sourceware.org/PR16794). + if (TargetObjectWriter->getEMachine() == ELF::EM_386 && + Type == ELF::R_386_GOTOFF) + return true; + // ld.lld handles R_MIPS_HI16/R_MIPS_LO16 separately, not as a whole, so // it doesn't know that an R_MIPS_HI16 with implicit addend 1 and an // R_MIPS_LO16 with implicit addend -32768 represents 32768, which is in |