Skip to content

Commit

Permalink
scripts/dtc: Remove redundant YYLOC global declaration
Browse files Browse the repository at this point in the history
commit e33a814e772cdc36436c8c188d8c42d019fda639 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 <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>
[nc: Also apply to dtc-lexer.lex.c_shipped due to a lack of
     e039139be8c2, where dtc-lexer.l started being used]
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Change-Id: I7f299451e99aab09375883546e47505ec0937c26
  • Loading branch information
dirkmueller authored and Tomoms committed Jun 20, 2020
1 parent 0e394b0 commit 11647f9
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 2 deletions.
1 change: 0 additions & 1 deletion scripts/dtc/dtc-lexer.l
Original file line number Diff line number Diff line change
Expand Up @@ -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() */
Expand Down
1 change: 0 additions & 1 deletion scripts/dtc/dtc-lexer.lex.c_shipped
Original file line number Diff line number Diff line change
Expand Up @@ -631,7 +631,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() */
Expand Down

3 comments on commit 11647f9

@locus-x64
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was trying to build kernel v5.4 and could find scripts/dtc/dtc-lexer.lex.c_shipped file. Rather I found scripts/dtc/dtc-lexer.lex.c file and removed the line as mentioned above YYLTYPE yylloc; and it worked for me.

@ElectricRCAircraftGuy
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rather than removing this line, changing it from YYLTYPE yylloc; to extern YYLTYPE yylloc; should also work. Trying that now.

See: BPI-SINOVOIP/BPI-M4-bsp#4 (comment)

@Ganesh-bandi
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm trying 4.16, after this updation I'm getting below kind of errors.
/tmp/ccaicO42.s:996: Error: selected processor does not support ldrex r2,[r3]' in ARM mode /tmp/ccaicO42.s:998: Error: selected processor does not support strex r1,r2,[r3]' in ARM mode
/tmp/ccaicO42.s:1003: Error: selected processor does not support `dmb ish' in ARM mode

Please sign in to comment.