diff options
author | Khem Raj <raj.khem@gmail.com> | 2021-03-30 14:30:18 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-05-03 15:23:48 +0100 |
commit | b621ead6d5b1caa2602a547ea8d9e0ffa1bb0cb4 (patch) | |
tree | 4adf4d6e075fc6a9145cd7d5bcf98cf08d7ab48c /meta/recipes-devtools/gcc/gcc/0024-handle-sysroot-support-for-nativesdk-gcc.patch | |
parent | 4a72c681fa784b926ca57e1e89f54d44aedf324a (diff) | |
download | poky-b621ead6d5b1caa2602a547ea8d9e0ffa1bb0cb4.tar.gz |
gcc: Upgrade to GCC 11
Drop already upstream/backported patches
(From OE-Core rev: e64bf999a92aed3c6be38eae9e75ec9277638b95)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc/0024-handle-sysroot-support-for-nativesdk-gcc.patch')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc/0024-handle-sysroot-support-for-nativesdk-gcc.patch | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/meta/recipes-devtools/gcc/gcc/0024-handle-sysroot-support-for-nativesdk-gcc.patch b/meta/recipes-devtools/gcc/gcc/0024-handle-sysroot-support-for-nativesdk-gcc.patch index 6c75c0f2bf..3958e9c212 100644 --- a/meta/recipes-devtools/gcc/gcc/0024-handle-sysroot-support-for-nativesdk-gcc.patch +++ b/meta/recipes-devtools/gcc/gcc/0024-handle-sysroot-support-for-nativesdk-gcc.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 2966f3c43382fa4f79cbac761232dae2e92e7012 Mon Sep 17 00:00:00 2001 | 1 | From 35c084a051bcd6587ebc73e4acb045cb2bdf7e99 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: Mon, 7 Dec 2015 23:39:54 +0000 | 3 | Date: Mon, 7 Dec 2015 23:39:54 +0000 |
4 | Subject: [PATCH] handle sysroot support for nativesdk-gcc | 4 | Subject: [PATCH] handle sysroot support for nativesdk-gcc |
@@ -41,10 +41,10 @@ Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org> | |||
41 | 6 files changed, 70 insertions(+), 48 deletions(-) | 41 | 6 files changed, 70 insertions(+), 48 deletions(-) |
42 | 42 | ||
43 | diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c | 43 | diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c |
44 | index c51d6d34726..aa7507df2cf 100644 | 44 | index bd15b9cd902..2bd667e3f58 100644 |
45 | --- a/gcc/c-family/c-opts.c | 45 | --- a/gcc/c-family/c-opts.c |
46 | +++ b/gcc/c-family/c-opts.c | 46 | +++ b/gcc/c-family/c-opts.c |
47 | @@ -1409,8 +1409,8 @@ add_prefixed_path (const char *suffix, incpath_kind chain) | 47 | @@ -1436,8 +1436,8 @@ add_prefixed_path (const char *suffix, incpath_kind chain) |
48 | size_t prefix_len, suffix_len; | 48 | size_t prefix_len, suffix_len; |
49 | 49 | ||
50 | suffix_len = strlen (suffix); | 50 | suffix_len = strlen (suffix); |
@@ -56,7 +56,7 @@ index c51d6d34726..aa7507df2cf 100644 | |||
56 | path = (char *) xmalloc (prefix_len + suffix_len + 1); | 56 | path = (char *) xmalloc (prefix_len + suffix_len + 1); |
57 | memcpy (path, prefix, prefix_len); | 57 | memcpy (path, prefix, prefix_len); |
58 | diff --git a/gcc/cppdefault.c b/gcc/cppdefault.c | 58 | diff --git a/gcc/cppdefault.c b/gcc/cppdefault.c |
59 | index 2f43b88a0c3..6b6be04686c 100644 | 59 | index d54d6ce0076..784a92a0c24 100644 |
60 | --- a/gcc/cppdefault.c | 60 | --- a/gcc/cppdefault.c |
61 | +++ b/gcc/cppdefault.c | 61 | +++ b/gcc/cppdefault.c |
62 | @@ -35,6 +35,30 @@ | 62 | @@ -35,6 +35,30 @@ |
@@ -90,7 +90,7 @@ index 2f43b88a0c3..6b6be04686c 100644 | |||
90 | const struct default_include cpp_include_defaults[] | 90 | const struct default_include cpp_include_defaults[] |
91 | #ifdef INCLUDE_DEFAULTS | 91 | #ifdef INCLUDE_DEFAULTS |
92 | = INCLUDE_DEFAULTS; | 92 | = INCLUDE_DEFAULTS; |
93 | @@ -42,38 +66,38 @@ const struct default_include cpp_include_defaults[] | 93 | @@ -42,17 +66,17 @@ const struct default_include cpp_include_defaults[] |
94 | = { | 94 | = { |
95 | #ifdef GPLUSPLUS_INCLUDE_DIR | 95 | #ifdef GPLUSPLUS_INCLUDE_DIR |
96 | /* Pick up GNU C++ generic include files. */ | 96 | /* Pick up GNU C++ generic include files. */ |
@@ -110,6 +110,9 @@ index 2f43b88a0c3..6b6be04686c 100644 | |||
110 | + { GPLUSPLUS_BACKWARD_INCLUDE_DIRVAR, "G++", 1, 1, | 110 | + { GPLUSPLUS_BACKWARD_INCLUDE_DIRVAR, "G++", 1, 1, |
111 | GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, | 111 | GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, |
112 | #endif | 112 | #endif |
113 | #ifdef GPLUSPLUS_LIBCXX_INCLUDE_DIR | ||
114 | @@ -62,23 +86,23 @@ const struct default_include cpp_include_defaults[] | ||
115 | #endif | ||
113 | #ifdef GCC_INCLUDE_DIR | 116 | #ifdef GCC_INCLUDE_DIR |
114 | /* This is the dir for gcc's private headers. */ | 117 | /* This is the dir for gcc's private headers. */ |
115 | - { GCC_INCLUDE_DIR, "GCC", 0, 0, 0, 0 }, | 118 | - { GCC_INCLUDE_DIR, "GCC", 0, 0, 0, 0 }, |
@@ -138,7 +141,7 @@ index 2f43b88a0c3..6b6be04686c 100644 | |||
138 | /* A multilib suffix needs adding if different multilibs use | 141 | /* A multilib suffix needs adding if different multilibs use |
139 | different headers. */ | 142 | different headers. */ |
140 | #ifdef SYSROOT_HEADERS_SUFFIX_SPEC | 143 | #ifdef SYSROOT_HEADERS_SUFFIX_SPEC |
141 | @@ -85,33 +109,24 @@ const struct default_include cpp_include_defaults[] | 144 | @@ -90,33 +114,24 @@ const struct default_include cpp_include_defaults[] |
142 | #endif | 145 | #endif |
143 | #ifdef CROSS_INCLUDE_DIR | 146 | #ifdef CROSS_INCLUDE_DIR |
144 | /* One place the target system's headers might be. */ | 147 | /* One place the target system's headers might be. */ |
@@ -179,7 +182,7 @@ index 2f43b88a0c3..6b6be04686c 100644 | |||
179 | /* This value is set by cpp_relocated at runtime */ | 182 | /* This value is set by cpp_relocated at runtime */ |
180 | const char *gcc_exec_prefix; | 183 | const char *gcc_exec_prefix; |
181 | diff --git a/gcc/cppdefault.h b/gcc/cppdefault.h | 184 | diff --git a/gcc/cppdefault.h b/gcc/cppdefault.h |
182 | index a681264f75e..5e10a2fa140 100644 | 185 | index fd3c655db1c..20669ac427d 100644 |
183 | --- a/gcc/cppdefault.h | 186 | --- a/gcc/cppdefault.h |
184 | +++ b/gcc/cppdefault.h | 187 | +++ b/gcc/cppdefault.h |
185 | @@ -33,7 +33,8 @@ | 188 | @@ -33,7 +33,8 @@ |
@@ -191,8 +194,8 @@ index a681264f75e..5e10a2fa140 100644 | |||
191 | + | 194 | + |
192 | const char *const component; /* The component containing the directory | 195 | const char *const component; /* The component containing the directory |
193 | (see update_path in prefix.c) */ | 196 | (see update_path in prefix.c) */ |
194 | const char cplusplus; /* Only look here if we're compiling C++. */ | 197 | const char cplusplus; /* When this is non-zero, we should only |
195 | @@ -50,17 +51,13 @@ struct default_include | 198 | @@ -55,17 +56,13 @@ struct default_include |
196 | }; | 199 | }; |
197 | 200 | ||
198 | extern const struct default_include cpp_include_defaults[]; | 201 | extern const struct default_include cpp_include_defaults[]; |
@@ -214,7 +217,7 @@ index a681264f75e..5e10a2fa140 100644 | |||
214 | subdirectory of the actual installation. */ | 217 | subdirectory of the actual installation. */ |
215 | extern const char *gcc_exec_prefix; | 218 | extern const char *gcc_exec_prefix; |
216 | diff --git a/gcc/gcc.c b/gcc/gcc.c | 219 | diff --git a/gcc/gcc.c b/gcc/gcc.c |
217 | index e2e0bcee9b2..912c2febf94 100644 | 220 | index 8737bae5353..aa6fbe43965 100644 |
218 | --- a/gcc/gcc.c | 221 | --- a/gcc/gcc.c |
219 | +++ b/gcc/gcc.c | 222 | +++ b/gcc/gcc.c |
220 | @@ -252,6 +252,8 @@ FILE *report_times_to_file = NULL; | 223 | @@ -252,6 +252,8 @@ FILE *report_times_to_file = NULL; |
@@ -226,7 +229,7 @@ index e2e0bcee9b2..912c2febf94 100644 | |||
226 | /* Nonzero means pass the updated target_system_root to the compiler. */ | 229 | /* Nonzero means pass the updated target_system_root to the compiler. */ |
227 | 230 | ||
228 | static int target_system_root_changed; | 231 | static int target_system_root_changed; |
229 | @@ -526,6 +528,7 @@ or with constant text in a single argument. | 232 | @@ -568,6 +570,7 @@ or with constant text in a single argument. |
230 | %G process LIBGCC_SPEC as a spec. | 233 | %G process LIBGCC_SPEC as a spec. |
231 | %R Output the concatenation of target_system_root and | 234 | %R Output the concatenation of target_system_root and |
232 | target_sysroot_suffix. | 235 | target_sysroot_suffix. |
@@ -234,7 +237,7 @@ index e2e0bcee9b2..912c2febf94 100644 | |||
234 | %S process STARTFILE_SPEC as a spec. A capital S is actually used here. | 237 | %S process STARTFILE_SPEC as a spec. A capital S is actually used here. |
235 | %E process ENDFILE_SPEC as a spec. A capital E is actually used here. | 238 | %E process ENDFILE_SPEC as a spec. A capital E is actually used here. |
236 | %C process CPP_SPEC as a spec. | 239 | %C process CPP_SPEC as a spec. |
237 | @@ -1502,10 +1505,10 @@ static const char *gcc_libexec_prefix; | 240 | @@ -1621,10 +1624,10 @@ static const char *gcc_libexec_prefix; |
238 | gcc_exec_prefix is set because, in that case, we know where the | 241 | gcc_exec_prefix is set because, in that case, we know where the |
239 | compiler has been installed, and use paths relative to that | 242 | compiler has been installed, and use paths relative to that |
240 | location instead. */ | 243 | location instead. */ |
@@ -249,7 +252,7 @@ index e2e0bcee9b2..912c2febf94 100644 | |||
249 | 252 | ||
250 | /* For native compilers, these are well-known paths containing | 253 | /* For native compilers, these are well-known paths containing |
251 | components that may be provided by the system. For cross | 254 | components that may be provided by the system. For cross |
252 | @@ -1513,9 +1516,9 @@ static const char *const standard_startfile_prefix = STANDARD_STARTFILE_PREFIX; | 255 | @@ -1632,9 +1635,9 @@ static const char *const standard_startfile_prefix = STANDARD_STARTFILE_PREFIX; |
253 | static const char *md_exec_prefix = MD_EXEC_PREFIX; | 256 | static const char *md_exec_prefix = MD_EXEC_PREFIX; |
254 | static const char *md_startfile_prefix = MD_STARTFILE_PREFIX; | 257 | static const char *md_startfile_prefix = MD_STARTFILE_PREFIX; |
255 | static const char *md_startfile_prefix_1 = MD_STARTFILE_PREFIX_1; | 258 | static const char *md_startfile_prefix_1 = MD_STARTFILE_PREFIX_1; |
@@ -261,7 +264,7 @@ index e2e0bcee9b2..912c2febf94 100644 | |||
261 | = STANDARD_STARTFILE_PREFIX_2; | 264 | = STANDARD_STARTFILE_PREFIX_2; |
262 | 265 | ||
263 | /* A relative path to be used in finding the location of tools | 266 | /* A relative path to be used in finding the location of tools |
264 | @@ -5955,6 +5958,11 @@ do_spec_1 (const char *spec, int inswitch, const char *soft_matched_part) | 267 | @@ -6564,6 +6567,11 @@ do_spec_1 (const char *spec, int inswitch, const char *soft_matched_part) |
265 | } | 268 | } |
266 | break; | 269 | break; |
267 | 270 | ||
@@ -274,7 +277,7 @@ index e2e0bcee9b2..912c2febf94 100644 | |||
274 | value = do_spec_1 (startfile_spec, 0, NULL); | 277 | value = do_spec_1 (startfile_spec, 0, NULL); |
275 | if (value != 0) | 278 | if (value != 0) |
276 | diff --git a/gcc/incpath.c b/gcc/incpath.c | 279 | diff --git a/gcc/incpath.c b/gcc/incpath.c |
277 | index 9098ab044ab..bfad4ebe382 100644 | 280 | index fbfc0ce03b8..a82e543428b 100644 |
278 | --- a/gcc/incpath.c | 281 | --- a/gcc/incpath.c |
279 | +++ b/gcc/incpath.c | 282 | +++ b/gcc/incpath.c |
280 | @@ -131,7 +131,7 @@ add_standard_paths (const char *sysroot, const char *iprefix, | 283 | @@ -131,7 +131,7 @@ add_standard_paths (const char *sysroot, const char *iprefix, |
@@ -286,7 +289,7 @@ index 9098ab044ab..bfad4ebe382 100644 | |||
286 | { | 289 | { |
287 | /* Look for directories that start with the standard prefix. | 290 | /* Look for directories that start with the standard prefix. |
288 | "Translate" them, i.e. replace /usr/local/lib/gcc... with | 291 | "Translate" them, i.e. replace /usr/local/lib/gcc... with |
289 | @@ -145,7 +145,7 @@ add_standard_paths (const char *sysroot, const char *iprefix, | 292 | @@ -146,7 +146,7 @@ add_standard_paths (const char *sysroot, const char *iprefix, |
290 | now. */ | 293 | now. */ |
291 | if (sysroot && p->add_sysroot) | 294 | if (sysroot && p->add_sysroot) |
292 | continue; | 295 | continue; |
@@ -295,7 +298,7 @@ index 9098ab044ab..bfad4ebe382 100644 | |||
295 | { | 298 | { |
296 | char *str = concat (iprefix, p->fname + len, NULL); | 299 | char *str = concat (iprefix, p->fname + len, NULL); |
297 | if (p->multilib == 1 && imultilib) | 300 | if (p->multilib == 1 && imultilib) |
298 | @@ -185,7 +185,7 @@ add_standard_paths (const char *sysroot, const char *iprefix, | 301 | @@ -187,7 +187,7 @@ add_standard_paths (const char *sysroot, const char *iprefix, |
299 | free (sysroot_no_trailing_dir_separator); | 302 | free (sysroot_no_trailing_dir_separator); |
300 | } | 303 | } |
301 | else if (!p->add_sysroot && relocated | 304 | else if (!p->add_sysroot && relocated |
@@ -304,7 +307,7 @@ index 9098ab044ab..bfad4ebe382 100644 | |||
304 | { | 307 | { |
305 | static const char *relocated_prefix; | 308 | static const char *relocated_prefix; |
306 | char *ostr; | 309 | char *ostr; |
307 | @@ -202,12 +202,12 @@ add_standard_paths (const char *sysroot, const char *iprefix, | 310 | @@ -204,12 +204,12 @@ add_standard_paths (const char *sysroot, const char *iprefix, |
308 | dummy = concat (gcc_exec_prefix, "dummy", NULL); | 311 | dummy = concat (gcc_exec_prefix, "dummy", NULL); |
309 | relocated_prefix | 312 | relocated_prefix |
310 | = make_relative_prefix (dummy, | 313 | = make_relative_prefix (dummy, |
@@ -321,7 +324,7 @@ index 9098ab044ab..bfad4ebe382 100644 | |||
321 | str = update_path (ostr, p->component); | 324 | str = update_path (ostr, p->component); |
322 | free (ostr); | 325 | free (ostr); |
323 | diff --git a/gcc/prefix.c b/gcc/prefix.c | 326 | diff --git a/gcc/prefix.c b/gcc/prefix.c |
324 | index 1a403e535bd..c26d07bde12 100644 | 327 | index 747c09de638..f728638dc65 100644 |
325 | --- a/gcc/prefix.c | 328 | --- a/gcc/prefix.c |
326 | +++ b/gcc/prefix.c | 329 | +++ b/gcc/prefix.c |
327 | @@ -72,7 +72,9 @@ License along with GCC; see the file COPYING3. If not see | 330 | @@ -72,7 +72,9 @@ License along with GCC; see the file COPYING3. If not see |