[gcc r11-7583] Re: [PATCH v2] fix Ada bootstrap on Cygwin64 (PR bootstrap/94918)

[gcc r11-7583] Re: [PATCH v2] fix Ada bootstrap on Cygwin64 (PR bootstrap/94918)

[Jeff Law]

https://gcc.gnu.org/g:9f8be03500b85bf8f8598e9ebd508654eab14528

commit r11-7583-g9f8be03500b85bf8f8598e9ebd508654eab14528
Author: Mikael Pettersson <mikpelinux@gmail.com>
Date:   Tue Mar 9 08:58:56 2021 -0700

    Re: [PATCH v2] fix Ada bootstrap on Cygwin64 (PR bootstrap/94918)
    
    gcc/ada/
            * raise-gcc.c: On Cygwin include mingw32.h to prevent
            windows.h from including x86intrin.h or emmintrin.h.

Diff:
---
 gcc/ada/raise-gcc.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gcc/ada/raise-gcc.c b/gcc/ada/raise-gcc.c
index 1446bfaaeb7..b096eba1b75 100644
--- a/gcc/ada/raise-gcc.c
+++ b/gcc/ada/raise-gcc.c
@@ -79,6 +79,12 @@ typedef char bool;
    (SJLJ or DWARF). We need a consistently named interface to import from
    a-except, so wrappers are defined here.  */
 
+#ifdef __CYGWIN__
+/* Prevent compile error due to unwind-generic.h including <windows.h>,
+   see comment above #include <windows.h> in mingw32.h.  */
+#include "mingw32.h"
+#endif
+
 #ifndef IN_RTS
   /* For gnat1/gnatbind compilation: cannot use unwind.h, as it is for the
      target. So mimic configure...