From: Mikael Pettersson <mikpelinux@gmail.com>
Date: Tue, 9 Mar 2021 15:58:56 +0000 (-0700)
Subject: Fix Ada bootstrap on Cygwin64
X-Git-Tag: releases/gcc-10.3.0~235
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22c90e997400b477207310fd18825f526f34c974;p=thirdparty%2Fgcc.git

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 --git a/gcc/ada/raise-gcc.c b/gcc/ada/raise-gcc.c
index 3b6c21fcd139..feba9855c758 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...