From patchwork Thu May 22 12:14:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 112832 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 9D8E63858023 for ; Thu, 22 May 2025 12:18:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9D8E63858023 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Efih5tVs X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id 9DAA93857BB3 for ; Thu, 22 May 2025 12:14:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9DAA93857BB3 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine 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 9DAA93857BB3 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1747916090; cv=none; b=ldUMSp9YYSnVbDLciiRdx02mOcXKlI//Qe35ANL9AQr6ARBb9SPHi8EtoD1msqMi7/K5LGqXIpEUT4YheNxEbFNKqfyEcFu+xIn5re9Xor0dFaG3Kbw0LR1X1/Ko+wtCmTS+0/Re76L8exeHPk7+Zmm36SpiLW7FKYDucOTm02k= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1747916090; c=relaxed/simple; bh=3F7wY9TOp9ZpOwJuKZWiBpya31JeMMIHNFZKetpLKHY=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=CDeqZn7lumNCX2oKi2czvONemn3u0ORcFJ/e9DeIyOQg3vn9aes2bvdxPlUGozps68vGCjpFTFpRiljjCBiJxW5Gatdr3lALU5o9XH2LBZcD9FY+IkF8JYl1dQKECX6FpzgUMW0nLQ5vkNpQYapnCcZhssnKN9OJuLSXfP4T6YE= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9DAA93857BB3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1747916088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=Lf+CCJFaxf+xHoewb8Dyc5fQtyxa2leLYpgFtquRTu8=; b=Efih5tVsBJXT44gxwFDEAgbPZ+h7ocPN9tJQMJ5CNyNDwUQhNlJF6YCst0RuCNzm4vESD5 Ak3cpMc285z6VDFmtgsfPeM8m1npFlEUfUNQoOWX4s9IFBTgA7BcZ6c0A8BgKPRYoWwBBE xeJG4OgZcF6sXYAsle47tjAG61LujPo= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-690-HZIBaw0DMuChJCkCjda8rg-1; Thu, 22 May 2025 08:14:47 -0400 X-MC-Unique: HZIBaw0DMuChJCkCjda8rg-1 X-Mimecast-MFC-AGG-ID: HZIBaw0DMuChJCkCjda8rg_1747916086 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7A0E51956094 for ; Thu, 22 May 2025 12:14:46 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.45.224.17]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 811351944DFF for ; Thu, 22 May 2025 12:14:45 +0000 (UTC) From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH] Turn on -Wfree-labels by default if available Date: Thu, 22 May 2025 14:14:42 +0200 Message-ID: <87o6vkzvt9.fsf@oldenburg.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: vRrGDCaTUxV1heoyEb12AF983XKMKRp5Bxup6tmzgic_1747916086 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.0 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_H5, RCVD_IN_MSPIKE_WL, RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED, SPF_HELO_NONE, SPF_NONE, 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 This flags a hazard for backporting changes to earlier branches. --- Makeconfig | 3 ++- configure | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 11 +++++++++++ 3 files changed, 74 insertions(+), 1 deletion(-) base-commit: 4052d99ead880797cf271309fd87ddd2b95bd353 diff --git a/Makeconfig b/Makeconfig index a2ea4f6a33..d5ca908df4 100644 --- a/Makeconfig +++ b/Makeconfig @@ -892,7 +892,8 @@ host-test-program-cmd = $(host-built-program-cmd) endif # Extra flags to pass to GCC. -+gccwarn := -Wall -Wwrite-strings -Wundef $(cc-option-wimplicit-fallthrough) ++gccwarn := -Wall -Wwrite-strings -Wundef $(cc-option-wimplicit-fallthrough) \ + $(cc-option-wfree-labels) ifeq ($(enable-werror),yes) +gccwarn += -Werror endif diff --git a/configure b/configure index 7decd93baa..c8fd47caae 100755 --- a/configure +++ b/configure @@ -649,6 +649,7 @@ have_selinux have_libcap have_libaudit LIBGD +libc_cv_test_cc_wfree_labels libc_cv_test_cc_wimplicit_fallthrough libc_cv_cc_loop_to_function libc_cv_test_cc_signaling_nans @@ -7968,6 +7969,66 @@ config_vars="$config_vars cc-option-wimplicit-fallthrough = $libc_cv_cc_wimplicit_fallthrough" + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -Wfree-labels" >&5 +printf %s "checking for -Wfree-labels... " >&6; } +if test ${libc_cv_cc_wfree_labels+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if { ac_try='${CC-cc} -Werror -Wfree-labels -xc /dev/null -S -o /dev/null' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; } +then : + libc_cv_cc_wfree_labels=-Wfree-labels +else case e in #( + e) libc_cv_cc_wfree_labels= ;; +esac +fi ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libc_cv_cc_wfree_labels" >&5 +printf "%s\n" "$libc_cv_cc_wfree_labels" >&6; } +if test "$TEST_CC" = "$CC"; then + libc_cv_test_cc_wfree_labels=$libc_cv_cc_wfree_labels +else + +saved_CC="$CC" +CC="$TEST_CC" +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -Wfree-labels in testing" >&5 +printf %s "checking for -Wfree-labels in testing... " >&6; } +if test ${libc_cv_test_cc_wfree_labels+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if { ac_try='${CC-cc} -Werror -Wfree-labels -xc /dev/null -S -o /dev/null' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; } +then : + libc_cv_test_cc_wfree_labels=-Wfree-labels +else case e in #( + e) libc_cv_test_cc_wfree_labels= ;; +esac +fi ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libc_cv_test_cc_wfree_labels" >&5 +printf "%s\n" "$libc_cv_test_cc_wfree_labels" >&6; } + +CC="$saved_CC" + +fi + +config_vars="$config_vars +cc-option-wfree-labels = $libc_cv_cc_wfree_labels" + + conftest_code=" void bar (void (*callback) (void)); int foo (void) diff --git a/configure.ac b/configure.ac index abd3b238d2..6cf66c82a1 100644 --- a/configure.ac +++ b/configure.ac @@ -1575,6 +1575,17 @@ LIBC_CONFIG_VAR([cc-option-wimplicit-fallthrough], [$libc_cv_cc_wimplicit_fallthrough]) AC_SUBST(libc_cv_test_cc_wimplicit_fallthrough) +LIBC_TRY_CC_AND_TEST_CC_OPTION([for -Wfree-labels], + [-Werror -Wfree-labels], + libc_cv_cc_wfree_labels, + [libc_cv_cc_wfree_labels=-Wfree-labels], + [libc_cv_cc_wfree_labels=], + libc_cv_test_cc_wfree_labels, + [libc_cv_test_cc_wfree_labels=-Wfree-labels], + [libc_cv_test_cc_wfree_labels=]) +LIBC_CONFIG_VAR([cc-option-wfree-labels], [$libc_cv_cc_wfree_labels]) +AC_SUBST(libc_cv_test_cc_wfree_labels) + conftest_code=" void bar (void (*callback) (void)); int foo (void)