| From d27ba49e2e5c608c43265462d6831363cc7f565b Mon Sep 17 00:00:00 2001 |
| From: Khem Raj <raj.khem@gmail.com> |
| Date: Fri, 20 Feb 2015 10:25:11 +0000 |
| Subject: [PATCH 19/36] Ensure target gcc headers can be included |
| |
| There are a few headers installed as part of the OpenEmbedded |
| gcc-runtime target (omp.h, ssp/*.h). Being installed from a recipe |
| built for the target architecture, these are within the target |
| sysroot and not cross/nativesdk; thus they weren't able to be |
| found by gcc with the existing search paths. Add support for |
| picking up these headers under the sysroot supplied on the gcc |
| command line in order to resolve this. |
| |
| Upstream-Status: Pending |
| |
| Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> |
| Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| --- |
| gcc/Makefile.in | 2 ++ |
| gcc/cppdefault.c | 4 ++++ |
| gcc/defaults.h | 9 +++++++++ |
| gcc/gcc.c | 7 ------- |
| 4 files changed, 15 insertions(+), 7 deletions(-) |
| |
| --- a/gcc/Makefile.in |
| +++ b/gcc/Makefile.in |
| @@ -618,6 +618,7 @@ libexecdir = @libexecdir@ |
| |
| # Directory in which the compiler finds libraries etc. |
| libsubdir = $(libdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix) |
| +libsubdir_target = $(target_noncanonical)/$(version) |
| # Directory in which the compiler finds executables |
| libexecsubdir = $(libexecdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix) |
| # Directory in which all plugin resources are installed |
| @@ -2866,6 +2867,7 @@ CFLAGS-intl.o += -DLOCALEDIR=\"$(localed |
| |
| PREPROCESSOR_DEFINES = \ |
| -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \ |
| + -DGCC_INCLUDE_SUBDIR_TARGET=\"$(libsubdir_target)/include\" \ |
| -DFIXED_INCLUDE_DIR=\"$(libsubdir)/include-fixed\" \ |
| -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \ |
| -DGPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT=$(gcc_gxx_include_dir_add_sysroot) \ |
| --- a/gcc/cppdefault.c |
| +++ b/gcc/cppdefault.c |
| @@ -59,6 +59,10 @@ const struct default_include cpp_include |
| /* This is the dir for gcc's private headers. */ |
| { GCC_INCLUDE_DIR, "GCC", 0, 0, 0, 0 }, |
| #endif |
| +#ifdef GCC_INCLUDE_SUBDIR_TARGET |
| + /* This is the dir for gcc's private headers under the specified sysroot. */ |
| + { STANDARD_STARTFILE_PREFIX_2 GCC_INCLUDE_SUBDIR_TARGET, "GCC", 0, 0, 1, 0 }, |
| +#endif |
| #ifdef LOCAL_INCLUDE_DIR |
| /* /usr/local/include comes before the fixincluded header files. */ |
| { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 }, |