diff options
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc/0013-Ensure-target-gcc-headers-can-be-included.patch')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc/0013-Ensure-target-gcc-headers-can-be-included.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/meta/recipes-devtools/gcc/gcc/0013-Ensure-target-gcc-headers-can-be-included.patch b/meta/recipes-devtools/gcc/gcc/0013-Ensure-target-gcc-headers-can-be-included.patch index 61e61ecc6e..b9a3f05df8 100644 --- a/meta/recipes-devtools/gcc/gcc/0013-Ensure-target-gcc-headers-can-be-included.patch +++ b/meta/recipes-devtools/gcc/gcc/0013-Ensure-target-gcc-headers-can-be-included.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 612801d426e75ff997cfabda380dbe52c2cbc532 Mon Sep 17 00:00:00 2001 | 1 | From 93ad7cf3ff92771451c2994cab45e34a0c8574a0 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 20 Feb 2015 10:25:11 +0000 | 3 | Date: Fri, 20 Feb 2015 10:25:11 +0000 |
4 | Subject: [PATCH] Ensure target gcc headers can be included | 4 | Subject: [PATCH] Ensure target gcc headers can be included |
@@ -25,10 +25,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
25 | 4 files changed, 22 insertions(+) | 25 | 4 files changed, 22 insertions(+) |
26 | 26 | ||
27 | diff --git a/gcc/Makefile.in b/gcc/Makefile.in | 27 | diff --git a/gcc/Makefile.in b/gcc/Makefile.in |
28 | index a8277254696..07fa63b6640 100644 | 28 | index fe636af3f63..065ce7e9a5b 100644 |
29 | --- a/gcc/Makefile.in | 29 | --- a/gcc/Makefile.in |
30 | +++ b/gcc/Makefile.in | 30 | +++ b/gcc/Makefile.in |
31 | @@ -632,6 +632,7 @@ libexecdir = @libexecdir@ | 31 | @@ -640,6 +640,7 @@ libexecdir = @libexecdir@ |
32 | 32 | ||
33 | # Directory in which the compiler finds libraries etc. | 33 | # Directory in which the compiler finds libraries etc. |
34 | libsubdir = $(libdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix) | 34 | libsubdir = $(libdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix) |
@@ -36,7 +36,7 @@ index a8277254696..07fa63b6640 100644 | |||
36 | # Directory in which the compiler finds executables | 36 | # Directory in which the compiler finds executables |
37 | libexecsubdir = $(libexecdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix) | 37 | libexecsubdir = $(libexecdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix) |
38 | # Directory in which all plugin resources are installed | 38 | # Directory in which all plugin resources are installed |
39 | @@ -3024,6 +3025,7 @@ CFLAGS-intl.o += -DLOCALEDIR=\"$(localedir)\" | 39 | @@ -3059,6 +3060,7 @@ CFLAGS-intl.o += -DLOCALEDIR=\"$(localedir)\" |
40 | 40 | ||
41 | PREPROCESSOR_DEFINES = \ | 41 | PREPROCESSOR_DEFINES = \ |
42 | -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \ | 42 | -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \ |
@@ -45,10 +45,10 @@ index a8277254696..07fa63b6640 100644 | |||
45 | -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \ | 45 | -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \ |
46 | -DGPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT=$(gcc_gxx_include_dir_add_sysroot) \ | 46 | -DGPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT=$(gcc_gxx_include_dir_add_sysroot) \ |
47 | diff --git a/gcc/config/linux.h b/gcc/config/linux.h | 47 | diff --git a/gcc/config/linux.h b/gcc/config/linux.h |
48 | index 4ce173384ef..8a3cd4f2d34 100644 | 48 | index 6491c6b84f5..57496ff1f2f 100644 |
49 | --- a/gcc/config/linux.h | 49 | --- a/gcc/config/linux.h |
50 | +++ b/gcc/config/linux.h | 50 | +++ b/gcc/config/linux.h |
51 | @@ -170,6 +170,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see | 51 | @@ -157,6 +157,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see |
52 | #define INCLUDE_DEFAULTS_MUSL_TOOL | 52 | #define INCLUDE_DEFAULTS_MUSL_TOOL |
53 | #endif | 53 | #endif |
54 | 54 | ||
@@ -62,7 +62,7 @@ index 4ce173384ef..8a3cd4f2d34 100644 | |||
62 | #ifdef NATIVE_SYSTEM_HEADER_DIR | 62 | #ifdef NATIVE_SYSTEM_HEADER_DIR |
63 | #define INCLUDE_DEFAULTS_MUSL_NATIVE \ | 63 | #define INCLUDE_DEFAULTS_MUSL_NATIVE \ |
64 | { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 }, \ | 64 | { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 }, \ |
65 | @@ -196,6 +203,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see | 65 | @@ -183,6 +190,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see |
66 | INCLUDE_DEFAULTS_MUSL_PREFIX \ | 66 | INCLUDE_DEFAULTS_MUSL_PREFIX \ |
67 | INCLUDE_DEFAULTS_MUSL_CROSS \ | 67 | INCLUDE_DEFAULTS_MUSL_CROSS \ |
68 | INCLUDE_DEFAULTS_MUSL_TOOL \ | 68 | INCLUDE_DEFAULTS_MUSL_TOOL \ |
@@ -71,10 +71,10 @@ index 4ce173384ef..8a3cd4f2d34 100644 | |||
71 | { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \ | 71 | { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \ |
72 | { 0, 0, 0, 0, 0, 0 } \ | 72 | { 0, 0, 0, 0, 0, 0 } \ |
73 | diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h | 73 | diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h |
74 | index a73954d9de5..e5dd6538358 100644 | 74 | index 26db003cb3a..3a443abcf6b 100644 |
75 | --- a/gcc/config/rs6000/sysv4.h | 75 | --- a/gcc/config/rs6000/sysv4.h |
76 | +++ b/gcc/config/rs6000/sysv4.h | 76 | +++ b/gcc/config/rs6000/sysv4.h |
77 | @@ -994,6 +994,13 @@ ncrtn.o%s" | 77 | @@ -986,6 +986,13 @@ ncrtn.o%s" |
78 | #define INCLUDE_DEFAULTS_MUSL_TOOL | 78 | #define INCLUDE_DEFAULTS_MUSL_TOOL |
79 | #endif | 79 | #endif |
80 | 80 | ||
@@ -88,7 +88,7 @@ index a73954d9de5..e5dd6538358 100644 | |||
88 | #ifdef NATIVE_SYSTEM_HEADER_DIR | 88 | #ifdef NATIVE_SYSTEM_HEADER_DIR |
89 | #define INCLUDE_DEFAULTS_MUSL_NATIVE \ | 89 | #define INCLUDE_DEFAULTS_MUSL_NATIVE \ |
90 | { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 }, \ | 90 | { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 }, \ |
91 | @@ -1020,6 +1027,7 @@ ncrtn.o%s" | 91 | @@ -1012,6 +1019,7 @@ ncrtn.o%s" |
92 | INCLUDE_DEFAULTS_MUSL_PREFIX \ | 92 | INCLUDE_DEFAULTS_MUSL_PREFIX \ |
93 | INCLUDE_DEFAULTS_MUSL_CROSS \ | 93 | INCLUDE_DEFAULTS_MUSL_CROSS \ |
94 | INCLUDE_DEFAULTS_MUSL_TOOL \ | 94 | INCLUDE_DEFAULTS_MUSL_TOOL \ |
@@ -97,7 +97,7 @@ index a73954d9de5..e5dd6538358 100644 | |||
97 | { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \ | 97 | { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \ |
98 | { 0, 0, 0, 0, 0, 0 } \ | 98 | { 0, 0, 0, 0, 0, 0 } \ |
99 | diff --git a/gcc/cppdefault.cc b/gcc/cppdefault.cc | 99 | diff --git a/gcc/cppdefault.cc b/gcc/cppdefault.cc |
100 | index 7888300f277..52cf14e92f8 100644 | 100 | index 141bb4d25f6..734590a7059 100644 |
101 | --- a/gcc/cppdefault.cc | 101 | --- a/gcc/cppdefault.cc |
102 | +++ b/gcc/cppdefault.cc | 102 | +++ b/gcc/cppdefault.cc |
103 | @@ -64,6 +64,10 @@ const struct default_include cpp_include_defaults[] | 103 | @@ -64,6 +64,10 @@ const struct default_include cpp_include_defaults[] |