From 81e74bc0ca4844ec8d2518abac8c12695ec2e8e6 Mon Sep 17 00:00:00 2001 From: Bill Schmidt Date: Mon, 4 Aug 2014 23:47:21 +0000 Subject: [PATCH] Fix incorrectly resolved merge conflict git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_35@214822 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/PowerPC/PPCISelLowering.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Target/PowerPC/PPCISelLowering.cpp b/lib/Target/PowerPC/PPCISelLowering.cpp index 0e7fdc0c879..3814aa0d528 100644 --- a/lib/Target/PowerPC/PPCISelLowering.cpp +++ b/lib/Target/PowerPC/PPCISelLowering.cpp @@ -1005,7 +1005,7 @@ int PPC::isVSLDOIShuffleMask(SDNode *N, bool isUnary, SelectionDAG &DAG) { 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. -- 2.40.0