[PATCH] Remove redundant YYLOC global declaration

[PATCH] Remove redundant YYLOC global declaration

[Dirk Mueller]

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-IBi9RG/b67k@public.gmane.org>
---
 dtc-lexer.l | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dtc-lexer.l b/dtc-lexer.l
index 5c6c3fd..b3b7270 100644
--- a/dtc-lexer.l
+++ b/dtc-lexer.l
@@ -23,7 +23,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() */
-- 
2.24.1

Re: [PATCH] Remove redundant YYLOC global declaration

[David Gibson]

[-- Attachment #1: Type: text/plain, Size: 1711 bytes --]

On Tue, Jan 14, 2020 at 06:53:41PM +0100, Dirk Mueller wrote:
> 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-IBi9RG/b67k@public.gmane.org>

Applied, thanks.

> ---
>  dtc-lexer.l | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/dtc-lexer.l b/dtc-lexer.l
> index 5c6c3fd..b3b7270 100644
> --- a/dtc-lexer.l
> +++ b/dtc-lexer.l
> @@ -23,7 +23,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() */

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[PATCH] Remove redundant YYLOC global declaration

[Tom Rini]

On Thu, Jan 30, 2020 at 09:37:15AM +0000, Peter Robinson wrote:

> Same as the upstream fix for building dtc with gcc 10.
> 
> Signed-off-by: Peter Robinson <pbrobinson@gmail.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200130/a5b18e18/attachment.sig>

[PATCH] Remove redundant YYLOC global declaration

[Peter Robinson]

Same as the upstream fix for building dtc with gcc 10.

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
---

The upstream patch is accepted, thread here:
https://www.spinics.net/lists/devicetree-compiler/msg02959.html

 scripts/dtc/dtc-lexer.l | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l
index fd825ebba6..24af549977 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() */
-- 
2.24.1