From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id C9D223858D3C for ; Tue, 12 Sep 2023 01:02:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C9D223858D3C Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org From: Sam James To: gdb-patches@sourceware.org Cc: Sam James , Tom de Vries Subject: [PATCH] gdb: Fix an ODR warning with byacc with GDB_YY_REMAP Date: Tue, 12 Sep 2023 01:58:11 +0100 Message-ID: <20230912010238.3086346-1-sam@gentoo.org> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,JMQ_SPF_NEUTRAL,KAM_DMARC_STATUS,SPF_HELO_PASS,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: With byacc, we get an ODR warning with YYSTACKDATA between ada-exp.c.tmp and c-exp.c.tmp. Just include it in the list of symbols we rename. PR gdb/30839 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=30839 Acked-by: Tom de Vries Signed-off-by: Sam James --- Few notes: - Tom commented that it probably constitutes obvious but while I have binutils access, I'm not listed in gdb/MAINTAINERS for write-after-approval, so I'm hesitant. - The top of yy-remap.h does mention that we should fix yacc impls which emit symbols that clash that aren't in the list, but meh. I'm not sure we've even stuck to that rule for the other symbols, and the list is already for non-Bison anyway... gdb/yy-remap.h | 1 + 1 file changed, 1 insertion(+) diff --git a/gdb/yy-remap.h b/gdb/yy-remap.h index 33bee0fabdb..d0125b9ed45 100644 --- a/gdb/yy-remap.h +++ b/gdb/yy-remap.h @@ -85,6 +85,7 @@ #define yystacksize GDB_YY_REMAP (yystacksize) #define yyvs GDB_YY_REMAP (yyvs) #define yyvsp GDB_YY_REMAP (yyvsp) +#define YYSTACKDATA GDB_YY_REMAP (YYSTACKDATA) /* The following are common to all parsers. */ -- 2.42.0