gdb/ada-exp.y: Remap yydefred

On:

 $ uname -a
 NetBSD gcc70.fsffrance.org 5.1 NetBSD 5.1 (GENERIC) #0: Sat Nov  6 13:19:33 UTC 2010  builds@b6.netbsd.org:/home/builds/ab/netbsd-5-1-RELEASE/amd64/201011061943Z-obj/home/builds/ab/netbsd-5-1-RELEASE/src/sys/arch/amd64/compile/GENERIC amd64

The link fails with:

 (...)
 d-exp.o: In function `parse_number':
 ../../src/gdb/d-exp.y:762: multiple definition of `yydefred'
 ada-exp.o:/home/palves/gdb/build/gdb/ada-lex.c:925: first defined here
 ld: Warning: size of symbol `yydefred' changed from 464 in ada-exp.o to 336 in d-exp.o
 Makefile:1404: recipe for target 'gdb' failed

NetBSD's yacc uses a "yydefred" symbol that we missed renaming in the
Ada parser.  All other gdb parsers do this already.

gdb/ChangeLog:
2016-04-16  Pedro Alves  <palves@redhat.com>

	* ada-exp.y (yydefred): Define as ada_yydefred.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c83cd02bcd1162a699c63c970acf52a4e3bf1aa3..bafbbe6d34de4128fd74e89ae923036a13eb17e5 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2016-04-16  Pedro Alves  <palves@redhat.com>
+
+       * ada-exp.y (yydefred): Define as ada_yydefred.
+
 2016-04-15  Pedro Alves  <palves@redhat.com>
 
        * ada-lang.c (ada_lookup_struct_elt_type): Constify 'type_str' and

diff --git a/gdb/ada-exp.y b/gdb/ada-exp.y
index 0feb900c15adb45e19e0f65cf08854c428c8f1d0..a98bdbcedb1ee83a95772f00b105c5ae6a699257 100644 (file)
--- a/gdb/ada-exp.y
+++ b/gdb/ada-exp.y
@@ -93,6 +93,7 @@
 #define yytoks ada_toks                /* With YYDEBUG defined */
 #define yyname ada_name                /* With YYDEBUG defined */
 #define yyrule ada_rule                /* With YYDEBUG defined */
+#define yydefred ada_yydefred
 #define yyss   ada_yyss
 #define yysslim        ada_yysslim
 #define yyssp  ada_yyssp