diff options
| author | Martin Storsjo <martin@martin.st> | 2018-03-20 20:37:51 +0000 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2018-03-20 20:37:51 +0000 |
| commit | 07589fc49658e3731501fc2c03a00f3865c4524c (patch) | |
| tree | 9257f0ba7445a8c7209d47e2edc891e75ef418d4 /llvm/lib/Target | |
| parent | 585051ae7468f883d164e66addb7f25ce5b5f6fc (diff) | |
| download | bcm5719-llvm-07589fc49658e3731501fc2c03a00f3865c4524c.tar.gz bcm5719-llvm-07589fc49658e3731501fc2c03a00f3865c4524c.zip | |
[X86] Don't use the MSVC stack protector names on mingw
Mingw uses the same stack protector functions as GCC provides
on other platforms as well.
Patch by Valentin Churavy!
Differential Revision: https://reviews.llvm.org/D27296
llvm-svn: 328039
Diffstat (limited to 'llvm/lib/Target')
| -rw-r--r-- | llvm/lib/Target/X86/X86ISelLowering.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/llvm/lib/Target/X86/X86ISelLowering.cpp b/llvm/lib/Target/X86/X86ISelLowering.cpp index a445bc8d6bc..69ca1b8bca5 100644 --- a/llvm/lib/Target/X86/X86ISelLowering.cpp +++ b/llvm/lib/Target/X86/X86ISelLowering.cpp @@ -2098,7 +2098,8 @@ Value *X86TargetLowering::getIRStackGuard(IRBuilder<> &IRB) const { void X86TargetLowering::insertSSPDeclarations(Module &M) const { // MSVC CRT provides functionalities for stack protection. - if (Subtarget.getTargetTriple().isOSMSVCRT()) { + if (Subtarget.getTargetTriple().isWindowsMSVCEnvironment() || + Subtarget.getTargetTriple().isWindowsItaniumEnvironment()) { // MSVC CRT has a global variable holding security cookie. M.getOrInsertGlobal("__security_cookie", Type::getInt8PtrTy(M.getContext())); @@ -2120,15 +2121,19 @@ void X86TargetLowering::insertSSPDeclarations(Module &M) const { Value *X86TargetLowering::getSDagStackGuard(const Module &M) const { // MSVC CRT has a global variable holding security cookie. - if (Subtarget.getTargetTriple().isOSMSVCRT()) + if (Subtarget.getTargetTriple().isWindowsMSVCEnvironment() || + Subtarget.getTargetTriple().isWindowsItaniumEnvironment()) { return M.getGlobalVariable("__security_cookie"); + } return TargetLowering::getSDagStackGuard(M); } Value *X86TargetLowering::getSSPStackGuardCheck(const Module &M) const { // MSVC CRT has a function to validate security cookie. - if (Subtarget.getTargetTriple().isOSMSVCRT()) + if (Subtarget.getTargetTriple().isWindowsMSVCEnvironment() || + Subtarget.getTargetTriple().isWindowsItaniumEnvironment()) { return M.getFunction("__security_check_cookie"); + } return TargetLowering::getSSPStackGuardCheck(M); } |

