From 9f143ce9894a053d0338f3fdfefe4cd067213422 Mon Sep 17 00:00:00 2001 From: Evan Cheng Date: Tue, 12 Feb 2008 19:20:46 +0000 Subject: [PATCH] Only using x86-64 rip relative addressing in non-staic mode? git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@47019 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/X86/X86ISelDAGToDAG.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/Target/X86/X86ISelDAGToDAG.cpp b/lib/Target/X86/X86ISelDAGToDAG.cpp index 53de9d86447..5822f946e2c 100644 --- a/lib/Target/X86/X86ISelDAGToDAG.cpp +++ b/lib/Target/X86/X86ISelDAGToDAG.cpp @@ -679,21 +679,25 @@ bool X86DAGToDAGISel::MatchAddress(SDOperand N, X86ISelAddressMode &AM, GlobalValue *GV = G->getGlobal(); AM.GV = GV; AM.Disp += G->getOffset(); - AM.isRIPRel = is64Bit; + AM.isRIPRel = TM.getRelocationModel() != Reloc::Static && + Subtarget->isPICStyleRIPRel(); return false; } else if (ConstantPoolSDNode *CP = dyn_cast(N0)) { AM.CP = CP->getConstVal(); AM.Align = CP->getAlignment(); AM.Disp += CP->getOffset(); - AM.isRIPRel = is64Bit; + AM.isRIPRel = TM.getRelocationModel() != Reloc::Static && + Subtarget->isPICStyleRIPRel(); return false; } else if (ExternalSymbolSDNode *S =dyn_cast(N0)) { AM.ES = S->getSymbol(); - AM.isRIPRel = is64Bit; + AM.isRIPRel = TM.getRelocationModel() != Reloc::Static && + Subtarget->isPICStyleRIPRel(); return false; } else if (JumpTableSDNode *J = dyn_cast(N0)) { AM.JT = J->getIndex(); - AM.isRIPRel = is64Bit; + AM.isRIPRel = TM.getRelocationModel() != Reloc::Static && + Subtarget->isPICStyleRIPRel(); return false; } } -- 2.34.1