Skip to content

Commit 7630760

Browse files
dirkmuellerRobertCNelson
authored andcommitted
scripts/dtc: Remove redundant YYLOC global declaration
commit e33a814 upstream. 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 <[email protected]> Signed-off-by: David Gibson <[email protected]> [robh: cherry-pick from upstream] Cc: [email protected] Signed-off-by: Rob Herring <[email protected]> [nc: Also apply to dtc-lexer.lex.c_shipped due to a lack of e039139, where dtc-lexer.l started being used] Signed-off-by: Nathan Chancellor <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 45495e3 commit 7630760

File tree

2 files changed

+0
-2
lines changed

2 files changed

+0
-2
lines changed

scripts/dtc/dtc-lexer.l

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ LINECOMMENT "//".*\n
3838
#include "srcpos.h"
3939
#include "dtc-parser.tab.h"
4040

41-
YYLTYPE yylloc;
4241
extern bool treesource_error;
4342

4443
/* CAUTION: this will stop working if we ever use yyless() or yyunput() */

scripts/dtc/dtc-lexer.lex.c_shipped

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,6 @@ char *yytext;
631631
#include "srcpos.h"
632632
#include "dtc-parser.tab.h"
633633

634-
YYLTYPE yylloc;
635634
extern bool treesource_error;
636635

637636
/* CAUTION: this will stop working if we ever use yyless() or yyunput() */

0 commit comments

Comments
 (0)