diff options
| author | edlinger <edlinger@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-01-27 17:20:27 +0000 |
|---|---|---|
| committer | edlinger <edlinger@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-01-27 17:20:27 +0000 |
| commit | bfa84112c3792c939cb34eb8e34112c76bd98441 (patch) | |
| tree | 65b88803aa80d9a260c652c7dcd3cd08fca8236b /gcc | |
| parent | 5c318c08717718c877c250c04770874a60673987 (diff) | |
| download | gcc-bfa84112c3792c939cb34eb8e34112c76bd98441.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@220180 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/ada/adaint.h | 2 | ||||
| -rw-r--r-- | gcc/ada/mingw32.h | 5 |
3 files changed, 12 insertions, 1 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 6d50312902d..f5715461b7a 100644 --- 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 b0e66cc69b5..c53a8bf93bd 100644 --- 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 09343066dfc..77caec26425 100644 --- 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 |