[llvm-branch-commits] [llvm-branch] r168842 - in /llvm/branches/release_32: ./ lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.cpp test/MC/PowerPC/ppc64-initial-cfa.ll

[Hal Finkel]

Author: hfinkel
Date: Wed Nov 28 18:42:22 2012
New Revision: 168842

URL: http://llvm.org/viewvc/llvm-project?rev=168842&view=rev
Log:
Merge in r168799 (PPC bug fix).

Added:
    llvm/branches/release_32/test/MC/PowerPC/ppc64-initial-cfa.ll
      - copied unchanged from r168799, llvm/trunk/test/MC/PowerPC/ppc64-initial-cfa.ll
Modified:
    llvm/branches/release_32/   (props changed)
    llvm/branches/release_32/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.cpp

Propchange: llvm/branches/release_32/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 28 18:42:22 2012
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,167718-167719,167731,167737,167743,167750,167784,167811,167817,167855,167860-167864,167875,167912,167942,167948,167966,168001,168035,168181,168186,168189,168196-168198,168227,168280,168291,168316,168319-168320,168346,168352,168354,168361,168364,168512,168765
+/llvm/trunk:155241,167718-167719,167731,167737,167743,167750,167784,167811,167817,167855,167860-167864,167875,167912,167942,167948,167966,168001,168035,168181,168186,168189,168196-168198,168227,168280,168291,168316,168319-168320,168346,168352,168354,168361,168364,168512,168765,168799

Modified: llvm/branches/release_32/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_32/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.cpp?rev=168842&r1=168841&r2=168842&view=diff
==============================================================================
--- llvm/branches/release_32/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.cpp (original)
+++ llvm/branches/release_32/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.cpp Wed Nov 28 18:42:22 2012
@@ -70,7 +70,7 @@
 
   // 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;