From 5dbcc7e0c9c12f4a4042fb4a226654aee927999c Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Mon, 9 Jul 2012 10:52:46 -0700 Subject: LOCALMODs from hg 0b098ca44de7 against r158408 (hg 90a87d6bfe45) (only non-new files; new files in git 4f429c8b) Change-Id: Ia39f818088485bd90e4d048db404f8d6ba5f836b --- lib/MC/ELFObjectWriter.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'lib/MC/ELFObjectWriter.cpp') diff --git a/lib/MC/ELFObjectWriter.cpp b/lib/MC/ELFObjectWriter.cpp index 7b166fb56c..6d6d23a893 100644 --- a/lib/MC/ELFObjectWriter.cpp +++ b/lib/MC/ELFObjectWriter.cpp @@ -667,7 +667,12 @@ const MCSymbol *ELFObjectWriter::SymbolToReloc(const MCAssembler &Asm, if (&Sec2 != &Section && (Kind == MCSymbolRefExpr::VK_PLT || Kind == MCSymbolRefExpr::VK_GOTPCREL || - Kind == MCSymbolRefExpr::VK_GOTOFF)) { + 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 if (Renamed) return Renamed; return &Symbol; @@ -1552,4 +1557,5 @@ MCObjectWriter *llvm::createELFObjectWriter(MCELFObjectTargetWriter *MOTW, raw_ostream &OS, bool IsLittleEndian) { return new ELFObjectWriter(MOTW, OS, IsLittleEndian); + } -- cgit v1.2.3-18-g5258