aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Stellard <tstellar@redhat.com>2019-06-06 18:24:30 +0000
committerTom Stellard <tstellar@redhat.com>2019-06-06 18:24:30 +0000
commite98c4c8cc770538c2b601e98c59532d0714f0942 (patch)
tree6ef160955f3851b6bdc671a7a898cc9a35aa0611
parent897fd6e1bb9c6bb84dd0248f6ef56cadf8410197 (diff)
downloadllvm-e98c4c8cc770538c2b601e98c59532d0714f0942.zip
llvm-e98c4c8cc770538c2b601e98c59532d0714f0942.tar.gz
llvm-e98c4c8cc770538c2b601e98c59532d0714f0942.tar.bz2
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 ------------------------------------------------------------------------ llvm-svn: 362729
-rw-r--r--llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp b/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp
index 31acd0f..70e9049 100644
--- a/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp
+++ b/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp
@@ -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);