diff options
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, 21 insertions, 20 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 b1054fa749..aa005532ad 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 | |||
@@ -34,21 +34,22 @@ if the executable is moved. (These paths were missed in the original | |||
34 | implementation.) | 34 | implementation.) |
35 | 35 | ||
36 | Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org> | 36 | Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org> |
37 | Signed-off-by: Bernhard Rosenkränzer <bernhard.rosenkraenzer.ext@huawei.com> [ported to gcc 12] | ||
37 | --- | 38 | --- |
38 | gcc/c-family/c-opts.c | 4 +-- | 39 | gcc/c-family/c-opts.cc | 4 +-- |
39 | gcc/config/linux.h | 24 +++++++-------- | 40 | gcc/config/linux.h | 24 +++++++-------- |
40 | gcc/config/rs6000/sysv4.h | 24 +++++++-------- | 41 | gcc/config/rs6000/sysv4.h | 24 +++++++-------- |
41 | gcc/cppdefault.c | 63 ++++++++++++++++++++++++--------------- | 42 | gcc/cppdefault.cc | 63 ++++++++++++++++++++++++--------------- |
42 | gcc/cppdefault.h | 13 ++++---- | 43 | gcc/cppdefault.h | 13 ++++---- |
43 | gcc/gcc.c | 20 +++++++++---- | 44 | gcc/gcc.cc | 20 +++++++++---- |
44 | gcc/incpath.c | 12 ++++---- | 45 | gcc/incpath.cc | 12 ++++---- |
45 | gcc/prefix.c | 6 ++-- | 46 | gcc/prefix.cc | 6 ++-- |
46 | 8 files changed, 94 insertions(+), 72 deletions(-) | 47 | 8 files changed, 94 insertions(+), 72 deletions(-) |
47 | 48 | ||
48 | diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c | 49 | diff --git a/gcc/c-family/c-opts.cc b/gcc/c-family/c-opts.cc |
49 | index 89e05a4c551..5577383665d 100644 | 50 | index 89e05a4c551..5577383665d 100644 |
50 | --- a/gcc/c-family/c-opts.c | 51 | --- a/gcc/c-family/c-opts.cc |
51 | +++ b/gcc/c-family/c-opts.c | 52 | +++ b/gcc/c-family/c-opts.cc |
52 | @@ -1436,8 +1436,8 @@ add_prefixed_path (const char *suffix, incpath_kind chain) | 53 | @@ -1436,8 +1436,8 @@ add_prefixed_path (const char *suffix, incpath_kind chain) |
53 | size_t prefix_len, suffix_len; | 54 | size_t prefix_len, suffix_len; |
54 | 55 | ||
@@ -216,10 +217,10 @@ index 0c2bba5ea32..313a8de4417 100644 | |||
216 | { 0, 0, 0, 0, 0, 0 } \ | 217 | { 0, 0, 0, 0, 0, 0 } \ |
217 | } | 218 | } |
218 | #endif | 219 | #endif |
219 | diff --git a/gcc/cppdefault.c b/gcc/cppdefault.c | 220 | diff --git a/gcc/cppdefault.cc b/gcc/cppdefault.cc |
220 | index d54d6ce0076..784a92a0c24 100644 | 221 | index d54d6ce0076..784a92a0c24 100644 |
221 | --- a/gcc/cppdefault.c | 222 | --- a/gcc/cppdefault.cc |
222 | +++ b/gcc/cppdefault.c | 223 | +++ b/gcc/cppdefault.cc |
223 | @@ -35,6 +35,30 @@ | 224 | @@ -35,6 +35,30 @@ |
224 | # undef CROSS_INCLUDE_DIR | 225 | # undef CROSS_INCLUDE_DIR |
225 | #endif | 226 | #endif |
@@ -377,10 +378,10 @@ index fd3c655db1c..20669ac427d 100644 | |||
377 | /* The run-time execution prefix. This is typically the lib/gcc | 378 | /* The run-time execution prefix. This is typically the lib/gcc |
378 | subdirectory of the actual installation. */ | 379 | subdirectory of the actual installation. */ |
379 | extern const char *gcc_exec_prefix; | 380 | extern const char *gcc_exec_prefix; |
380 | diff --git a/gcc/gcc.c b/gcc/gcc.c | 381 | diff --git a/gcc/gcc.cc b/gcc/gcc.cc |
381 | index 8737bae5353..aa6fbe43965 100644 | 382 | index 8737bae5353..aa6fbe43965 100644 |
382 | --- a/gcc/gcc.c | 383 | --- a/gcc/gcc.cc |
383 | +++ b/gcc/gcc.c | 384 | +++ b/gcc/gcc.cc |
384 | @@ -252,6 +252,8 @@ FILE *report_times_to_file = NULL; | 385 | @@ -252,6 +252,8 @@ FILE *report_times_to_file = NULL; |
385 | #endif | 386 | #endif |
386 | static const char *target_system_root = DEFAULT_TARGET_SYSTEM_ROOT; | 387 | static const char *target_system_root = DEFAULT_TARGET_SYSTEM_ROOT; |
@@ -437,10 +438,10 @@ index 8737bae5353..aa6fbe43965 100644 | |||
437 | case 'S': | 438 | case 'S': |
438 | value = do_spec_1 (startfile_spec, 0, NULL); | 439 | value = do_spec_1 (startfile_spec, 0, NULL); |
439 | if (value != 0) | 440 | if (value != 0) |
440 | diff --git a/gcc/incpath.c b/gcc/incpath.c | 441 | diff --git a/gcc/incpath.cc b/gcc/incpath.cc |
441 | index fbfc0ce03b8..a82e543428b 100644 | 442 | index fbfc0ce03b8..a82e543428b 100644 |
442 | --- a/gcc/incpath.c | 443 | --- a/gcc/incpath.cc |
443 | +++ b/gcc/incpath.c | 444 | +++ b/gcc/incpath.cc |
444 | @@ -131,7 +131,7 @@ add_standard_paths (const char *sysroot, const char *iprefix, | 445 | @@ -131,7 +131,7 @@ add_standard_paths (const char *sysroot, const char *iprefix, |
445 | int relocated = cpp_relocated (); | 446 | int relocated = cpp_relocated (); |
446 | size_t len; | 447 | size_t len; |
@@ -484,10 +485,10 @@ index fbfc0ce03b8..a82e543428b 100644 | |||
484 | NULL); | 485 | NULL); |
485 | str = update_path (ostr, p->component); | 486 | str = update_path (ostr, p->component); |
486 | free (ostr); | 487 | free (ostr); |
487 | diff --git a/gcc/prefix.c b/gcc/prefix.c | 488 | diff --git a/gcc/prefix.cc b/gcc/prefix.cc |
488 | index 747c09de638..f728638dc65 100644 | 489 | index 747c09de638..f728638dc65 100644 |
489 | --- a/gcc/prefix.c | 490 | --- a/gcc/prefix.cc |
490 | +++ b/gcc/prefix.c | 491 | +++ b/gcc/prefix.cc |
491 | @@ -72,7 +72,9 @@ License along with GCC; see the file COPYING3. If not see | 492 | @@ -72,7 +72,9 @@ License along with GCC; see the file COPYING3. If not see |
492 | #include "prefix.h" | 493 | #include "prefix.h" |
493 | #include "common/common-target.h" | 494 | #include "common/common-target.h" |