diff options
author | Steve Sakoman <steve@sakoman.com> | 2020-06-17 12:43:09 -1000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-06-23 11:40:46 +0100 |
commit | ba11b6e210267bdf4858c5ced2c497efd3f72269 (patch) | |
tree | 02a81d80b35ec11a9258ca35f3652a12251507bb /meta | |
parent | bce8aeaf3a9a37f35107136744fef9ef7ea5158f (diff) | |
download | poky-ba11b6e210267bdf4858c5ced2c497efd3f72269.tar.gz |
u-boot-tools: backport patch from upstream to fix gcc 10 builds
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-bsp/u-boot/u-boot-tools/remove-redundant-yyloc-global.patch | 27 | ||||
-rw-r--r-- | meta/recipes-bsp/u-boot/u-boot-tools_2020.01.bb | 2 |
2 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-bsp/u-boot/u-boot-tools/remove-redundant-yyloc-global.patch b/meta/recipes-bsp/u-boot/u-boot-tools/remove-redundant-yyloc-global.patch new file mode 100644 index 0000000000..2a184e57e2 --- /dev/null +++ b/meta/recipes-bsp/u-boot/u-boot-tools/remove-redundant-yyloc-global.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | From 018921ee79d3f30893614b3b2b63b588d8544f73 Mon Sep 17 00:00:00 2001 | ||
2 | From: Peter Robinson <pbrobinson@gmail.com> | ||
3 | Date: Thu, 30 Jan 2020 09:37:15 +0000 | ||
4 | Subject: [PATCH] Remove redundant YYLOC global declaration | ||
5 | |||
6 | Same as the upstream fix for building dtc with gcc 10. | ||
7 | |||
8 | Signed-off-by: Peter Robinson <pbrobinson@gmail.com> | ||
9 | --- | ||
10 | scripts/dtc/dtc-lexer.l | 1 - | ||
11 | 1 file changed, 1 deletion(-) | ||
12 | |||
13 | diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l | ||
14 | index fd825ebba6..24af549977 100644 | ||
15 | --- a/scripts/dtc/dtc-lexer.l | ||
16 | +++ b/scripts/dtc/dtc-lexer.l | ||
17 | @@ -38,7 +38,6 @@ LINECOMMENT "//".*\n | ||
18 | #include "srcpos.h" | ||
19 | #include "dtc-parser.tab.h" | ||
20 | |||
21 | -YYLTYPE yylloc; | ||
22 | extern bool treesource_error; | ||
23 | |||
24 | /* CAUTION: this will stop working if we ever use yyless() or yyunput() */ | ||
25 | -- | ||
26 | 2.26.2 | ||
27 | |||
diff --git a/meta/recipes-bsp/u-boot/u-boot-tools_2020.01.bb b/meta/recipes-bsp/u-boot/u-boot-tools_2020.01.bb index 7eaf721ca8..ca8876ff98 100644 --- a/meta/recipes-bsp/u-boot/u-boot-tools_2020.01.bb +++ b/meta/recipes-bsp/u-boot/u-boot-tools_2020.01.bb | |||
@@ -1,2 +1,4 @@ | |||
1 | require u-boot-common.inc | 1 | require u-boot-common.inc |
2 | require u-boot-tools.inc | 2 | require u-boot-tools.inc |
3 | |||
4 | SRC_URI += "file://remove-redundant-yyloc-global.patch" | ||