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:53:44 +0000 |
| commit | 6fca075a8d87d033359f81d476c8506df66ad53d (patch) | |
| tree | 75ed8369daade3111c2ef469580dac3f15894bc7 | |
| parent | 619273ecb6c17efd0b4d01f17688f1b211991ca2 (diff) | |
| download | openembedded-core-contrib-6fca075a8d87d033359f81d476c8506df66ad53d.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.
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 = "\ file://0002-gcc-poison-system-directories.patch \ file://0004-64-bit-multilib-hack.patch \ file://0005-optional-libstdc.patch \ - file://0006-COLLECT_GCC_OPTIONS.patch \ file://0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch \ file://0009-cpp-honor-sysroot.patch \ 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 @@ -From 127716a32a11ca2a6b3aac068054bfc69c4dcfd8 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 29 Mar 2013 09:16:28 +0400 -Subject: [PATCH] COLLECT_GCC_OPTIONS - -This patch adds --sysroot into COLLECT_GCC_OPTIONS which is used to -invoke collect2. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Pending ---- - gcc/gcc.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/gcc/gcc.c b/gcc/gcc.c -index be7630ffd8c..1bc45285384 100644 ---- a/gcc/gcc.c -+++ b/gcc/gcc.c -@@ -5383,6 +5383,15 @@ set_collect_gcc_options (void) - sizeof ("COLLECT_GCC_OPTIONS=") - 1); - - first_time = TRUE; -+#ifdef HAVE_LD_SYSROOT -+ if (target_system_root_changed && target_system_root) -+ { -+ obstack_grow (&collect_obstack, "'--sysroot=", sizeof("'--sysroot=")-1); -+ obstack_grow (&collect_obstack, target_system_root,strlen(target_system_root)); -+ obstack_grow (&collect_obstack, "'", 1); -+ first_time = FALSE; -+ } -+#endif - for (i = 0; (int) i < n_switches; i++) - { - const char *const *args; |