Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 1 | From 73766424a2f71b1810fb8afdd863028855d87e5a Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Fri, 20 Feb 2015 10:25:11 +0000 |
| 4 | Subject: [PATCH 23/39] Ensure target gcc headers can be included |
| 5 | |
| 6 | There are a few headers installed as part of the OpenEmbedded |
| 7 | gcc-runtime target (omp.h, ssp/*.h). Being installed from a recipe |
| 8 | built for the target architecture, these are within the target |
| 9 | sysroot and not cross/nativesdk; thus they weren't able to be |
| 10 | found by gcc with the existing search paths. Add support for |
| 11 | picking up these headers under the sysroot supplied on the gcc |
| 12 | command line in order to resolve this. |
| 13 | |
| 14 | Upstream-Status: Pending |
| 15 | |
| 16 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> |
| 17 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 18 | --- |
| 19 | gcc/Makefile.in | 2 ++ |
| 20 | gcc/cppdefault.c | 4 ++++ |
| 21 | gcc/defaults.h | 9 +++++++++ |
| 22 | gcc/gcc.c | 7 ------- |
| 23 | 4 files changed, 15 insertions(+), 7 deletions(-) |
| 24 | |
| 25 | diff --git a/gcc/Makefile.in b/gcc/Makefile.in |
| 26 | index 71a8275c39f..5ae693fb06c 100644 |
| 27 | --- a/gcc/Makefile.in |
| 28 | +++ b/gcc/Makefile.in |
| 29 | @@ -614,6 +614,7 @@ libexecdir = @libexecdir@ |
| 30 | |
| 31 | # Directory in which the compiler finds libraries etc. |
| 32 | libsubdir = $(libdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix) |
| 33 | +libsubdir_target = gcc/$(target_noncanonical)/$(version) |
| 34 | # Directory in which the compiler finds executables |
| 35 | libexecsubdir = $(libexecdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix) |
| 36 | # Directory in which all plugin resources are installed |
| 37 | @@ -2870,6 +2871,7 @@ CFLAGS-intl.o += -DLOCALEDIR=\"$(localedir)\" |
| 38 | |
| 39 | PREPROCESSOR_DEFINES = \ |
| 40 | -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \ |
| 41 | + -DGCC_INCLUDE_SUBDIR_TARGET=\"$(libsubdir_target)/include\" \ |
| 42 | -DFIXED_INCLUDE_DIR=\"$(libsubdir)/include-fixed\" \ |
| 43 | -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \ |
| 44 | -DGPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT=$(gcc_gxx_include_dir_add_sysroot) \ |
| 45 | diff --git a/gcc/cppdefault.c b/gcc/cppdefault.c |
| 46 | index b36a979d5ba..e2e187dedaf 100644 |
| 47 | --- a/gcc/cppdefault.c |
| 48 | +++ b/gcc/cppdefault.c |
| 49 | @@ -59,6 +59,10 @@ const struct default_include cpp_include_defaults[] |
| 50 | /* This is the dir for gcc's private headers. */ |
| 51 | { GCC_INCLUDE_DIR, "GCC", 0, 0, 0, 0 }, |
| 52 | #endif |
| 53 | +#ifdef GCC_INCLUDE_SUBDIR_TARGET |
| 54 | + /* This is the dir for gcc's private headers under the specified sysroot. */ |
| 55 | + { STANDARD_STARTFILE_PREFIX_2 GCC_INCLUDE_SUBDIR_TARGET, "GCC", 0, 0, 1, 0 }, |
| 56 | +#endif |
| 57 | #ifdef LOCAL_INCLUDE_DIR |
| 58 | /* /usr/local/include comes before the fixincluded header files. */ |
| 59 | { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 }, |
| 60 | diff --git a/gcc/defaults.h b/gcc/defaults.h |
| 61 | index 78a08a33f12..c8851277674 100644 |
| 62 | --- a/gcc/defaults.h |
| 63 | +++ b/gcc/defaults.h |
| 64 | @@ -1451,4 +1451,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see |
| 65 | #define DWARF_GNAT_ENCODINGS_DEFAULT DWARF_GNAT_ENCODINGS_GDB |
| 66 | #endif |
| 67 | |
| 68 | +/* Default prefixes to attach to command names. */ |
| 69 | + |
| 70 | +#ifndef STANDARD_STARTFILE_PREFIX_1 |
| 71 | +#define STANDARD_STARTFILE_PREFIX_1 "/lib/" |
| 72 | +#endif |
| 73 | +#ifndef STANDARD_STARTFILE_PREFIX_2 |
| 74 | +#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" |
| 75 | +#endif |
| 76 | + |
| 77 | #endif /* ! GCC_DEFAULTS_H */ |
| 78 | diff --git a/gcc/gcc.c b/gcc/gcc.c |
| 79 | index 570cdc00034..3fb64d453f1 100644 |
| 80 | --- a/gcc/gcc.c |
| 81 | +++ b/gcc/gcc.c |
| 82 | @@ -1464,13 +1464,6 @@ static const char *gcc_libexec_prefix; |
| 83 | |
| 84 | /* Default prefixes to attach to command names. */ |
| 85 | |
| 86 | -#ifndef STANDARD_STARTFILE_PREFIX_1 |
| 87 | -#define STANDARD_STARTFILE_PREFIX_1 "/lib/" |
| 88 | -#endif |
| 89 | -#ifndef STANDARD_STARTFILE_PREFIX_2 |
| 90 | -#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" |
| 91 | -#endif |
| 92 | - |
| 93 | #ifdef CROSS_DIRECTORY_STRUCTURE /* Don't use these prefixes for a cross compiler. */ |
| 94 | #undef MD_EXEC_PREFIX |
| 95 | #undef MD_STARTFILE_PREFIX |
| 96 | -- |
| 97 | 2.17.0 |
| 98 | |