[llvm-branch-commits] [llvm-branch] r362729 - Merging r355154:

[Tom Stellard via llvm-branch-commits]

Author: tstellar
Date: Thu Jun  6 11:24:30 2019
New Revision: 362729

URL: http://llvm.org/viewvc/llvm-project?rev=362729&view=rev
Log:
Merging r355154:

------------------------------------------------------------------------
r355154 | joerg | 2019-02-28 15:33:09 -0800 (Thu, 28 Feb 2019) | 2 lines

[PPC] Secure PLT only has meaning for PIC

------------------------------------------------------------------------

Modified:
    llvm/branches/release_80/lib/Target/PowerPC/PPCISelDAGToDAG.cpp

Modified: llvm/branches/release_80/lib/Target/PowerPC/PPCISelDAGToDAG.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_80/lib/Target/PowerPC/PPCISelDAGToDAG.cpp?rev=362729&r1=362728&r2=362729&view=diff
==============================================================================
--- llvm/branches/release_80/lib/Target/PowerPC/PPCISelDAGToDAG.cpp (original)
+++ llvm/branches/release_80/lib/Target/PowerPC/PPCISelDAGToDAG.cpp Thu Jun  6 11:24:30 2019
@@ -4359,8 +4359,8 @@ void PPCDAGToDAGISel::Select(SDNode *N)
     const Module *M = MF->getFunction().getParent();
 
     if (PPCLowering->getPointerTy(CurDAG->getDataLayout()) != MVT::i32 ||
-        !PPCSubTarget->isSecurePlt() || !PPCSubTarget->isTargetELF() ||
-        M->getPICLevel() == PICLevel::SmallPIC)
+        (!TM.isPositionIndependent() || !PPCSubTarget->isSecurePlt()) ||
+        !PPCSubTarget->isTargetELF() || M->getPICLevel() == PICLevel::SmallPIC)
       break;
 
     SDValue Op = N->getOperand(1);