summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/cppdefault.c22
1 files changed, 5 insertions, 17 deletions
diff --git a/gcc/cppdefault.c b/gcc/cppdefault.c
index 6f43545e1..4b76d0297 100644
--- a/gcc/cppdefault.c
+++ b/gcc/cppdefault.c
@@ -58,10 +58,6 @@ const struct default_include cpp_include_defaults[]
/* Pick up GNU C++ backward and deprecated include files. */
{ GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, 0, 0 },
#endif
-#ifdef GCC_INCLUDE_DIR
- /* This is the dir for gcc's private headers. */
- { GCC_INCLUDE_DIR, "GCC", 0, 0, 0, 0 },
-#endif
#ifdef LOCAL_INCLUDE_DIR
/* /usr/local/include comes before the fixincluded header files. */
{ LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 },
@@ -70,18 +66,6 @@ const struct default_include cpp_include_defaults[]
#ifdef PREFIX_INCLUDE_DIR
{ PREFIX_INCLUDE_DIR, 0, 0, 1, 0, 0 },
#endif
-#ifdef FIXED_INCLUDE_DIR
- /* This is the dir for fixincludes. */
- { FIXED_INCLUDE_DIR, "GCC", 0, 0, 0,
- /* A multilib suffix needs adding if different multilibs use
- different headers. */
-#ifdef SYSROOT_HEADERS_SUFFIX_SPEC
- 1
-#else
- 0
-#endif
- },
-#endif
#ifdef CROSS_INCLUDE_DIR
/* One place the target system's headers might be. */
{ CROSS_INCLUDE_DIR, "GCC", 0, 0, 0, 0 },
@@ -95,10 +79,14 @@ const struct default_include cpp_include_defaults[]
{ SYSTEM_INCLUDE_DIR, 0, 0, 0, 1, 0 },
#endif
#ifdef STANDARD_INCLUDE_DIR
- /* /usr/include comes dead last. */
+ /* /usr/include comes before gcc's private headers, thank you. */
{ STANDARD_INCLUDE_DIR, STANDARD_INCLUDE_COMPONENT, 0, 0, 1, 2 },
{ STANDARD_INCLUDE_DIR, STANDARD_INCLUDE_COMPONENT, 0, 0, 1, 0 },
#endif
+#ifdef GCC_INCLUDE_DIR
+ /* This is the dir for gcc's private headers. */
+ { GCC_INCLUDE_DIR, "GCC", 0, 0, 0, 0 },
+#endif
{ 0, 0, 0, 0, 0, 0 }
};
#endif /* no INCLUDE_DEFAULTS */