From 859ed2a79ee502dcc986be3e18f66462a6577cb0 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Thu, 27 Oct 2011 17:55:53 +0000 Subject: [PATCH] cppdefault.c: Undef NATIVE_SYSTEM_HEADER_DIR if CROSS_DIRECTORY_STRUCTURE is defined and... * cppdefault.c: Undef NATIVE_SYSTEM_HEADER_DIR if CROSS_DIRECTORY_STRUCTURE is defined and TARGET_SYSTEM_ROOT is not. (cpp_include_defaults): Only use NATIVE_SYSTEM_HEADER_DIR if it is defined. From-SVN: r180569 --- gcc/ChangeLog | 8 ++++++++ gcc/cppdefault.c | 3 +++ 2 files changed, 11 insertions(+) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b0b77bc10a64..1672de956488 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2011-10-27 Ian Lance Taylor + + * cppdefault.c: Undef NATIVE_SYSTEM_HEADER_DIR if + CROSS_DIRECTORY_STRUCTURE is defined and TARGET_SYSTEM_ROOT is + not. + (cpp_include_defaults): Only use NATIVE_SYSTEM_HEADER_DIR if it is + defined. + 2011-10-27 Richard Henderson * optabs.c (expand_vec_perm): Use the correct mode for scaling the diff --git a/gcc/cppdefault.c b/gcc/cppdefault.c index fabf314a0248..099899a77260 100644 --- a/gcc/cppdefault.c +++ b/gcc/cppdefault.c @@ -32,6 +32,7 @@ #if defined (CROSS_DIRECTORY_STRUCTURE) && !defined (TARGET_SYSTEM_ROOT) # undef LOCAL_INCLUDE_DIR +# undef NATIVE_SYSTEM_HEADER_DIR #else # undef CROSS_INCLUDE_DIR #endif @@ -84,8 +85,10 @@ const struct default_include cpp_include_defaults[] /* Another place the target system's headers might be. */ { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0 }, #endif +#ifdef NATIVE_SYSTEM_HEADER_DIR /* /usr/include comes dead last. */ { NATIVE_SYSTEM_HEADER_DIR, NATIVE_SYSTEM_HEADER_COMPONENT, 0, 0, 1, 0 }, +#endif { 0, 0, 0, 0, 0, 0 } }; #endif /* no INCLUDE_DEFAULTS */ -- 2.47.2