aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2025-08-22 15:56:27 -0700
committerH.J. Lu <hjl.tools@gmail.com>2025-08-22 17:56:09 -0700
commitee06d98c5b9161fcaa03c562860d6ec4a8700cd2 (patch)
treeb25b9a7c1ea764498b82873793abe23e35502971
parentdd4394b2493940ce0ec4525a21be4e2e9db483d0 (diff)
downloadglibc-ee06d98c5b9161fcaa03c562860d6ec4a8700cd2.zip
glibc-ee06d98c5b9161fcaa03c562860d6ec4a8700cd2.tar.gz
glibc-ee06d98c5b9161fcaa03c562860d6ec4a8700cd2.tar.bz2
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>
-rw-r--r--Makefile.in2
-rwxr-xr-xconfigure8
-rw-r--r--configure.ac5
3 files changed, 9 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in
index 809aa64..5b872a7 100644
--- 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 a2ab404..1ee3694 100755
--- 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 cababbf..7eec669 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])
-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));