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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 55a87f6..eb9b5c9 100644 (file)
--- 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 458b474..7996f69 100644 (file)
--- 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 6043e24..a5657c0 100644 (file)
--- 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