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

mingw-w64.h (STANDARD_INCLUDE_DIR): Remove and use default set in mingw32.h header. 

2009-07-24  Kai Tietz  <kai.tietz@onevision.com>

        * config/i386/mingw-w64.h (STANDARD_INCLUDE_DIR): Remove and
        use default set in mingw32.h header.
        * config/i386/mingw32.h (STANDARD_INCLUDE_DIR): Use for 32-bit and
        64-bit /mingw/include path.
        (STANDARD_STARTFILE_PREFIX_1): Use for 32-bit and 64-bit /mingw/lib
        path.

From-SVN: r150040
This commit is contained in:
Kai Tietz 2009-07-24 06:24:40 +00:00 committed by Kai Tietz
parent c580edc8b0
commit 3a802a9e6d
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gcc/ChangeLog
View File

@ -1,3 +1,12 @@
2009-07-24 Kai Tietz <kai.tietz@onevision.com>
* config/i386/mingw-w64.h (STANDARD_INCLUDE_DIR): Remove and
use default set in mingw32.h header.
* config/i386/mingw32.h (STANDARD_INCLUDE_DIR): Use for 32-bit and
64-bit /mingw/include path.
(STANDARD_STARTFILE_PREFIX_1): Use for 32-bit and 64-bit /mingw/lib
path.
2009-07-23 Neil Vachharajani <nvachhar@google.com>
PR rtl-optimization/40209

4
gcc/config/i386/mingw-w64.h
View File

@ -33,10 +33,6 @@ along with GCC; see the file COPYING3. If not see
%{pg:gcrt2%O%s} \
crtbegin.o%s"
/* Use mingw/include for include. */
#undef STANDARD_INCLUDE_DIR
#define STANDARD_INCLUDE_DIR "/mingw/include"
/* Enable multilib. */
#undef ASM_SPEC

8
gcc/config/i386/mingw32.h
View File

@ -50,11 +50,7 @@ along with GCC; see the file COPYING3. If not see
/* Override the standard choice of /usr/include as the default prefix
to try when searching for header files. */
#undef STANDARD_INCLUDE_DIR
#if TARGET_64BIT_DEFAULT
#define STANDARD_INCLUDE_DIR "/mingw/include64"
#else
#define STANDARD_INCLUDE_DIR "/mingw/include"
#endif
#undef STANDARD_INCLUDE_COMPONENT
#define STANDARD_INCLUDE_COMPONENT "MINGW"
@ -113,12 +109,8 @@ along with GCC; see the file COPYING3. If not see
/* Override startfile prefix defaults. */
#ifndef STANDARD_STARTFILE_PREFIX_1
#if TARGET_64BIT_DEFAULT
#define STANDARD_STARTFILE_PREFIX_1 "/mingw/lib64/"
#else
#define STANDARD_STARTFILE_PREFIX_1 "/mingw/lib/"
#endif
#endif
#ifndef STANDARD_STARTFILE_PREFIX_2
#define STANDARD_STARTFILE_PREFIX_2 ""
#endif