From patchwork Tue Jan 30 15:02:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 194220 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2087:b0:106:209c:c626 with SMTP id gs7csp1325617dyb; Tue, 30 Jan 2024 08:07:24 -0800 (PST) X-Google-Smtp-Source: AGHT+IGtzgQe3wWtoMMAyVM3qJ9vQlN3TiaN5+6B8ozFzBJrC1bXxJIYmYWzykbFkubyRKiBx+mZ X-Received: by 2002:a05:6214:2346:b0:68c:369e:c62c with SMTP id hu6-20020a056214234600b0068c369ec62cmr7992195qvb.71.1706630844509; Tue, 30 Jan 2024 08:07:24 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706630844; cv=pass; d=google.com; s=arc-20160816; b=ebcQEF5p60S+pqjMP2QAE0UiYu2DJKAAhU8v79JK52vBZLKbqh4lQ8W+K++hreFWJG 0ak9tUKZASnhJHMISbEG5GwDeFW9VCCYYC4wOUCe6Evdfvr+S4AurnHWFhuPL13gy53l 58ngv0+CgmlguIioFJpLcoX+6G7SIAed45CUfr6wO8ZOXbhtqpsNfYVSnSNmnUFxnPcH 2wY4uRnK802QIr86467Gdlb4U+W2cSHsD2ueRSHHDocP93DmQwwmrrXwnYzLz1hvTAB2 nWT1AZ7N3f241DzK7q3gavoF0MgnzfWHqExCe9KVWjI9mAnaEJEsvGg9XBilWXuG9A+Y vOTQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:to:from:dkim-signature :arc-filter:dmarc-filter:delivered-to; bh=A2AUf0k/S+1dPIM4tXQ/zqhCznC6GSw8EhH+MIuC57Q=; fh=sJ+2/4g29YdyXkoRrFZSpsL2zxijepB7X/1rB0LDDh8=; b=WfUOoEYsJgAR8GrJIGwHOo6aUPTx86C4alV8ccstgMbFG+L91mGr+a/NobsDmqUzjR Ev1hlFGapSj8qzCCk5E9teVj/tZWFhtwt8cHrZAiduUtIgB0s8FseauTibmlawHsipy7 U7aSygSTu3ooSwHbOO/x4hPWrFRrrmfoHq3BvhgUzOSQbwdZeeYD12/cw+E0Vo63P63K 6w3sH9q+BgybpeedZWRrg0JfVDqf0O+o3ND45uTSdXtt+bGRJqHMrwG/MuCIk50FfEz7 +fVMyqJDf7K1u7R1RxIzjvporu0XNSI3FIvMK9A4PWohIOblx2N939tihWxjEdNKdy3g 1fQQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=dobP54et; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id a8-20020a056214062800b006869f9ff79fsi10102901qvx.569.2024.01.30.08.07.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 08:07:24 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=dobP54et; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0528F3860001 for ; Tue, 30 Jan 2024 15:04:08 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 821CE3858282 for ; Tue, 30 Jan 2024 15:03:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 821CE3858282 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 821CE3858282 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706627000; cv=none; b=CT5Ryo2f8wwktKOy8NYUxIZfLmZXdEecOH1L+x4Et5/0qRUv5idUeWmIp6HDxhvj9XT+7LFwNhsNBoO0wnfz4l7ggwJkt5mPxNaIsgR5x2M7C1lgy4CdutUAAB1XKM50W5PvjYb4GSqzxTQZdm/mQsnYKTgKYSSNAcMF3x3J45U= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706627000; c=relaxed/simple; bh=tUE/jivo+wn2Hw7uEwwlabmAoJuzBBrzDrzXAn2BtjE=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=n2SwrSiBegnaB3rG/5kuggH/wmYI9pib+MOUch5tKM8jDcKD3B/HU64DT5CjQ7MYO8eA9TDcSwKJw5x+rSPQY0yeDV9QytfFK3qoarO6qZRV4HcDGbOMJgQzQ3rHGvA2RAS41y7X2YLsu2baBYYi9Dv3MO7vnEnhrB4JK1rLJX8= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706626998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A2AUf0k/S+1dPIM4tXQ/zqhCznC6GSw8EhH+MIuC57Q=; b=dobP54etV7KzMVlNMd1wlI8EkBw10tG3+54B4vAP40MwWm4qTQlNTmN6XHCkC9BXFRVUdf ZYGkGu9uofgK5y+5gMWwofwXivtopcdHFQfVa7noPq5gMnPDM5XQzicfD17ZivlwxIg2DI 4C1Mt5Veegyysw8NO9iH7YrDCFmG/dk= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-625-ZPKp8TKbO4SZkS86HD0NkQ-1; Tue, 30 Jan 2024 10:03:15 -0500 X-MC-Unique: ZPKp8TKbO4SZkS86HD0NkQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EF13F884343; Tue, 30 Jan 2024 15:03:14 +0000 (UTC) Received: from localhost (unknown [10.42.28.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id BC69CC0FDCA; Tue, 30 Jan 2024 15:03:14 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [PATCH] mklog: Add lookup for new generated files in libstdc++ Date: Tue, 30 Jan 2024 15:02:35 +0000 Message-ID: <20240130150314.1790592-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789532144774489358 X-GMAIL-MSGID: 1789532144774489358 OK for trunk? -- >8 -- The mklog.py output for libstdc++-v3/include/bits/version.h is awful. Teaching mklog.py that it's generated makes it correctly use "Regenerate" for its changes. We can do the same for the other new generated headers as well. contrib/ChangeLog: * mklog.py (libstdcxx_generated_files): New set. (generate_changelog): Use libstdcxx_generated_files. --- contrib/mklog.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/contrib/mklog.py b/contrib/mklog.py index d764fb41f99..67dfd88393b 100755 --- a/contrib/mklog.py +++ b/contrib/mklog.py @@ -92,6 +92,10 @@ function_extensions = {'.c', '.cpp', '.C', '.cc', '.h', '.inc', '.def', '.md'} # NB: Makefile.in isn't listed as it's not always generated. generated_files = {'aclocal.m4', 'config.h.in', 'configure'} +libstdcxx_generated_files = { 'include/bits/version.h', + 'include/bits/text_encoding-data.h' 'include/bits/unicode-data.h', +} + help_message = """\ Generate ChangeLog template for PATCH. PATCH must be generated using diff(1)'s -up or -cp options @@ -284,6 +288,10 @@ def generate_changelog(data, no_functions=False, fill_pr_titles=False, elif os.path.basename(file.path) in generated_files: out += '\t* %s: Regenerate.\n' % (relative_path) append_changelog_line(out, relative_path, 'Regenerate.') + elif changelog == "libstdc++-v3" and \ + relative_path in libstdcxx_generated_files: + out += '\t* %s: Regenerate.\n' % (relative_path) + append_changelog_line(out, relative_path, 'Regenerate.') else: if not no_functions: for hunk in file: