diff options
Diffstat (limited to 'gcc/cppdefault.c')
-rw-r--r-- | gcc/cppdefault.c | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/gcc/cppdefault.c b/gcc/cppdefault.c index 40d8d90..da4ddb5 100644 --- a/gcc/cppdefault.c +++ b/gcc/cppdefault.c @@ -35,44 +35,44 @@ const struct default_include cpp_include_defaults[] = { #ifdef GPLUSPLUS_INCLUDE_DIR /* Pick up GNU C++ generic include files. */ - { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1 }, + { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, 0 }, #endif #ifdef GPLUSPLUS_TOOL_INCLUDE_DIR /* Pick up GNU C++ target-dependent include files. */ - { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1 }, + { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, 0 }, #endif #ifdef GPLUSPLUS_BACKWARD_INCLUDE_DIR /* Pick up GNU C++ backward and deprecated include files. */ - { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1 }, + { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, 0 }, #endif #ifdef LOCAL_INCLUDE_DIR /* /usr/local/include comes before the fixincluded header files. */ - { LOCAL_INCLUDE_DIR, 0, 0, 1 }, + { LOCAL_INCLUDE_DIR, 0, 0, 1, 1 }, #endif #ifdef PREFIX_INCLUDE_DIR - { PREFIX_INCLUDE_DIR, 0, 0, 1 }, + { PREFIX_INCLUDE_DIR, 0, 0, 1, 0 }, #endif #ifdef GCC_INCLUDE_DIR /* This is the dir for fixincludes and for gcc's private headers. */ - { GCC_INCLUDE_DIR, "GCC", 0, 0 }, + { GCC_INCLUDE_DIR, "GCC", 0, 0, 0 }, #endif #ifdef CROSS_INCLUDE_DIR /* One place the target system's headers might be. */ - { CROSS_INCLUDE_DIR, "GCC", 0, 0 }, + { CROSS_INCLUDE_DIR, "GCC", 0, 0, 0 }, #endif #ifdef TOOL_INCLUDE_DIR /* Another place the target system's headers might be. */ - { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1 }, + { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0 }, #endif #ifdef SYSTEM_INCLUDE_DIR /* Some systems have an extra dir of include files. */ - { SYSTEM_INCLUDE_DIR, 0, 0, 0 }, + { SYSTEM_INCLUDE_DIR, 0, 0, 0, 1 }, #endif #ifdef STANDARD_INCLUDE_DIR /* /usr/include comes dead last. */ - { STANDARD_INCLUDE_DIR, STANDARD_INCLUDE_COMPONENT, 0, 0 }, + { STANDARD_INCLUDE_DIR, STANDARD_INCLUDE_COMPONENT, 0, 0, 1 }, #endif - { 0, 0, 0, 0 } + { 0, 0, 0, 0, 0 } }; #endif /* no INCLUDE_DEFAULTS */ @@ -83,3 +83,9 @@ const size_t cpp_GCC_INCLUDE_DIR_len = sizeof GCC_INCLUDE_DIR - 8; const char cpp_GCC_INCLUDE_DIR[] = ""; const size_t cpp_GCC_INCLUDE_DIR_len = 0; #endif + +#ifdef TARGET_SYSTEM_ROOT +const char *cpp_SYSROOT = TARGET_SYSTEM_ROOT; +#else +const char *cpp_SYSROOT = ""; +#endif |