diff options
| author | ktietz <ktietz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-07-24 06:24:40 +0000 |
|---|---|---|
| committer | ktietz <ktietz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-07-24 06:24:40 +0000 |
| commit | 1a4e7ef7afc0902cd426bceb4416ad9dfeeceadb (patch) | |
| tree | 9c24e9d0273f936338d73129540deddb3476b750 | |
| parent | c56a6318f08efd297bab656e2e86a37ef12ba127 (diff) | |
| download | ppe42-gcc-1a4e7ef7afc0902cd426bceb4416ad9dfeeceadb.tar.gz ppe42-gcc-1a4e7ef7afc0902cd426bceb4416ad9dfeeceadb.zip | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@150040 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/config/i386/mingw-w64.h | 4 | ||||
| -rw-r--r-- | gcc/config/i386/mingw32.h | 8 |
3 files changed, 9 insertions, 12 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 55a87f6c9b0..eb9b5c9f5f2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -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 diff --git a/gcc/config/i386/mingw-w64.h b/gcc/config/i386/mingw-w64.h index 458b4740a5d..7996f69adc0 100644 --- a/gcc/config/i386/mingw-w64.h +++ b/gcc/config/i386/mingw-w64.h @@ -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 diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h index 6043e24cede..a5657c083c0 100644 --- a/gcc/config/i386/mingw32.h +++ b/gcc/config/i386/mingw32.h @@ -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 |
