From patchwork Sat Apr 16 00:25:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Alves X-Patchwork-Id: 11775 Received: (qmail 19792 invoked by alias); 16 Apr 2016 00:26:13 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 19771 invoked by uid 89); 16 Apr 2016 00:26:11 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=BAYES_00, KAM_LAZY_DOMAIN_SECURITY, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=2016-04-16, 20160416, Hx-languages-length:1680, 93, 6 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Sat, 16 Apr 2016 00:26:01 +0000 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 60FA6C01AA22 for ; Sat, 16 Apr 2016 00:26:00 +0000 (UTC) Received: from cascais.lan (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u3G0Px6S005530 for ; Fri, 15 Apr 2016 20:25:59 -0400 From: Pedro Alves To: gdb-patches@sourceware.org Subject: [ob/pushed] gdb/ada-exp.y: Remap yydefred Date: Sat, 16 Apr 2016 01:25:59 +0100 Message-Id: <1460766359-14157-1-git-send-email-palves@redhat.com> 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 * ada-exp.y (yydefred): Define as ada_yydefred. --- gdb/ChangeLog | 4 ++++ gdb/ada-exp.y | 1 + 2 files changed, 5 insertions(+) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c83cd02..bafbbe6 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2016-04-16 Pedro Alves + + * ada-exp.y (yydefred): Define as ada_yydefred. + 2016-04-15 Pedro Alves * 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 0feb900..a98bdbc 100644 --- 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