diff options
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-7.3/0030-Ensure-target-gcc-headers-can-be-included.patch')
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-7.3/0030-Ensure-target-gcc-headers-can-be-included.patch | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-7.3/0030-Ensure-target-gcc-headers-can-be-included.patch b/meta/recipes-devtools/gcc/gcc-7.3/0030-Ensure-target-gcc-headers-can-be-included.patch deleted file mode 100644 index c6ecce9736..0000000000 --- a/meta/recipes-devtools/gcc/gcc-7.3/0030-Ensure-target-gcc-headers-can-be-included.patch +++ /dev/null | |||
| @@ -1,62 +0,0 @@ | |||
| 1 | From bf5836989e0ffc1c1df1369df06877e96c08df41 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 30/47] 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 23cca7f0d5a..95d21effad3 100644 | ||
| 27 | --- a/gcc/Makefile.in | ||
| 28 | +++ b/gcc/Makefile.in | ||
| 29 | @@ -608,6 +608,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 | @@ -2791,6 +2792,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 10b96eca0a7..c8da0884872 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 | -- | ||
| 61 | 2.12.2 | ||
| 62 | |||
