(include_defaults): Do use GCC_INCLUDE_DIR for cross compiler.

Move TOOL_INCLUDE_DIR later if cross.

From-SVN: r3269

diff --git a/gcc/cccp.c b/gcc/cccp.c
index aa0429175f1afd7bddf3924d52936d0432772749..54fb1b8ee726e048b1ab5810e7bc4958a5aa2313 100644 (file)
--- a/gcc/cccp.c
+++ b/gcc/cccp.c
@@ -540,12 +540,21 @@ static struct default_include { char *fname; int cplusplus; } include_defaults_a
   = {
     /* Pick up GNU C++ specific include files.  */
     { GPLUSPLUS_INCLUDE_DIR, 1},
-    { TOOL_INCLUDE_DIR, 0},
 #ifdef CROSS_COMPILE
+    /* This is the dir for fixincludes.  Put it just before
+       the files that we fix.  */
+    { GCC_INCLUDE_DIR, 0},
     /* For cross-compilation, this dir name is generated
        automatically in Makefile.in.  */
     { CROSS_INCLUDE_DIR, 0 },
+    /* This is another place that the target system's headers might be.  */
+    { TOOL_INCLUDE_DIR, 0},
 #else /* not CROSS_COMPILE */
+    /* Until we are really clear on what people will use this dir for
+       in a native compiler, it's not clear where in the order it belongs.  */
+    { TOOL_INCLUDE_DIR, 0},
+    /* This should be /use/local/include and should come before
+       the fixincludes-fixed header files.  */
     { LOCAL_INCLUDE_DIR, 0},
     /* This is the dir for fixincludes.  Put it just before
        the files that we fix.  */