aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorSven Eckelmann <sven@narfation.org>2021-09-11 21:03:34 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2021-09-13 13:06:02 +0200
commitd059ce28f50aaae7a5b25443e3d50c38b341ef79 (patch)
tree9712a999e7e2829612ee8bd12dc99fad9912b14d /package
parentaf5c8856f8c26da65e4a38787a2f52efd3b9dbcb (diff)
downloadupstream-d059ce28f50aaae7a5b25443e3d50c38b341ef79.tar.gz
upstream-d059ce28f50aaae7a5b25443e3d50c38b341ef79.tar.bz2
upstream-d059ce28f50aaae7a5b25443e3d50c38b341ef79.zip
uboot-kirkwood: Fix build with GCC-10 as host compiler
The package uses the host compiler to build the dtc binary. With gcc-10, the option -fno-common is now the default behavior. Thus multiple definitions of the same variable are now forbidden and results in following error during linking: HOSTLD scripts/dtc/dtc /usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition of `yylloc'; scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here collect2: error: ld returned 1 exit status The easiest workaround is to add the upstream commit 018921ee79d3 ("Remove redundant YYLOC global declaration"). Signed-off-by: Sven Eckelmann <sven@narfation.org>
Diffstat (limited to 'package')
-rw-r--r--package/boot/uboot-kirkwood/patches/002-yylloc-redefinition.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/package/boot/uboot-kirkwood/patches/002-yylloc-redefinition.patch b/package/boot/uboot-kirkwood/patches/002-yylloc-redefinition.patch
new file mode 100644
index 0000000000..134d58439e
--- /dev/null
+++ b/package/boot/uboot-kirkwood/patches/002-yylloc-redefinition.patch
@@ -0,0 +1,23 @@
+From 018921ee79d3f30893614b3b2b63b588d8544f73 Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson@gmail.com>
+Date: Thu, 30 Jan 2020 09:37:15 +0000
+Subject: [PATCH] Remove redundant YYLOC global declaration
+
+Same as the upstream fix for building dtc with gcc 10.
+
+Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
+Origin: upstream, https://github.com/u-boot/u-boot/commit/018921ee79d3f30893614b3b2b63b588d8544f73
+---
+ scripts/dtc/dtc-lexer.l | 1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/scripts/dtc/dtc-lexer.l
++++ b/scripts/dtc/dtc-lexer.l
+@@ -38,7 +38,6 @@ LINECOMMENT "//".*\n
+ #include "srcpos.h"
+ #include "dtc-parser.tab.h"
+
+-YYLTYPE yylloc;
+ extern bool treesource_error;
+
+ /* CAUTION: this will stop working if we ever use yyless() or yyunput() */