diff options
| author | Mikael Pettersson <mikpelinux@gmail.com> | 2021-03-09 08:58:56 -0700 |
|---|---|---|
| committer | Jeff Law <law@redhat.com> | 2021-03-09 08:59:55 -0700 |
| commit | 9f8be03500b85bf8f8598e9ebd508654eab14528 (patch) | |
| tree | 12b908b27932c8877fe8e2dd2ee1f282902c98dd /gcc | |
| parent | 4e252e23d34932f13f39cc6544bf5c9379fa2a87 (diff) | |
| download | gcc-9f8be03500b85bf8f8598e9ebd508654eab14528.zip gcc-9f8be03500b85bf8f8598e9ebd508654eab14528.tar.gz gcc-9f8be03500b85bf8f8598e9ebd508654eab14528.tar.bz2 | |
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.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/raise-gcc.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/gcc/ada/raise-gcc.c b/gcc/ada/raise-gcc.c index 1446bfa..b096eba 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... |