diff options
| author | Jan Voung <jvoung@chromium.org> | 2012-10-24 16:56:06 -0700 |
|---|---|---|
| committer | Jan Voung <jvoung@chromium.org> | 2012-10-24 16:56:06 -0700 |
| commit | 89758b0545198f9a3876f0deb747146cbd84ce61 (patch) | |
| tree | ac7864b991971607bc752594b5cd567001ef1ae2 /lib | |
| parent | 8154348029461d6cc3a3488d9a37a68b4ce5a63a (diff) | |
llvm: Revert a localmod for elf TLS fixups that isn't used anymore.
llvm revision 120104 applied our localmod upstream, but rev 120121
changed the patch to handle thread locals differently
http://llvm.org/viewvc/llvm-project?view=rev&revision=120104
http://llvm.org/viewvc/llvm-project?view=rev&revision=120121
BUG= none
Review URL: https://codereview.chromium.org/11267021
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/MC/ELFObjectWriter.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/MC/ELFObjectWriter.cpp b/lib/MC/ELFObjectWriter.cpp index 20ccb5d983..02b4c3c4c1 100644 --- a/lib/MC/ELFObjectWriter.cpp +++ b/lib/MC/ELFObjectWriter.cpp @@ -668,12 +668,7 @@ const MCSymbol *ELFObjectWriter::SymbolToReloc(const MCAssembler &Asm, if (&Sec2 != &Section && (Kind == MCSymbolRefExpr::VK_PLT || Kind == MCSymbolRefExpr::VK_GOTPCREL || - Kind == MCSymbolRefExpr::VK_GOTOFF || - // @LOCALMOD-BEGIN-IS-UPSTREAM - // Fixes an LLVM bug. This bug has already been fixed upstream - // and should disappear on the next merge. - Kind == MCSymbolRefExpr::VK_NTPOFF)) { - // @LOCALMOD-END + Kind == MCSymbolRefExpr::VK_GOTOFF)) { if (Renamed) return Renamed; return &Symbol; |