mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-08-23 02:29:18 +00:00
Revert "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."
This reverts commit r193263. It is causing CodeGen/X86/mingw-alloca.ll to fail. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@193275 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
3d0b7e1cc5
commit
615f561407
@ -606,7 +606,7 @@ void X86FrameLowering::emitPrologue(MachineFunction &MF) const {
|
|||||||
// responsible for adjusting the stack pointer. Touching the stack at 4K
|
// responsible for adjusting the stack pointer. Touching the stack at 4K
|
||||||
// increments is necessary to ensure that the guard pages used by the OS
|
// increments is necessary to ensure that the guard pages used by the OS
|
||||||
// virtual memory manager are allocated in correct sequence.
|
// virtual memory manager are allocated in correct sequence.
|
||||||
if (NumBytes >= 4096 && STI.isOSWindows()) {
|
if (NumBytes >= 4096 && STI.isTargetCOFF() && !STI.isTargetEnvMacho()) {
|
||||||
const char *StackProbeSymbol;
|
const char *StackProbeSymbol;
|
||||||
bool isSPUpdateNeeded = false;
|
bool isSPUpdateNeeded = false;
|
||||||
|
|
||||||
|
@ -631,7 +631,7 @@ void X86TargetLowering::resetOperationActions() {
|
|||||||
setOperationAction(ISD::STACKSAVE, MVT::Other, Expand);
|
setOperationAction(ISD::STACKSAVE, MVT::Other, Expand);
|
||||||
setOperationAction(ISD::STACKRESTORE, MVT::Other, Expand);
|
setOperationAction(ISD::STACKRESTORE, MVT::Other, Expand);
|
||||||
|
|
||||||
if (Subtarget->isTargetWindows())
|
if (Subtarget->isTargetCOFF() && !Subtarget->isTargetEnvMacho())
|
||||||
setOperationAction(ISD::DYNAMIC_STACKALLOC, Subtarget->is64Bit() ?
|
setOperationAction(ISD::DYNAMIC_STACKALLOC, Subtarget->is64Bit() ?
|
||||||
MVT::i64 : MVT::i32, Custom);
|
MVT::i64 : MVT::i32, Custom);
|
||||||
else if (TM.Options.EnableSegmentedStacks)
|
else if (TM.Options.EnableSegmentedStacks)
|
||||||
|
@ -333,8 +333,6 @@ public:
|
|||||||
}
|
}
|
||||||
bool isTargetEnvMacho() const { return TargetTriple.isEnvironmentMachO(); }
|
bool isTargetEnvMacho() const { return TargetTriple.isEnvironmentMachO(); }
|
||||||
|
|
||||||
bool isOSWindows() const { return TargetTriple.isOSWindows(); }
|
|
||||||
|
|
||||||
bool isTargetWin64() const {
|
bool isTargetWin64() const {
|
||||||
return In64BitMode && TargetTriple.isOSWindows();
|
return In64BitMode && TargetTriple.isOSWindows();
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user