summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorHal Finkel <hfinkel@anl.gov>2012-11-29 00:42:22 +0000
committerHal Finkel <hfinkel@anl.gov>2012-11-29 00:42:22 +0000
commit0bf24700008587be800865149b7e58b374de6fbf (patch)
treec1e4d78ea15020f09ba5d712b39caad7926b1b02 /lib
parent0416bc140fb88b3e5a0d5ce3a278655b1a539324 (diff)
downloadllvm-0bf24700008587be800865149b7e58b374de6fbf.tar.gz
llvm-0bf24700008587be800865149b7e58b374de6fbf.tar.bz2
llvm-0bf24700008587be800865149b7e58b374de6fbf.tar.xz
Merge in r168799 (PPC bug fix).
git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_32@168842 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r--lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.cpp b/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.cpp
index 6568e82e2b..4c2578d5dc 100644
--- a/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.cpp
+++ b/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.cpp
@@ -70,7 +70,7 @@ static MCAsmInfo *createPPCMCAsmInfo(const Target &T, StringRef TT) {
// Initial state of the frame pointer is R1.
MachineLocation Dst(MachineLocation::VirtualFP);
- MachineLocation Src(PPC::R1, 0);
+ MachineLocation Src(isPPC64? PPC::X1 : PPC::R1, 0);
MAI->addInitialFrameState(0, Dst, Src);
return MAI;