From 9f8be03500b85bf8f8598e9ebd508654eab14528 Mon Sep 17 00:00:00 2001 From: Mikael Pettersson Date: Tue, 9 Mar 2021 08:58:56 -0700 Subject: [PATCH] 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. --- 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 1446bfaaeb72..b096eba1b751 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 , + see comment above #include 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... -- 2.43.5