[PATCH] [gdb/build] Fix YYSTYPE and yyalloc odr violation

[PATCH] [gdb/build] Fix YYSTYPE and yyalloc odr violation

[Tom de Vries]

When building gdb with -O2 -flto I run into:
...
ada-exp.c.tmp:576:7: error: type ‘union YYSTYPE’ violates the C++ One \
  Definition Rule [-Werror=odr]
...

Fix this by renaming to ada_YYSTYPE and likewise for other .y files.

Likewise for yyalloc.

Tested on x86_64-linux.

PR build/22395
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=22395
---
 gdb/Makefile.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 8521e8d11c8..ccdd84beea6 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -2509,6 +2509,8 @@ po/$(PACKAGE).pot: force
 	     -e 's/\([ \t;,(]\)free$$/\1xfree/g' \
 	     -e '/^#line.*y.tab.c/d' \
 	     -e 's/YY_NULL/YY_NULLPTR/g' \
+	     -e "s/YYSTYPE/$(subst -,_,$*)_YYSTYPE/g" \
+	     -e "s/yyalloc/$(subst -,_,$*)_yyalloc/g" \
 	  < $@.tmp > $@.new && \
 	  rm -f $@.tmp && \
 	  mv $@.new $@

base-commit: 7a379ae2383034ad79a0c46b87a08ff1facd25c3
-- 
2.35.3

Re: [PATCH] [gdb/build] Fix YYSTYPE and yyalloc odr violation

[Tom Tromey]

>>>>> "Tom" == Tom de Vries via Gdb-patches <gdb-patches@sourceware.org> writes:

Tom> When building gdb with -O2 -flto I run into:
Tom> ...
Tom> ada-exp.c.tmp:576:7: error: type ‘union YYSTYPE’ violates the C++ One \
Tom>   Definition Rule [-Werror=odr]
Tom> ...

Tom> Fix this by renaming to ada_YYSTYPE and likewise for other .y files.

Tom> Likewise for yyalloc.

It is fine by me but did you try it with byacc?
Approved-By: Tom Tromey <tom@tromey.com>

Tom

Re: [PATCH] [gdb/build] Fix YYSTYPE and yyalloc odr violation

[Tom de Vries]

On 8/14/23 18:10, Tom Tromey wrote:
>>>>>> "Tom" == Tom de Vries via Gdb-patches <gdb-patches@sourceware.org> writes:
> 
> Tom> When building gdb with -O2 -flto I run into:
> Tom> ...
> Tom> ada-exp.c.tmp:576:7: error: type ‘union YYSTYPE’ violates the C++ One \
> Tom>   Definition Rule [-Werror=odr]
> Tom> ...
> 
> Tom> Fix this by renaming to ada_YYSTYPE and likewise for other .y files.
> 
> Tom> Likewise for yyalloc.
> 
> It is fine by me but did you try it with byacc?

Thanks for the review.

I hadn't, but have now, and ran into this PR ( 
https://sourceware.org/bugzilla/show_bug.cgi?id=30760 ), reproduces with 
and without this patch.

Committed.

Thanks,
- Tom

> Approved-By: Tom Tromey <tom@tromey.com>
> 
> Tom