aboutsummaryrefslogtreecommitdiffstats
path: root/lib/Target/X86/X86ISelLowering.cpp
diff options
context:
space:
mode:
authorYaron Keren <yaron.keren@gmail.com>2013-10-23 23:37:01 +0000
committerYaron Keren <yaron.keren@gmail.com>2013-10-23 23:37:01 +0000
commitfaf1415c4fa88b6233bca488b8ac3bb8e6a73c72 (patch)
tree36688c4d8336ded3df6f71d0d1a2a0328b1d5fd1 /lib/Target/X86/X86ISelLowering.cpp
parentbe87b69a5f2f0b66939cef4d107a2cb8e4f4f4dc (diff)
downloadexternal_llvm-faf1415c4fa88b6233bca488b8ac3bb8e6a73c72.zip
external_llvm-faf1415c4fa88b6233bca488b8ac3bb8e6a73c72.tar.gz
external_llvm-faf1415c4fa88b6233bca488b8ac3bb8e6a73c72.tar.bz2
(this is a corrected patch)
Calling _chkstk is required on ELF as well as COFF on Windows. Without _chkstk, functions requiring large stack crash in initialization code. Previous code tested for COFF format but not Mach-O and this patch modifies the code to test for Windows OS (both Windows target and MingW target) but not Mach-O object format: Looks like macho environment was used to build some EFI code. Credits to Andrew MacPherson. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@193289 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/X86/X86ISelLowering.cpp')
-rw-r--r--lib/Target/X86/X86ISelLowering.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Target/X86/X86ISelLowering.cpp b/lib/Target/X86/X86ISelLowering.cpp
index cc409fb..31ff797 100644
--- a/lib/Target/X86/X86ISelLowering.cpp
+++ b/lib/Target/X86/X86ISelLowering.cpp
@@ -631,7 +631,7 @@ void X86TargetLowering::resetOperationActions() {
setOperationAction(ISD::STACKSAVE, MVT::Other, Expand);
setOperationAction(ISD::STACKRESTORE, MVT::Other, Expand);
- if (Subtarget->isTargetCOFF() && !Subtarget->isTargetEnvMacho())
+ if (Subtarget->isOSWindows() && !Subtarget->isTargetEnvMacho())
setOperationAction(ISD::DYNAMIC_STACKALLOC, Subtarget->is64Bit() ?
MVT::i64 : MVT::i32, Custom);
else if (TM.Options.EnableSegmentedStacks)