Don't use -Wfree-labels/-Wmissing-parameter-name if unsupported

Don't use -Wfree-labels/-Wmissing-parameter-name for "make check" if
they are unsupported by TEST_CC.

This fixes BZ #33310.

Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
Reviewed-by: Collin Funk <collin.funk1@gmail.com>

diff --git a/Makefile.in b/Makefile.in
index 809aa6443f2624d57fb1bb726ebd5dd755ae36e2..5b872a72a3c51a89ab1a3262e099df81e6837019 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -26,6 +26,8 @@ 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 a2ab404d9b424f7139a2b44f5bb1f86e10c96f04..1ee36947df2bc67ec8d40aa1834877e5803af540 100755 (executable)
--- a/configure
+++ b/configure
@@ -649,8 +649,6 @@ 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
@@ -8086,7 +8084,8 @@ 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
@@ -8146,7 +8145,8 @@ 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 cababbf3f31590e0ad47bb031970f9778f1dc5b4..7eec66933e3bf432467457d7b0abeb5809733aa0 100644 (file)
--- 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])
-AC_SUBST(libc_cv_test_cc_wfree_labels)
+LIBC_CONFIG_VAR([test-cc-option-wfree-labels], [$libc_cv_test_cc_wfree_labels])
 
 LIBC_TRY_CC_AND_TEST_CC_OPTION([for -Wmissing-parameter-name],
   [-Werror -Wmissing-parameter-name],
@@ -1623,7 +1623,8 @@ 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])
-AC_SUBST(libc_cv_test_cc_wmissing_parameter_name)
+LIBC_CONFIG_VAR([test-cc-option-wmissing-parameter-name],
+               [$libc_cv_test_cc_wmissing_parameter_name])
 
 conftest_code="
 void bar (void (*callback) (void));