OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Bernd Edlinger 2015-01-27 17:20:27 +00:00 committed by Bernd Edlinger
parent b833dedd61
commit 7e8338d861
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ada/ChangeLog
View File

@ -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

2
gcc/ada/adaint.h
View File

@ -36,7 +36,7 @@ extern "C" {
#include <sys/stat.h>
#include <stdio.h>
#ifdef _WIN32
#if defined (_WIN32) || defined (__CYGWIN__)
#include "mingw32.h"
#endif

5
gcc/ada/mingw32.h
View File

@ -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