From edb6535a4f8b541820f90e517d8063d1e91b745c Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Tue, 17 Mar 2015 21:56:13 -0400
Subject: cppdefault.c: default include directories: + remove the (no-longer)
 generated fixincludes directory; + favor system headers over gcc's private
 headers.

signed-off by Z. Gilboa; see copying.midipix (9cd0746c) for additional information.
---
 gcc/cppdefault.c | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

(limited to 'gcc')

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,9 +79,13 @@ 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 }
   };
-- 
cgit v1.2.3