diff options
author | Daniel Jasper <djasper@google.com> | 2015-06-23 11:31:32 +0000 |
---|---|---|
committer | Daniel Jasper <djasper@google.com> | 2015-06-23 11:31:32 +0000 |
commit | 41de8027b1f744c1e52f54ca9a1b120c7fda81af (patch) | |
tree | 38c65f7deacbb6c2e627a040d4284143473442a8 /llvm/lib/MC/ELFObjectWriter.cpp | |
parent | 6d9be8e771bd058ae513a89bd7932fa4b2aaddc6 (diff) | |
download | bcm5719-llvm-41de8027b1f744c1e52f54ca9a1b120c7fda81af.tar.gz bcm5719-llvm-41de8027b1f744c1e52f54ca9a1b120c7fda81af.zip |
Revert r240302 ("Bring r240130 back.").
This causes errors like:
ld: error: blah.o: requires dynamic R_X86_64_PC32 reloc against '' which
may overflow at runtime; recompile with -fPIC
blah.cc:function f(): error: undefined reference to ''
blah.o:g(): error: undefined reference to ''
I have not yet come up with an appropriate reproduction.
llvm-svn: 240394
Diffstat (limited to 'llvm/lib/MC/ELFObjectWriter.cpp')
-rw-r--r-- | llvm/lib/MC/ELFObjectWriter.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/llvm/lib/MC/ELFObjectWriter.cpp b/llvm/lib/MC/ELFObjectWriter.cpp index 71d3f86d9e6..db9c759f2b5 100644 --- a/llvm/lib/MC/ELFObjectWriter.cpp +++ b/llvm/lib/MC/ELFObjectWriter.cpp @@ -787,15 +787,10 @@ void ELFObjectWriter::computeSymbolTable( Renames.count(&Symbol))) continue; - if (Symbol.isTemporary() && Symbol.isUndefined()) - Ctx.reportFatalError(SMLoc(), "Undefined temporary"); - ELFSymbolData MSD; MSD.Symbol = cast<MCSymbolELF>(&Symbol); bool Local = Symbol.getBinding() == ELF::STB_LOCAL; - assert(Local || !Symbol.isTemporary()); - if (Symbol.isAbsolute()) { MSD.SectionIndex = ELF::SHN_ABS; } else if (Symbol.isCommon()) { @@ -894,11 +889,9 @@ void ELFObjectWriter::computeSymbolTable( unsigned Index = FileNames.size() + 1; for (ELFSymbolData &MSD : LocalSymbolData) { - unsigned StringIndex; - if (MSD.Symbol->getType() == ELF::STT_SECTION || MSD.Name.empty()) - StringIndex = 0; - else - StringIndex = StrTabBuilder.getOffset(MSD.Name); + unsigned StringIndex = MSD.Symbol->getType() == ELF::STT_SECTION + ? 0 + : StrTabBuilder.getOffset(MSD.Name); MSD.Symbol->setIndex(Index++); writeSymbol(Writer, StringIndex, MSD, Layout); } |