diff options
| author | Eric Botcazou <ebotcazou@adacore.com> | 2023-02-15 23:32:12 +0100 |
|---|---|---|
| committer | Eric Botcazou <ebotcazou@adacore.com> | 2023-02-15 23:33:28 +0100 |
| commit | a5dd99f7ef4fa5f9542851431bdd149a22b87fd2 (patch) | |
| tree | dc6d7ba52d126ffb6d0fb7d21f589e1962db6695 | |
| parent | d6d3de7170670f55825a28e84a9a89a17381a19f (diff) | |
| download | gcc-a5dd99f7ef4fa5f9542851431bdd149a22b87fd2.zip gcc-a5dd99f7ef4fa5f9542851431bdd149a22b87fd2.tar.gz gcc-a5dd99f7ef4fa5f9542851431bdd149a22b87fd2.tar.bz2 | |
Fix PR target/90458
This is the incompatibility of -fstack-clash-protection with Windows SEH.
Now the Windows ports always enable TARGET_STACK_PROBE, which means that
the stack is always probed (out of line) so -fstack-clash-protection does
nothing more.
gcc/
PR target/90458
* config/i386/i386.cc (ix86_compute_frame_layout): Disable the
effects of -fstack-clash-protection for TARGET_STACK_PROBE.
(ix86_expand_prologue): Likewise.
| -rw-r--r-- | gcc/config/i386/i386.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/gcc/config/i386/i386.cc b/gcc/config/i386/i386.cc index 3cacf73..22f444b 100644 --- a/gcc/config/i386/i386.cc +++ b/gcc/config/i386/i386.cc @@ -6876,7 +6876,9 @@ ix86_compute_frame_layout (void) stack clash protections are enabled and the allocated frame is larger than the probe interval, then use pushes to save callee saved registers. */ - || (flag_stack_clash_protection && to_allocate > get_probe_interval ())) + || (flag_stack_clash_protection + && !ix86_target_stack_probe () + && to_allocate > get_probe_interval ())) frame->save_regs_using_mov = false; if (ix86_using_red_zone () @@ -8761,8 +8763,11 @@ ix86_expand_prologue (void) sse_registers_saved = true; } - /* If stack clash protection is requested, then probe the stack. */ - if (allocate >= 0 && flag_stack_clash_protection) + /* If stack clash protection is requested, then probe the stack, unless it + is already probed on the target. */ + if (allocate >= 0 + && flag_stack_clash_protection + && !ix86_target_stack_probe ()) { ix86_adjust_stack_and_probe (allocate, int_registers_saved, false); allocate = 0; |