diff options
| -rw-r--r-- | lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp | 8 | ||||
| -rw-r--r-- | lib/Target/X86/X86ISelLowering.cpp | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp b/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp index ede0fa98e8..66e926aa22 100644 --- a/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp +++ b/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp @@ -445,21 +445,17 @@ void X86ATTAsmPrinter::printOperand(const MachineInstr *MI, unsigned OpNo, else { HiddenGVStubs.insert(Name); printSuffixedName(Name, "$non_lazy_ptr"); - assert(MO.getTargetFlags() == 0); + //assert(MO.getTargetFlags() == 0 || MO_PIC_BASE_OFFSET); } } else { GVStubs.insert(Name); printSuffixedName(Name, "$non_lazy_ptr"); - assert(MO.getTargetFlags() == 0); + //assert(MO.getTargetFlags() == 0 || MO_PIC_BASE_OFFSET); } } else { O << Name; } - if (TM.getRelocationModel() == Reloc::PIC_) { - O << '-'; - PrintPICBaseSymbol(); - } } else { O << Name; } diff --git a/lib/Target/X86/X86ISelLowering.cpp b/lib/Target/X86/X86ISelLowering.cpp index 45ab8eb66f..31b18b7e6b 100644 --- a/lib/Target/X86/X86ISelLowering.cpp +++ b/lib/Target/X86/X86ISelLowering.cpp @@ -4575,6 +4575,9 @@ X86TargetLowering::LowerGlobalAddress(const GlobalValue *GV, DebugLoc dl, OpFlags = X86II::MO_GOT; else OpFlags = X86II::MO_GOTOFF; + } else if (Subtarget->isPICStyleStub() && + getTargetMachine().getRelocationModel() == Reloc::PIC_) { + OpFlags = X86II::MO_PIC_BASE_OFFSET; } Result = DAG.getTargetGlobalAddress(GV, getPointerTy(), 0, OpFlags); |