From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id qln9IKD4zWoiHQAAWB0awg (envelope-from ) for ; Tue, 13 Oct 2026 05:23:44 -0400 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=dOjFXbzE; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=YgmfOaOR; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=dOjFXbzE; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=YgmfOaOR; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 7045E1E051; Tue, 13 Oct 2026 05:23:44 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [38.145.34.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 9F7211E047 for ; Tue, 13 Oct 2026 05:23:43 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 042034BA23E6 for ; Tue, 13 Oct 2026 09:23:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 042034BA23E6 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=dOjFXbzE; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=YgmfOaOR; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=dOjFXbzE; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=YgmfOaOR Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2a07:de40:b251:101:10:150:64:1]) by sourceware.org (Postfix) with ESMTPS id AA8664BA23C3 for ; Tue, 13 Oct 2026 09:23:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AA8664BA23C3 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org AA8664BA23C3 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:1 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1791883394; cv=none; b=kgpqm9i77S8oUo6x2bSgIBAzH7hrpCts/pOByKtqEjx/YfgVeYQY+Osd4CDcF8lzHlrXittuUVowdSwUFfzc8GQ58h/XpEv3W75UUULp4NCP3nhjXttUjVQFe7lLDd/ihpLdXjdcJm17Pzfho+7mvPDT2PVUSe7AzC16tdA+vRc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1791883394; c=relaxed/simple; bh=YE63YRd9UhuyOLNGfGpYq9N0XlAjqP6+WEjHSVBBdVo=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature: Message-ID:Date:MIME-Version:Subject:To:From; b=Y/B4Uioh9O4MRlM0aFR5FaYJ25VwFTNIWcu+RMnKpA0YRHnXyZsart0zKK3FWhu2L4QNyT8xkY6d4ujeo+Xl8CCa95f5DZIeie7PP6Q/kIG+zLmi97TKomPw57PWzgDQpWCB1mjbajHeM449KQe1pxtxWL9/llPnn4uFOJs+vQo= ARC-Authentication-Results: i=1; sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=dOjFXbzE; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=YgmfOaOR; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=dOjFXbzE; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=YgmfOaOR DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AA8664BA23C3 Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 5526A21F07; Tue, 13 Oct 2026 09:23:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1791883393; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7DmOW/HQqaWH7cKwEyQC+NfNsVSHDMphmPtp6+j3REs=; b=dOjFXbzErMZU4h5XXWY6uTZvKd1aof4zOFP39yBD3YAKepsKsI2PplYQnMGde7G+U3KbG+ w3yx6YHXQ+ydNgpfUlQdJiQab5v1fxZkxlwZpGYi3tKw2pZR2eQd+yuNkqjYN4pTFfYAq2 mNBmkVv2y5wQb4zUEtvNn8YMaTTGd2c= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1791883393; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7DmOW/HQqaWH7cKwEyQC+NfNsVSHDMphmPtp6+j3REs=; b=YgmfOaORm2wAHtRRD0pXNo9eSOmsQZkZ5uo33apJdJ7KQUJHdymj25lH1aYG5tiL78TWeF fDnPIKvnXyoPG2AQ== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1791883393; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7DmOW/HQqaWH7cKwEyQC+NfNsVSHDMphmPtp6+j3REs=; b=dOjFXbzErMZU4h5XXWY6uTZvKd1aof4zOFP39yBD3YAKepsKsI2PplYQnMGde7G+U3KbG+ w3yx6YHXQ+ydNgpfUlQdJiQab5v1fxZkxlwZpGYi3tKw2pZR2eQd+yuNkqjYN4pTFfYAq2 mNBmkVv2y5wQb4zUEtvNn8YMaTTGd2c= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1791883393; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7DmOW/HQqaWH7cKwEyQC+NfNsVSHDMphmPtp6+j3REs=; b=YgmfOaORm2wAHtRRD0pXNo9eSOmsQZkZ5uo33apJdJ7KQUJHdymj25lH1aYG5tiL78TWeF fDnPIKvnXyoPG2AQ== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 1FB7F13341; Tue, 13 Oct 2026 09:23:13 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id OBG0NoD4zWopYAAAD6G6ig (envelope-from ); Tue, 13 Oct 2026 09:23:13 +0000 Message-ID: <89c300fa-77b0-4524-b3ee-11d58af2125c@suse.de> Date: Tue, 13 Oct 2026 11:23:12 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 1/2] gdb: use XML_GetCurrentLineNumber64 with expat >= 2.9.0 To: Simon Marchi , gdb-patches@sourceware.org References: <20261011133136.472634-1-simon.marchi@efficios.com> Content-Language: en-US From: Tom de Vries In-Reply-To: <20261011133136.472634-1-simon.marchi@efficios.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spamd-Result: default: False [-4.28 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-0.99)[-0.990]; NEURAL_HAM_SHORT(-0.20)[-0.999]; MIME_GOOD(-0.10)[text/plain]; XM_UA_NO_VERSION(0.01)[]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_TLS_ALL(0.00)[]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email,imap1.dmz-prg2.suse.org:helo] X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org On 10/11/26 3:31 PM, Simon Marchi wrote: > When building against expat 2.9.0, I get: > > CXX xml-support.o > /home/smarchi/src/binutils-gdb/gdb/xml-support.c:182:39: error: 'XML_Size XML_GetCurrentLineNumber(XML_Parser)' is deprecated: please use XML_GetCurrentLineNumber64 instead [-Werror=deprecated-declarations] > 182 | int line = XML_GetCurrentLineNumber (m_expat_parser); > | ~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~ > > The functions that return XML_Size were deprecated in favor of the new > functions, with suffix 64, that return uint64_t. > > Add a gdb_xml_get_current_line_number wrapper in gdb_expat.h, which > calls XML_GetCurrentLineNumber64 with expat 2.9.0 and later, and > XML_GetCurrentLineNumber otherwise. Use it in xml-support.c. > > The uint64_t gets truncated when converted to int, but that was already > true before, as XML_Size is 64-bits when building on an arch where > unsigned long is 64-bits. > Hi Simon. I ran into the same issue on Tumbleweed. I applied this series, and I managed to complete the build. Both patches LGTM. Reviewed-By: Tom de Vries Thanks, - Tom > Change-Id: I31a0657702cf45d9d7572276d5c8cc37aed41f79 > --- > gdb/gdb_expat.h | 16 ++++++++++++++++ > gdb/xml-support.c | 4 ++-- > 2 files changed, 18 insertions(+), 2 deletions(-) > > diff --git a/gdb/gdb_expat.h b/gdb/gdb_expat.h > index 1feac7f764c0..756cf81be95c 100644 > --- a/gdb/gdb_expat.h > +++ b/gdb/gdb_expat.h > @@ -35,4 +35,20 @@ > #define XMLCALL > #endif > > +/* Return the line number of PARSER's current position. > + > + Expat 2.9.0 deprecates XML_GetCurrentLineNumber in favor of > + XML_GetCurrentLineNumber64. */ > + > +static inline std::uint64_t > +gdb_xml_get_current_line_number (XML_Parser parser) > +{ > +#if (XML_MAJOR_VERSION > 2 \ > + || (XML_MAJOR_VERSION == 2 && XML_MINOR_VERSION >= 9)) > + return XML_GetCurrentLineNumber64 (parser); > +#else > + return XML_GetCurrentLineNumber (parser); > +#endif > +} > + > #endif /* GDB_GDB_EXPAT_H */ > diff --git a/gdb/xml-support.c b/gdb/xml-support.c > index d806b53c9fa2..7d86dbb8c698 100644 > --- a/gdb/xml-support.c > +++ b/gdb/xml-support.c > @@ -179,7 +179,7 @@ gdb_xml_body_text (void *data, const XML_Char *text, int length) > void > gdb_xml_parser::vdebug (const char *format, va_list ap) > { > - int line = XML_GetCurrentLineNumber (m_expat_parser); > + int line = gdb_xml_get_current_line_number (m_expat_parser); > > std::string message = string_vprintf (format, ap); > if (line) > @@ -208,7 +208,7 @@ gdb_xml_debug (struct gdb_xml_parser *parser, const char *format, ...) > void > gdb_xml_parser::verror (const char *format, va_list ap) > { > - int line = XML_GetCurrentLineNumber (m_expat_parser); > + int line = gdb_xml_get_current_line_number (m_expat_parser); > > m_last_line = line; > throw_verror (XML_PARSE_ERROR, format, ap); > > base-commit: 0aeb555307247b71116fd063f436d9311aadfbe0