[llvm-branch-commits] [llvm-branch] r214822 - Fix incorrectly resolved merge conflict

[Bill Schmidt]

Author: wschmidt
Date: Mon Aug  4 18:47:21 2014
New Revision: 214822

URL: http://llvm.org/viewvc/llvm-project?rev=214822&view=rev
Log:
Fix incorrectly resolved merge conflict

Modified:
    llvm/branches/release_35/lib/Target/PowerPC/PPCISelLowering.cpp

Modified: llvm/branches/release_35/lib/Target/PowerPC/PPCISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_35/lib/Target/PowerPC/PPCISelLowering.cpp?rev=214822&r1=214821&r2=214822&view=diff
==============================================================================
--- llvm/branches/release_35/lib/Target/PowerPC/PPCISelLowering.cpp (original)
+++ llvm/branches/release_35/lib/Target/PowerPC/PPCISelLowering.cpp Mon Aug  4 18:47:21 2014
@@ -1005,7 +1005,7 @@ int PPC::isVSLDOIShuffleMask(SDNode *N,
   unsigned ShiftAmt = SVOp->getMaskElt(i);
   if (ShiftAmt < i) return -1;
 
-  if (DAG.getTarget().getDataLayout()->isLittleEndian()) {
+  ShiftAmt -= i;
 
   if (!isUnary) {
     // Check the rest of the elements to see if they are consecutive.