diff options
Diffstat (limited to 'llvm/lib/Target/X86')
| -rw-r--r-- | llvm/lib/Target/X86/X86Subtarget.cpp | 3 | ||||
| -rw-r--r-- | llvm/lib/Target/X86/X86Subtarget.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/llvm/lib/Target/X86/X86Subtarget.cpp b/llvm/lib/Target/X86/X86Subtarget.cpp index d02a99f081a..ad7c2578aa9 100644 --- a/llvm/lib/Target/X86/X86Subtarget.cpp +++ b/llvm/lib/Target/X86/X86Subtarget.cpp @@ -159,8 +159,7 @@ unsigned char X86Subtarget::classifyGlobalFunctionReference( // we don't need to use the PLT - we can directly call it. // In PIE mode, calls to global functions don't need to go through PLT if (isTargetELF() && TM.getRelocationModel() == Reloc::PIC_ && - (!TM.Options.PositionIndependentExecutable || - GV->isDeclarationForLinker()) && + !isGlobalDefinedInPIE(GV, TM) && GV->hasDefaultVisibility() && !GV->hasLocalLinkage()) { return X86II::MO_PLT; } else if (isPICStyleStubAny() && !GV->isStrongDefinitionForLinker() && diff --git a/llvm/lib/Target/X86/X86Subtarget.h b/llvm/lib/Target/X86/X86Subtarget.h index 170e5c383ae..6ffbde2720a 100644 --- a/llvm/lib/Target/X86/X86Subtarget.h +++ b/llvm/lib/Target/X86/X86Subtarget.h @@ -552,7 +552,7 @@ public: /// Executable (PIE) where its definition cannot be interposed. bool isGlobalDefinedInPIE(const GlobalValue *GV, const TargetMachine &TM) const { - return TM.Options.PositionIndependentExecutable && + return GV->getParent()->getPIELevel() != PIELevel::Default && !GV->isDeclarationForLinker(); } |
