From patchwork Tue Nov 4 02:08:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Collin Funk X-Patchwork-Id: 123426 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id ECDDC3858434 for ; Tue, 4 Nov 2025 02:09:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org ECDDC3858434 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=lbH7GOhR X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pl1-x629.google.com (mail-pl1-x629.google.com [IPv6:2607:f8b0:4864:20::629]) by sourceware.org (Postfix) with ESMTPS id 0ED47385841F for ; Tue, 4 Nov 2025 02:09:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0ED47385841F Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 0ED47385841F Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::629 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1762222149; cv=none; b=B1u079FO07fsHHbKofZOEFR7M2F/x+a17Oga/rNWyANA6p5dRckhi8CMTYt1HJ8iuoDMGMVmGYUgZdcYoA/3cmZJDLIiWiV+0lPYIuLAAMxnkMKEdhZevMxLj8eZQo2rUq50TtWvAUDW8uaRvhqFU9QXiBwKRrZZL6BRNPT8j+w= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1762222149; c=relaxed/simple; bh=rFgTaP488pyUoB4wTvlXpiQk/cEF9wLpdp0ENJFu9nM=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=MAS5VQ+5AyZONDEuY4LElbaMBzHLmZawW8CE2gqMB1H1aENPqh02O1wz8YIWw5kgicrscfOsIFfXTRfYBpuAX7mHXQAeQ/vHT4y//OvbP1Pp/qwayP1BAHKAfUc7NPBRbpaN2g6rRl1N2klX1qEVKVuaEgEcaY4+pJk3WTF8Zl0= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0ED47385841F Received: by mail-pl1-x629.google.com with SMTP id d9443c01a7336-294fe7c2e69so46229395ad.0 for ; Mon, 03 Nov 2025 18:09:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762222148; x=1762826948; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=51Fcu48Goys1pMTWhMItYp5ty4iUkWTcUDWsqFqC4FE=; b=lbH7GOhRbLDoW5Zq0m96MjDq8jv4i5SqMJ1QQpRBKN2B/KZ49gXdNdUKEFYAMjuO8N FYHOmU04KHQxMXJ4llCaSAF8XX7xDc1MIJDvw0oDQN40/flo6P5hyjWhDUHY+cW0KpdO 0pflKC0HJCVGVxMnXGIBMVoswyz7XhK8aJHbZ2Mi3WOMJVuPaRp45RND2k2hZ+S7bfGO tqPXuYU82+dpqhme05RLpTdDE9W6IHJ57HjGEVjETH3iMJtbuokTQN/UylYa2kZ2NEn3 44gEfJObAiQOHjP2Ahlv/pu13UZ1s57/74OM24oxwQdiDJquR91xhgOaJMj5Qh0Vpnfd jsEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762222148; x=1762826948; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=51Fcu48Goys1pMTWhMItYp5ty4iUkWTcUDWsqFqC4FE=; b=wTioMCn+YLYj8CyU4aJ1PlfxTRKZQpz2oC4Ktjbuar6dT/qm3LEWqwK1vCFoCQKTTj E96ItfGSIOzvrWlpCmfgbdAGK9IqSmPy1ptUh4liOqdA6PuvjoDYUcbLbFBKoO8iYL96 tg+k+bUzFmXpGSWyLoYwfuHZ7VLjJY3/GTfZSNMRb5ykDEXSMYSIYoZAQ+GtV9yXV/mB zZ+Ff55Wpzf8XNcxqe4QGC3pqITgKrq0NYi4Y/843xBQlSAn+EKi/afpu0YVf76FsBIl 4Ks60KOhXmgRGnY/TKHHQKouwWUMrHSbKkoVOdak4axoobcgEnKZ6pKK240WlH+Fi7da 7hhA== X-Gm-Message-State: AOJu0YyaGQpgKC27JiMQqm7/wRuI7nwGGD9iIZB21VoQIcUF4E1gWoNG mQDwuPhZpDtjaEHYYyfIE0GialYJaKi5D9z7oVPQ2xFBGRIkBiTbQBWvUyTI0JOX X-Gm-Gg: ASbGncuwsA7fVYuFHkzg1O8B4KkVAcOad2ex8o8i1882QE3XlnaAZPqpc1VZmiTGbVX uBDZk8jrw2RW7j5zya9OL4JuFxC2VKFiLValWbHGQ0XfYn4HNwK47AwicEDyM3y8DswOmXLw9zv 5LfzJRx8jlx65fmRSjyn27mSxKJjnPwpQjg/sCCS8nNn/uY851OEg7Hi/h6mYfnUSbHn0QOUqIn +bdC7wV84c5lU5OiJDGBzSuB1fJPbtP4Q2eQaYUwcLUKVxXl00Bo/mll6/p8agGIAalx59T2Vf+ XoHUJADkYmAASWP7go0C43LclddpCrv1L3a0HsGCDO60GEEcVWa4jimiktFbhL01rfom9A88KxG LpIrm059P8myl6isng+t5WWAl2vX73Xi1fcUtBOUYQ/mWmip07Cux151zWw== X-Google-Smtp-Source: AGHT+IHpLHI62nnbg2uESzTSSl+FS8VFA06luO3e/s6KtwBITu6SgseIjTs0xjJ7HT54Wj+fZa58UQ== X-Received: by 2002:a17:902:f60c:b0:295:9cb5:ae57 with SMTP id d9443c01a7336-2959cb5b3d6mr66412695ad.60.1762222147789; Mon, 03 Nov 2025 18:09:07 -0800 (PST) Received: from fedora ([2601:646:8081:3770::43bc]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29601a60761sm6022005ad.90.2025.11.03.18.09.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Nov 2025 18:09:07 -0800 (PST) From: Collin Funk To: libc-alpha@sourceware.org Cc: Mark Wielaard , Adhemerval Zanella , Collin Funk Subject: [PATCH] Regenerate charmap-kw.h and locfile-kw.h with gperf 3.3 Date: Mon, 3 Nov 2025 18:08:37 -0800 Message-ID: <32a725241bb59cd88aed1177d88109d3691028c2.1762221977.git.collin.funk1@gmail.com> X-Mailer: git-send-email 2.51.1 MIME-Version: 1.0 X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, 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 X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org In commit 970364dac00b38333e5b2d91c90d11e80141d265 we switched some /*FALLTHROUGH*/ comments to [[fallthrough]] to avoid warnings with Clang. However, since gperf emitted different output the buildbot failed. The buildbot has been updated to use gperf 3.3 which will use __attribute__ ((__fallthrough__)) where needed to avoid warnings [1]. This patch regenerates these files with the same version. [1] https://sourceware.org/pipermail/libc-testresults/2025q4/014123.html --- locale/programs/charmap-kw.h | 34 ++++++++++++++++++++++++++++------ locale/programs/locfile-kw.h | 26 ++++++++++++++++++++++++-- 2 files changed, 52 insertions(+), 8 deletions(-) diff --git a/locale/programs/charmap-kw.h b/locale/programs/charmap-kw.h index 3ae6f2f6f0..c0d8445da5 100644 --- a/locale/programs/charmap-kw.h +++ b/locale/programs/charmap-kw.h @@ -1,4 +1,4 @@ -/* ANSI-C code produced by gperf version 3.1 */ +/* ANSI-C code produced by gperf version 3.3 */ /* Command-line: gperf -acCgopt -k'1,2,5,9,$' -L ANSI-C -N charmap_hash charmap-kw.gperf */ #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ @@ -104,19 +104,34 @@ hash (register const char *str, register size_t len) switch (hval) { default: - hval += asso_values[(unsigned char)str[8]]; - [[fallthrough]]; + hval += asso_values[(unsigned char)str[8]]; +#if (defined __cplusplus && (__cplusplus >= 201703L || (__cplusplus >= 201103L && defined __clang__ && __clang_major__ + (__clang_minor__ >= 9) > 3))) || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 202000L && ((defined __GNUC__ && __GNUC__ >= 10) || (defined __clang__ && __clang_major__ >= 9))) + [[fallthrough]]; +#elif (defined __GNUC__ && __GNUC__ >= 7) || (defined __clang__ && __clang_major__ >= 10) + __attribute__ ((__fallthrough__)); +#endif + /*FALLTHROUGH*/ case 8: case 7: case 6: case 5: hval += asso_values[(unsigned char)str[4]]; - [[fallthrough]]; +#if (defined __cplusplus && (__cplusplus >= 201703L || (__cplusplus >= 201103L && defined __clang__ && __clang_major__ + (__clang_minor__ >= 9) > 3))) || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 202000L && ((defined __GNUC__ && __GNUC__ >= 10) || (defined __clang__ && __clang_major__ >= 9))) + [[fallthrough]]; +#elif (defined __GNUC__ && __GNUC__ >= 7) || (defined __clang__ && __clang_major__ >= 10) + __attribute__ ((__fallthrough__)); +#endif + /*FALLTHROUGH*/ case 4: case 3: case 2: hval += asso_values[(unsigned char)str[1]]; - [[fallthrough]]; +#if (defined __cplusplus && (__cplusplus >= 201703L || (__cplusplus >= 201103L && defined __clang__ && __clang_major__ + (__clang_minor__ >= 9) > 3))) || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 202000L && ((defined __GNUC__ && __GNUC__ >= 10) || (defined __clang__ && __clang_major__ >= 9))) + [[fallthrough]]; +#elif (defined __GNUC__ && __GNUC__ >= 7) || (defined __clang__ && __clang_major__ >= 10) + __attribute__ ((__fallthrough__)); +#endif + /*FALLTHROUGH*/ case 1: hval += asso_values[(unsigned char)str[0]]; break; @@ -127,6 +142,10 @@ hash (register const char *str, register size_t len) const struct keyword_t * charmap_hash (register const char *str, register size_t len) { +#if (defined __GNUC__ && __GNUC__ + (__GNUC_MINOR__ >= 6) > 4) || (defined __clang__ && __clang_major__ >= 3) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wmissing-field-initializers" +#endif static const struct keyword_t wordlist[] = { {""}, {""}, {""}, @@ -171,6 +190,9 @@ charmap_hash (register const char *str, register size_t len) #line 30 "charmap-kw.gperf" {"g0esc", tok_g0esc, 1} }; +#if (defined __GNUC__ && __GNUC__ + (__GNUC_MINOR__ >= 6) > 4) || (defined __clang__ && __clang_major__ >= 3) +#pragma GCC diagnostic pop +#endif if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) { @@ -184,5 +206,5 @@ charmap_hash (register const char *str, register size_t len) return &wordlist[key]; } } - return 0; + return (struct keyword_t *) 0; } diff --git a/locale/programs/locfile-kw.h b/locale/programs/locfile-kw.h index f77cf439ff..ad27de1be9 100644 --- a/locale/programs/locfile-kw.h +++ b/locale/programs/locfile-kw.h @@ -1,4 +1,4 @@ -/* ANSI-C code produced by gperf version 3.1 */ +/* ANSI-C code produced by gperf version 3.3 */ /* Command-line: gperf -acCgopt -k'1,2,5,9,$' -L ANSI-C -N locfile_hash locfile-kw.gperf */ #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ @@ -105,18 +105,33 @@ hash (register const char *str, register size_t len) { default: hval += asso_values[(unsigned char)str[8]]; +#if (defined __cplusplus && (__cplusplus >= 201703L || (__cplusplus >= 201103L && defined __clang__ && __clang_major__ + (__clang_minor__ >= 9) > 3))) || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 202000L && ((defined __GNUC__ && __GNUC__ >= 10) || (defined __clang__ && __clang_major__ >= 9))) [[fallthrough]]; +#elif (defined __GNUC__ && __GNUC__ >= 7) || (defined __clang__ && __clang_major__ >= 10) + __attribute__ ((__fallthrough__)); +#endif + /*FALLTHROUGH*/ case 8: case 7: case 6: case 5: hval += asso_values[(unsigned char)str[4]]; +#if (defined __cplusplus && (__cplusplus >= 201703L || (__cplusplus >= 201103L && defined __clang__ && __clang_major__ + (__clang_minor__ >= 9) > 3))) || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 202000L && ((defined __GNUC__ && __GNUC__ >= 10) || (defined __clang__ && __clang_major__ >= 9))) [[fallthrough]]; +#elif (defined __GNUC__ && __GNUC__ >= 7) || (defined __clang__ && __clang_major__ >= 10) + __attribute__ ((__fallthrough__)); +#endif + /*FALLTHROUGH*/ case 4: case 3: case 2: hval += asso_values[(unsigned char)str[1]]; +#if (defined __cplusplus && (__cplusplus >= 201703L || (__cplusplus >= 201103L && defined __clang__ && __clang_major__ + (__clang_minor__ >= 9) > 3))) || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 202000L && ((defined __GNUC__ && __GNUC__ >= 10) || (defined __clang__ && __clang_major__ >= 9))) [[fallthrough]]; +#elif (defined __GNUC__ && __GNUC__ >= 7) || (defined __clang__ && __clang_major__ >= 10) + __attribute__ ((__fallthrough__)); +#endif + /*FALLTHROUGH*/ case 1: hval += asso_values[(unsigned char)str[0]]; break; @@ -127,6 +142,10 @@ hash (register const char *str, register size_t len) const struct keyword_t * locfile_hash (register const char *str, register size_t len) { +#if (defined __GNUC__ && __GNUC__ + (__GNUC_MINOR__ >= 6) > 4) || (defined __clang__ && __clang_major__ >= 3) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wmissing-field-initializers" +#endif static const struct keyword_t wordlist[] = { {""}, {""}, {""}, @@ -602,6 +621,9 @@ locfile_hash (register const char *str, register size_t len) #line 138 "locfile-kw.gperf" {"am_pm", tok_am_pm, 0} }; +#if (defined __GNUC__ && __GNUC__ + (__GNUC_MINOR__ >= 6) > 4) || (defined __clang__ && __clang_major__ >= 3) +#pragma GCC diagnostic pop +#endif if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) { @@ -615,5 +637,5 @@ locfile_hash (register const char *str, register size_t len) return &wordlist[key]; } } - return 0; + return (struct keyword_t *) 0; }