[gcc(refs/vendors/redhat/heads/gcc-8-branch)] Fix Ada bootstrap on Cygwin64

[gcc(refs/vendors/redhat/heads/gcc-8-branch)] Fix Ada bootstrap on Cygwin64

[Jakub Jelinek]

https://gcc.gnu.org/g:74c39479b914ac2069617a8b04d1747dadb1c236

commit 74c39479b914ac2069617a8b04d1747dadb1c236
Author: Eric Botcazou <ebotcazou@gcc.gnu.org>
Date:   Mon May 4 23:32:39 2020 +0200

    Fix Ada bootstrap on Cygwin64
    
    This fixes a compilation error preventing bootstrap with Ada
    on x86_64-pc-cygwin.
    
    2020-05-04  Mikael Pettersson  <mikpelinux@gmail.com>
    
            PR bootstrap/94918
            * mingw32.h: Prevent windows.h from including emmintrin.h on Cygw64.

Diff:
---
 gcc/ada/ChangeLog | 5 +++++
 gcc/ada/mingw32.h | 1 +
 2 files changed, 6 insertions(+)

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index e6adb008098..cd1612bab35 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2020-05-04  Mikael Pettersson  <mikpelinux@gmail.com>
+
+	PR bootstrap/94918
+	* mingw32.h: Prevent windows.h from including emmintrin.h on Cygwin64.
+
 2020-03-04  Release Manager
 
 	* GCC 8.4.0 released.
diff --git a/gcc/ada/mingw32.h b/gcc/ada/mingw32.h
index 7fad146a9e3..438fb31602d 100644
--- a/gcc/ada/mingw32.h
+++ b/gcc/ada/mingw32.h
@@ -56,6 +56,7 @@
 /* Note: windows.h on cygwin-64 includes x86intrin.h which uses malloc.
    That fails to compile, if malloc is poisoned, i.e. if !IN_RTS.  */
 #define _X86INTRIN_H_INCLUDED
+#define _EMMINTRIN_H_INCLUDED
 #endif
 #include <windows.h>

[gcc(refs/vendors/redhat/heads/gcc-8-branch)] Fix Ada bootstrap on Cygwin64

[Jakub Jelinek]

https://gcc.gnu.org/g:833708928b454288a02a1ef89895eb6701d40637

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

    Fix Ada bootstrap on Cygwin64
    
    gcc/ada/
            PR bootstrap/94918
            * 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 05d1a40276a..95a99903230 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...