65 lines
2.2 KiB
Diff
65 lines
2.2 KiB
Diff
|
From 4c2e46a9ec9ec477346d9145fdeba8413ae5c515 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Dirk Mueller <dmueller@suse.com>
|
||
|
|
Date: Tue, 14 Jan 2020 18:53:41 +0100
|
||
|
|
Subject: [PATCH] scripts/dtc: Remove redundant YYLOC global declaration
|
||
|
|
|
||
|
|
gcc 10 will default to -fno-common, which causes this error at link
|
||
|
|
time:
|
||
|
|
|
||
|
|
(.text+0x0): multiple definition of `yylloc'; dtc-lexer.lex.o (symbol from plugin):(.text+0x0): first defined here
|
||
|
|
|
||
|
|
This is because both dtc-lexer as well as dtc-parser define the same
|
||
|
|
global symbol yyloc. Before with -fcommon those were merged into one
|
||
|
|
defintion. The proper solution would be to to mark this as "extern",
|
||
|
|
however that leads to:
|
||
|
|
|
||
|
|
dtc-lexer.l:26:16: error: redundant redeclaration of 'yylloc' [-Werror=redundant-decls]
|
||
|
|
26 | extern YYLTYPE yylloc;
|
||
|
|
| ^~~~~~
|
||
|
|
In file included from dtc-lexer.l:24:
|
||
|
|
dtc-parser.tab.h:127:16: note: previous declaration of 'yylloc' was here
|
||
|
|
127 | extern YYLTYPE yylloc;
|
||
|
|
| ^~~~~~
|
||
|
|
cc1: all warnings being treated as errors
|
||
|
|
|
||
|
|
which means the declaration is completely redundant and can just be
|
||
|
|
dropped.
|
||
|
|
|
||
|
|
Signed-off-by: Dirk Mueller <dmueller@suse.com>
|
||
|
|
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
|
||
|
|
[robh: cherry-pick from upstream]
|
||
|
|
Cc: stable@vger.kernel.org
|
||
|
|
Signed-off-by: Rob Herring <robh@kernel.org>
|
||
|
|
---
|
||
|
|
scripts/dtc/dtc-lexer.l | 1 -
|
||
|
|
scripts/dtc/dtc-lexer.lex.c_shipped | 1 -
|
||
|
|
2 files changed, 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l
|
||
|
|
index 790fbf6cf2d7..e4e0f6a8d07b 100644
|
||
|
|
--- 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() */
|
||
|
|
diff --git a/scripts/dtc/dtc-lexer.lex.c_shipped b/scripts/dtc/dtc-lexer.lex.c_shipped
|
||
|
|
index ba525c2f9fc2..750f7a4e3ece 100644
|
||
|
|
--- a/scripts/dtc/dtc-lexer.lex.c_shipped
|
||
|
|
+++ b/scripts/dtc/dtc-lexer.lex.c_shipped
|
||
|
|
@@ -637,7 +637,6 @@ char *yytext;
|
||
|
|
#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() */
|
||
|
|
--
|
||
|
|
2.28.0
|
||
|
|
|