1From 93ad7cf3ff92771451c2994cab45e34a0c8574a0 Mon Sep 17 00:00:00 2001 2From: Khem Raj <raj.khem@gmail.com> 3Date: Fri, 20 Feb 2015 10:25:11 +0000 4Subject: [PATCH] Ensure target gcc headers can be included 5 6There are a few headers installed as part of the OpenEmbedded 7gcc-runtime target (omp.h, ssp/*.h). Being installed from a recipe 8built for the target architecture, these are within the target 9sysroot and not cross/nativesdk; thus they weren't able to be 10found by gcc with the existing search paths. Add support for 11picking up these headers under the sysroot supplied on the gcc 12command line in order to resolve this. 13 14Extend target gcc headers search to musl too 15 16Upstream-Status: Pending 17 18Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> 19Signed-off-by: Khem Raj <raj.khem@gmail.com> 20--- 21 gcc/Makefile.in | 2 ++ 22 gcc/config/linux.h | 8 ++++++++ 23 gcc/config/rs6000/sysv4.h | 8 ++++++++ 24 gcc/cppdefault.cc | 4 ++++ 25 4 files changed, 22 insertions(+) 26 27diff --git a/gcc/Makefile.in b/gcc/Makefile.in 28index fe636af3f63..065ce7e9a5b 100644 29--- a/gcc/Makefile.in 30+++ b/gcc/Makefile.in 31@@ -640,6 +640,7 @@ libexecdir = @libexecdir@ 32 33 # Directory in which the compiler finds libraries etc. 34 libsubdir = $(libdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix) 35+libsubdir_target = $(target_noncanonical)/$(version) 36 # Directory in which the compiler finds executables 37 libexecsubdir = $(libexecdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix) 38 # Directory in which all plugin resources are installed 39@@ -3059,6 +3060,7 @@ CFLAGS-intl.o += -DLOCALEDIR=\"$(localedir)\" 40 41 PREPROCESSOR_DEFINES = \ 42 -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \ 43+ -DGCC_INCLUDE_SUBDIR_TARGET=\"$(libsubdir_target)/include\" \ 44 -DFIXED_INCLUDE_DIR=\"$(libsubdir)/include-fixed\" \ 45 -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \ 46 -DGPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT=$(gcc_gxx_include_dir_add_sysroot) \ 47diff --git a/gcc/config/linux.h b/gcc/config/linux.h 48index 6491c6b84f5..57496ff1f2f 100644 49--- a/gcc/config/linux.h 50+++ b/gcc/config/linux.h 51@@ -157,6 +157,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see 52 #define INCLUDE_DEFAULTS_MUSL_TOOL 53 #endif 54 55+#ifdef GCC_INCLUDE_SUBDIR_TARGET 56+#define INCLUDE_DEFAULTS_MUSL_SUBDIR_TARGET \ 57+ { STANDARD_STARTFILE_PREFIX_2 GCC_INCLUDE_SUBDIR_TARGET, "GCC", 0, 0, 1, 0}, 58+#else 59+#define INCLUDE_DEFAULTS_MUSL_SUBDIR_TARGET 60+#endif 61+ 62 #ifdef NATIVE_SYSTEM_HEADER_DIR 63 #define INCLUDE_DEFAULTS_MUSL_NATIVE \ 64 { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 }, \ 65@@ -183,6 +190,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see 66 INCLUDE_DEFAULTS_MUSL_PREFIX \ 67 INCLUDE_DEFAULTS_MUSL_CROSS \ 68 INCLUDE_DEFAULTS_MUSL_TOOL \ 69+ INCLUDE_DEFAULTS_MUSL_SUBDIR_TARGET \ 70 INCLUDE_DEFAULTS_MUSL_NATIVE \ 71 { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \ 72 { 0, 0, 0, 0, 0, 0 } \ 73diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h 74index 26db003cb3a..3a443abcf6b 100644 75--- a/gcc/config/rs6000/sysv4.h 76+++ b/gcc/config/rs6000/sysv4.h 77@@ -986,6 +986,13 @@ ncrtn.o%s" 78 #define INCLUDE_DEFAULTS_MUSL_TOOL 79 #endif 80 81+#ifdef GCC_INCLUDE_SUBDIR_TARGET 82+#define INCLUDE_DEFAULTS_MUSL_SUBDIR_TARGET \ 83+ { STANDARD_STARTFILE_PREFIX_2 GCC_INCLUDE_SUBDIR_TARGET, "GCC", 0, 0, 1, 0}, 84+#else 85+#define INCLUDE_DEFAULTS_MUSL_SUBDIR_TARGET 86+#endif 87+ 88 #ifdef NATIVE_SYSTEM_HEADER_DIR 89 #define INCLUDE_DEFAULTS_MUSL_NATIVE \ 90 { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 }, \ 91@@ -1012,6 +1019,7 @@ ncrtn.o%s" 92 INCLUDE_DEFAULTS_MUSL_PREFIX \ 93 INCLUDE_DEFAULTS_MUSL_CROSS \ 94 INCLUDE_DEFAULTS_MUSL_TOOL \ 95+ INCLUDE_DEFAULTS_MUSL_SUBDIR_TARGET \ 96 INCLUDE_DEFAULTS_MUSL_NATIVE \ 97 { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \ 98 { 0, 0, 0, 0, 0, 0 } \ 99diff --git a/gcc/cppdefault.cc b/gcc/cppdefault.cc 100index 141bb4d25f6..734590a7059 100644 101--- a/gcc/cppdefault.cc 102+++ b/gcc/cppdefault.cc 103@@ -64,6 +64,10 @@ const struct default_include cpp_include_defaults[] 104 /* This is the dir for gcc's private headers. */ 105 { GCC_INCLUDE_DIR, "GCC", 0, 0, 0, 0 }, 106 #endif 107+#ifdef GCC_INCLUDE_SUBDIR_TARGET 108+ /* This is the dir for gcc's private headers under the specified sysroot. */ 109+ { STANDARD_STARTFILE_PREFIX_2 GCC_INCLUDE_SUBDIR_TARGET, "GCC", 0, 0, 1, 0 }, 110+#endif 111 #ifdef LOCAL_INCLUDE_DIR 112 /* /usr/local/include comes before the fixincluded header files. */ 113 { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 }, 114