Fix build under cygwin/64.

2015-01-27  Bernd Edlinger  <bernd.edlinger@hotmail.de>

        Fix build under cygwin/64.
        * adaint.h: Add check for __CYGWIN__.
        * mingw32.h: Prevent windows.h from including x86intrin.h in GCC.

From-SVN: r220180

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 6d50312902d3619db8bca38c27c311954c5dd530..f5715461b7ae0c8bb227e37cdeb14ca9c13ec2de 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-27  Bernd Edlinger  <bernd.edlinger@hotmail.de>
+
+       Fix build under cygwin/64.
+       * adaint.h: Add check for __CYGWIN__.
+       * mingw32.h: Prevent windows.h from including x86intrin.h in GCC.
+
 2015-01-19  Bernd Edlinger  <bernd.edlinger@hotmail.de>
 
        PR ada/64640

diff --git a/gcc/ada/adaint.h b/gcc/ada/adaint.h
index b0e66cc69b5b0a47f331eae2189d11d2ccd29458..c53a8bf93bd6f71e1f11df9a29bcd30fdb548990 100644 (file)
--- a/gcc/ada/adaint.h
+++ b/gcc/ada/adaint.h
@@ -36,7 +36,7 @@ extern "C" {
 #include <sys/stat.h>
 #include <stdio.h>
 
-#ifdef _WIN32
+#if defined (_WIN32) || defined (__CYGWIN__)
 #include "mingw32.h"
 #endif
 

diff --git a/gcc/ada/mingw32.h b/gcc/ada/mingw32.h
index 09343066dfcbc7f14df734f3c8541318cda7fb19..77caec2642525ed5273a3d9a1e1146dda58f2754 100644 (file)
--- a/gcc/ada/mingw32.h
+++ b/gcc/ada/mingw32.h
@@ -52,6 +52,11 @@
 #ifndef __CYGWIN__
 #include <tchar.h>
 #endif
+#if defined (__CYGWIN__) && !defined (__CYGWIN32__) && !defined (IN_RTS)
+/* 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
+#endif
 #include <windows.h>
 
 #ifndef _O_U8TEXT