diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-11-25 08:33:40 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-11-25 21:55:10 +0000 |
| commit | 08ee6545a819d0ccc698d8c1d6a57a5175c13a1d (patch) | |
| tree | b4aec69fc47f604bf8a6919662a85c4610ce6b02 | |
| parent | ac0cfb5ee46cb33a83614ef0ff01cc6397150ba1 (diff) | |
| download | poky-08ee6545a819d0ccc698d8c1d6a57a5175c13a1d.tar.gz | |
gcc: Drop no longer needed patch
This patch was mentioned upstream a long time ago:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47256
Changes from gcc 10 onward mean it is no longer needed as mentioned in the
above bug report. Drop the patch.
(From OE-Core rev: 6fca075a8d87d033359f81d476c8506df66ad53d)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-11.2.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc/0006-COLLECT_GCC_OPTIONS.patch | 35 |
2 files changed, 0 insertions, 36 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-11.2.inc b/meta/recipes-devtools/gcc/gcc-11.2.inc index baced2a400..b4e4300c66 100644 --- a/meta/recipes-devtools/gcc/gcc-11.2.inc +++ b/meta/recipes-devtools/gcc/gcc-11.2.inc | |||
| @@ -34,7 +34,6 @@ SRC_URI = "\ | |||
| 34 | file://0002-gcc-poison-system-directories.patch \ | 34 | file://0002-gcc-poison-system-directories.patch \ |
| 35 | file://0004-64-bit-multilib-hack.patch \ | 35 | file://0004-64-bit-multilib-hack.patch \ |
| 36 | file://0005-optional-libstdc.patch \ | 36 | file://0005-optional-libstdc.patch \ |
| 37 | file://0006-COLLECT_GCC_OPTIONS.patch \ | ||
| 38 | file://0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch \ | 37 | file://0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch \ |
| 39 | file://0009-cpp-honor-sysroot.patch \ | 38 | file://0009-cpp-honor-sysroot.patch \ |
| 40 | file://0010-MIPS64-Default-to-N64-ABI.patch \ | 39 | file://0010-MIPS64-Default-to-N64-ABI.patch \ |
diff --git a/meta/recipes-devtools/gcc/gcc/0006-COLLECT_GCC_OPTIONS.patch b/meta/recipes-devtools/gcc/gcc/0006-COLLECT_GCC_OPTIONS.patch deleted file mode 100644 index 265ca0e218..0000000000 --- a/meta/recipes-devtools/gcc/gcc/0006-COLLECT_GCC_OPTIONS.patch +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | From 127716a32a11ca2a6b3aac068054bfc69c4dcfd8 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Fri, 29 Mar 2013 09:16:28 +0400 | ||
| 4 | Subject: [PATCH] COLLECT_GCC_OPTIONS | ||
| 5 | |||
| 6 | This patch adds --sysroot into COLLECT_GCC_OPTIONS which is used to | ||
| 7 | invoke collect2. | ||
| 8 | |||
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 10 | |||
| 11 | Upstream-Status: Pending | ||
| 12 | --- | ||
| 13 | gcc/gcc.c | 9 +++++++++ | ||
| 14 | 1 file changed, 9 insertions(+) | ||
| 15 | |||
| 16 | diff --git a/gcc/gcc.c b/gcc/gcc.c | ||
| 17 | index be7630ffd8c..1bc45285384 100644 | ||
| 18 | --- a/gcc/gcc.c | ||
| 19 | +++ b/gcc/gcc.c | ||
| 20 | @@ -5383,6 +5383,15 @@ set_collect_gcc_options (void) | ||
| 21 | sizeof ("COLLECT_GCC_OPTIONS=") - 1); | ||
| 22 | |||
| 23 | first_time = TRUE; | ||
| 24 | +#ifdef HAVE_LD_SYSROOT | ||
| 25 | + if (target_system_root_changed && target_system_root) | ||
| 26 | + { | ||
| 27 | + obstack_grow (&collect_obstack, "'--sysroot=", sizeof("'--sysroot=")-1); | ||
| 28 | + obstack_grow (&collect_obstack, target_system_root,strlen(target_system_root)); | ||
| 29 | + obstack_grow (&collect_obstack, "'", 1); | ||
| 30 | + first_time = FALSE; | ||
| 31 | + } | ||
| 32 | +#endif | ||
| 33 | for (i = 0; (int) i < n_switches; i++) | ||
| 34 | { | ||
| 35 | const char *const *args; | ||
