[llvm] r207716 - Restore condition incorrectly changed in r96289 to the older state.

Joerg Sonnenberger joerg at bec.de
Wed Apr 30 15:40:28 PDT 2014


Author: joerg
Date: Wed Apr 30 17:40:27 2014
New Revision: 207716

URL: http://llvm.org/viewvc/llvm-project?rev=207716&view=rev
Log:
Restore condition incorrectly changed in r96289 to the older state.

Modified:
    llvm/trunk/lib/Target/X86/X86TargetObjectFile.cpp

Modified: llvm/trunk/lib/Target/X86/X86TargetObjectFile.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86TargetObjectFile.cpp?rev=207716&r1=207715&r2=207716&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/X86TargetObjectFile.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86TargetObjectFile.cpp Wed Apr 30 17:40:27 2014
@@ -26,7 +26,7 @@ const MCExpr *X86_64MachoTargetObjectFil
 
   // On Darwin/X86-64, we can reference dwarf symbols with foo at GOTPCREL+4, which
   // is an indirect pc-relative reference.
-  if (Encoding & (DW_EH_PE_indirect | DW_EH_PE_pcrel)) {
+  if ((Encoding & DW_EH_PE_indirect) && (Encoding & DW_EH_PE_pcrel)) {
     const MCSymbol *Sym = TM.getSymbol(GV, Mang);
     const MCExpr *Res =
       MCSymbolRefExpr::Create(Sym, MCSymbolRefExpr::VK_GOTPCREL, getContext());





More information about the llvm-commits mailing list