diff options
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-11.2.inc | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/gcc/gcc/0001-Fix-install-path-of-linux64.h.patch | 33 |
2 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-11.2.inc b/meta/recipes-devtools/gcc/gcc-11.2.inc index e352c958de..f07a5be507 100644 --- a/meta/recipes-devtools/gcc/gcc-11.2.inc +++ b/meta/recipes-devtools/gcc/gcc-11.2.inc | |||
@@ -59,6 +59,7 @@ SRC_URI = "\ | |||
59 | file://0037-libatomic-Do-not-enforce-march-on-aarch64.patch \ | 59 | file://0037-libatomic-Do-not-enforce-march-on-aarch64.patch \ |
60 | file://0041-apply-debug-prefix-maps-before-checksumming-DIEs.patch \ | 60 | file://0041-apply-debug-prefix-maps-before-checksumming-DIEs.patch \ |
61 | file://0006-If-CXXFLAGS-contains-something-unsupported-by-the-bu.patch \ | 61 | file://0006-If-CXXFLAGS-contains-something-unsupported-by-the-bu.patch \ |
62 | file://0001-Fix-install-path-of-linux64.h.patch \ | ||
62 | file://0001-CVE-2021-35465.patch \ | 63 | file://0001-CVE-2021-35465.patch \ |
63 | file://0002-CVE-2021-35465.patch \ | 64 | file://0002-CVE-2021-35465.patch \ |
64 | file://0003-CVE-2021-35465.patch \ | 65 | file://0003-CVE-2021-35465.patch \ |
diff --git a/meta/recipes-devtools/gcc/gcc/0001-Fix-install-path-of-linux64.h.patch b/meta/recipes-devtools/gcc/gcc/0001-Fix-install-path-of-linux64.h.patch new file mode 100644 index 0000000000..9201538f0e --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc/0001-Fix-install-path-of-linux64.h.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From 58211c7ceb0510b2a11a7f1da3c7fa968c658749 Mon Sep 17 00:00:00 2001 | ||
2 | From: Andrei Gherzan <andrei.gherzan@huawei.com> | ||
3 | Date: Wed, 22 Dec 2021 12:49:25 +0100 | ||
4 | Subject: [PATCH] Fix install path of linux64.h | ||
5 | |||
6 | We add linux64.h to tm includes[1] as a relative path to B. This patch | ||
7 | adapts the install path of linux64.h to match the include in tm.h. | ||
8 | |||
9 | [1] 0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch | ||
10 | |||
11 | Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com> | ||
12 | |||
13 | Upstream-Status: Inappropriate [configuration] | ||
14 | --- | ||
15 | gcc/Makefile.in | 2 ++ | ||
16 | 1 file changed, 2 insertions(+) | ||
17 | |||
18 | diff --git a/gcc/Makefile.in b/gcc/Makefile.in | ||
19 | index 9b17d120a..d175ec4e3 100644 | ||
20 | --- a/gcc/Makefile.in | ||
21 | +++ b/gcc/Makefile.in | ||
22 | @@ -3693,6 +3693,8 @@ install-plugin: installdirs lang.install-plugin s-header-vars install-gengtype | ||
23 | "$(srcdir)"/config/* | "$(srcdir)"/common/config/* \ | ||
24 | | "$(srcdir)"/c-family/* | "$(srcdir)"/*.def ) \ | ||
25 | base=`echo "$$path" | sed -e "s|$$srcdirstrip/||"`;; \ | ||
26 | + ./linux64.h ) \ | ||
27 | + base=`dirname $$path`;;\ | ||
28 | *) base=`basename $$path` ;; \ | ||
29 | esac; \ | ||
30 | dest=$(plugin_includedir)/$$base; \ | ||
31 | -- | ||
32 | 2.25.1 | ||
33 | |||