diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-25 22:34:53 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-29 07:27:47 +0100 |
commit | 0729c13304aafdfe549c01db2722fa53f09fbb93 (patch) | |
tree | 9e10a0efded12b97658375bc6769049cfb2adaf2 /meta/recipes-devtools/gcc/gcc/0012-gcc-Fix-argument-list-too-long-error.patch | |
parent | 9c6b31c27bea90225e63afb2838d353edfbc1f19 (diff) | |
download | poky-0729c13304aafdfe549c01db2722fa53f09fbb93.tar.gz |
gcc: Update patches submitted/merged upstream
I took 5 of our patches and submitted to upstream gcc. This highlighted that
patches 0026 and 0018 should be merged together and some tweaks were made to
try and make it acceptable to upstream. The other patches have their headers
updated to match what was submitted.
The libstdc++ option patch was also cleaned up ready for upstream as the
documentation wasn't quite right.
The CXXFLAGS_FOR_BUILD piece of 0026 is separated out into a new patch which
can be submitted separately to upstream.
Two of the patches have been merged, status updated accordinly.
(From OE-Core rev: df9b8ec56ff29f14feb1fde6acbdf9c4667430cf)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc/0012-gcc-Fix-argument-list-too-long-error.patch')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc/0012-gcc-Fix-argument-list-too-long-error.patch | 43 |
1 files changed, 19 insertions, 24 deletions
diff --git a/meta/recipes-devtools/gcc/gcc/0012-gcc-Fix-argument-list-too-long-error.patch b/meta/recipes-devtools/gcc/gcc/0012-gcc-Fix-argument-list-too-long-error.patch index 814ce18b98..6b6925735d 100644 --- a/meta/recipes-devtools/gcc/gcc/0012-gcc-Fix-argument-list-too-long-error.patch +++ b/meta/recipes-devtools/gcc/gcc/0012-gcc-Fix-argument-list-too-long-error.patch | |||
@@ -1,37 +1,32 @@ | |||
1 | From 12646c0899dec1b127ce71ebacf2571c1c7360f4 Mon Sep 17 00:00:00 2001 | 1 | From: Richard Purdie <richard.purdie@linuxfoundation.org> |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | Subject: [PATCH 2/5] gcc: Fix "argument list too long" from install-plugins |
3 | Date: Fri, 29 Mar 2013 09:26:37 +0400 | ||
4 | Subject: [PATCH] gcc: Fix argument list too long error. | ||
5 | 3 | ||
6 | There would be an "Argument list too long" error when the | 4 | When building in longer build paths (200+ characters), the |
7 | build directory is longer than 200, this is caused by: | 5 | "echo $(PLUGIN_HEADERS)" from the install-plugins target would cause an |
6 | "argument list too long error" on some systems. | ||
8 | 7 | ||
9 | headers=`echo $(PLUGIN_HEADERS) | tr ' ' '\012' | sort -u` | 8 | Avoid this by calling make's sort function on the list which removes |
9 | duplicates and stops the overflow from reaching the echo command. | ||
10 | The original sort is left to handle the the .h and .def files. | ||
10 | 11 | ||
11 | The PLUGIN_HEADERS is too long before sort, so the "echo" can't handle | 12 | 2021-10-26 Richard Purdie <richard.purdie@linuxfoundation.org> |
12 | it, use the $(sort list) of GNU make which can handle the too long list | ||
13 | would fix the problem, the header would be short enough after sorted. | ||
14 | The "tr ' ' '\012'" was used for translating the space to "\n", the | ||
15 | $(sort list) doesn't need this. | ||
16 | 13 | ||
17 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | 14 | gcc/ChangeLog: |
18 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
19 | 15 | ||
20 | RP: gcc then added *.h and *.def additions to this list, breaking the original | 16 | * Makefile.in: Fix "argument list too long" from install-plugins |
21 | fix. Add the sort to the original gcc code, leaving the tr+sort to fix the original | ||
22 | issue but include the new files too as reported by Zhuang <qiuguang.zqg@alibaba-inc.com> | ||
23 | 17 | ||
24 | Upstream-Status: Pending | 18 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> |
25 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 19 | |
20 | Upstream-Status: Submitted [https://gcc.gnu.org/pipermail/gcc-patches/2021-October/582722.html] | ||
26 | --- | 21 | --- |
27 | gcc/Makefile.in | 2 +- | 22 | gcc/Makefile.in | 2 +- |
28 | 1 file changed, 1 insertion(+), 1 deletion(-) | 23 | 1 file changed, 1 insertion(+), 1 deletion(-) |
29 | 24 | ||
30 | diff --git a/gcc/Makefile.in b/gcc/Makefile.in | 25 | Index: gcc-11.2.0/gcc/Makefile.in |
31 | index 7da6f439fff..59c45c81393 100644 | 26 | =================================================================== |
32 | --- a/gcc/Makefile.in | 27 | --- gcc-11.2.0.orig/gcc/Makefile.in |
33 | +++ b/gcc/Makefile.in | 28 | +++ gcc-11.2.0/gcc/Makefile.in |
34 | @@ -3678,7 +3678,7 @@ install-plugin: installdirs lang.install-plugin s-header-vars install-gengtype | 29 | @@ -3678,7 +3678,7 @@ install-plugin: installdirs lang.install |
35 | # We keep the directory structure for files in config, common/config or | 30 | # We keep the directory structure for files in config, common/config or |
36 | # c-family and .def files. All other files are flattened to a single directory. | 31 | # c-family and .def files. All other files are flattened to a single directory. |
37 | $(mkinstalldirs) $(DESTDIR)$(plugin_includedir) | 32 | $(mkinstalldirs) $(DESTDIR)$(plugin_includedir) |