diff options
| author | Chris Lattner <sabre@nondot.org> | 2009-07-02 04:22:01 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2009-07-02 04:22:01 +0000 |
| commit | cd714b12fc670a4270fc72aaa50b05b85986a776 (patch) | |
| tree | 7ce55cf1a04eb8bdaf52d11dd20017911f8ed11b | |
| parent | 27598ec1e255daea1e53c286e085b6044d897947 (diff) | |
| download | external_llvm-cd714b12fc670a4270fc72aaa50b05b85986a776.zip external_llvm-cd714b12fc670a4270fc72aaa50b05b85986a776.tar.gz external_llvm-cd714b12fc670a4270fc72aaa50b05b85986a776.tar.bz2 | |
@GOTPCREL is also rip-relative. Fix fast-isel to do the right thing.
This fixes an llvm-gcc bootstrap problem I introduced.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@74691 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Target/X86/X86FastISel.cpp | 4 | ||||
| -rw-r--r-- | test/CodeGen/X86/fast-isel-gv.ll | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/Target/X86/X86FastISel.cpp b/lib/Target/X86/X86FastISel.cpp index dcb8852..b336d78 100644 --- a/lib/Target/X86/X86FastISel.cpp +++ b/lib/Target/X86/X86FastISel.cpp @@ -478,8 +478,10 @@ bool X86FastISel::X86SelectAddress(Value *V, X86AddressMode &AM, bool isCall) { Opc = X86::MOV64rm; RC = X86::GR64RegisterClass; - if (TM.getRelocationModel() != Reloc::Static) + if (TM.getRelocationModel() != Reloc::Static) { StubAM.GVOpFlags = X86II::MO_GOTPCREL; + StubAM.Base.Reg = X86::RIP; + } } unsigned ResultReg = createResultReg(RC); diff --git a/test/CodeGen/X86/fast-isel-gv.ll b/test/CodeGen/X86/fast-isel-gv.ll index 7a4b94d..b2f8850 100644 --- a/test/CodeGen/X86/fast-isel-gv.ll +++ b/test/CodeGen/X86/fast-isel-gv.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -fast-isel | grep {_kill@GOTPCREL} +; RUN: llvm-as < %s | llc -fast-isel | grep {_kill@GOTPCREL(%rip)} target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128" target triple = "x86_64-apple-darwin10.0" @f = global i8 (...)* @kill ; <i8 (...)**> [#uses=1] |