From d142b7d20538d310abb3f3d8f372988552217ca4 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Fri, 22 Aug 2025 18:03:46 -0700 Subject: [PATCH] Revert "Don't use -Wfree-labels/-Wmissing-parameter-name if unsupported" This reverts commit ee06d98c5b9161fcaa03c562860d6ec4a8700cd2. --- Makefile.in | 2 -- configure | 8 ++++---- configure.ac | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Makefile.in b/Makefile.in index 5b872a72a3..809aa6443f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -26,8 +26,6 @@ check xcheck test: config-cflags-mprefer-vector-width="$(test-config-cflags-mprefer-vector-width)" \ config-cflags-signaling-nans="$(test-config-cflags-signaling-nans)" \ config-cflags-wno-ignored-attributes="$(test-config-cflags-wno-ignored-attributes)" \ - cc-option-wfree-labels="$(test-cc-option-wfree-labels)" \ - cc-option-wmissing-parameter-name="$(test-cc-option-wmissing-parameter-name)" \ enable-cet="$(test-enable-cet)" \ have-mamx-tile="$(test-have-mamx-tile)" \ have-static-pie="$(test-have-static-pie)" \ diff --git a/configure b/configure index 1ee36947df..a2ab404d9b 100755 --- a/configure +++ b/configure @@ -649,6 +649,8 @@ have_selinux have_libcap have_libaudit LIBGD +libc_cv_test_cc_wmissing_parameter_name +libc_cv_test_cc_wfree_labels libc_cv_test_cc_wimplicit_fallthrough libc_cv_cc_loop_to_function libc_cv_test_cc_signaling_nans @@ -8084,8 +8086,7 @@ fi config_vars="$config_vars cc-option-wfree-labels = $libc_cv_cc_wfree_labels" -config_vars="$config_vars -test-cc-option-wfree-labels = $libc_cv_test_cc_wfree_labels" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -Wmissing-parameter-name" >&5 @@ -8145,8 +8146,7 @@ fi config_vars="$config_vars cc-option-wmissing-parameter-name = $libc_cv_cc_wmissing_parameter_name" -config_vars="$config_vars -test-cc-option-wmissing-parameter-name = $libc_cv_test_cc_wmissing_parameter_name" + conftest_code=" void bar (void (*callback) (void)); diff --git a/configure.ac b/configure.ac index 7eec66933e..cababbf3f3 100644 --- a/configure.ac +++ b/configure.ac @@ -1611,7 +1611,7 @@ LIBC_TRY_CC_AND_TEST_CC_OPTION([for -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]) -LIBC_CONFIG_VAR([test-cc-option-wfree-labels], [$libc_cv_test_cc_wfree_labels]) +AC_SUBST(libc_cv_test_cc_wfree_labels) LIBC_TRY_CC_AND_TEST_CC_OPTION([for -Wmissing-parameter-name], [-Werror -Wmissing-parameter-name], @@ -1623,8 +1623,7 @@ LIBC_TRY_CC_AND_TEST_CC_OPTION([for -Wmissing-parameter-name], [libc_cv_test_cc_wmissing_parameter_name=]) LIBC_CONFIG_VAR([cc-option-wmissing-parameter-name], [$libc_cv_cc_wmissing_parameter_name]) -LIBC_CONFIG_VAR([test-cc-option-wmissing-parameter-name], - [$libc_cv_test_cc_wmissing_parameter_name]) +AC_SUBST(libc_cv_test_cc_wmissing_parameter_name) conftest_code=" void bar (void (*callback) (void)); -- 2.47.3