On 2023-08-17 I did this: > 2023-08-17 Bruno Haible <br...@clisp.org> > > Recognize the *-*-windows* config triplets introduced on 2023-06-26. > * m4/*.m4: Treat windows* as equivalent to mingw*. > * modules/*: Likewise.
But meanwhile the config triplet *-*-windows-gnu was withdrawn. See https://git.savannah.gnu.org/gitweb/?p=config.git;a=commitdiff;h=28ea239c53a2d5d8800c472bc2452eaa16e37af2 https://lists.gnu.org/archive/html/config-patches/2023-09/msg00046.html Only *-*-windows and *-*-windows-msvc are left. This patch catches up with this change. 2023-10-03 Bruno Haible <br...@clisp.org> Update re *-*-windows*-gnu* config triplets, withdrawn on 2023-09-19. * m4/*.m4: Don't recognize windows*-gnu* as equivalent to mingw*. diff --git a/m4/fma.m4 b/m4/fma.m4 index 22755e8018..16e844a4bf 100644 --- a/m4/fma.m4 +++ b/m4/fma.m4 @@ -1,4 +1,4 @@ -# fma.m4 serial 5 +# fma.m4 serial 6 dnl Copyright (C) 2011-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -171,8 +171,6 @@ AC_DEFUN([gl_FUNC_FMA_WORKS] dnl Otherwise guess no, even on glibc systems. gl_cv_func_fma_works="$gl_cross_guess_normal" case "$host_os" in - windows*-gnu*) - ;; windows*-msvc*) gl_cv_func_fma_works="guessing yes" ;; diff --git a/m4/fmaf.m4 b/m4/fmaf.m4 index 1f7d2b79eb..b730b82619 100644 --- a/m4/fmaf.m4 +++ b/m4/fmaf.m4 @@ -1,4 +1,4 @@ -# fmaf.m4 serial 7 +# fmaf.m4 serial 8 dnl Copyright (C) 2011-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -190,8 +190,6 @@ AC_DEFUN([gl_FUNC_FMAF_WORKS] dnl Otherwise guess no, even on glibc systems. gl_cv_func_fmaf_works="$gl_cross_guess_normal" case "$host_os" in - windows*-gnu*) - ;; windows*-msvc*) gl_cv_func_fmaf_works="guessing yes" ;; diff --git a/m4/fmal.m4 b/m4/fmal.m4 index 8aade89fc7..74f5bea170 100644 --- a/m4/fmal.m4 +++ b/m4/fmal.m4 @@ -1,4 +1,4 @@ -# fmal.m4 serial 9 +# fmal.m4 serial 10 dnl Copyright (C) 2011-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -388,8 +388,6 @@ AC_DEFUN([gl_FUNC_FMAL_WORKS] dnl Otherwise guess no, even on glibc systems. gl_cv_func_fmal_works="$gl_cross_guess_normal" case "$host_os" in - windows*-gnu*) - ;; windows*-msvc*) gl_cv_func_fmal_works="guessing yes" ;; diff --git a/m4/frexp.m4 b/m4/frexp.m4 index d38d1f422b..0293765c59 100644 --- a/m4/frexp.m4 +++ b/m4/frexp.m4 @@ -1,4 +1,4 @@ -# frexp.m4 serial 17 +# frexp.m4 serial 18 dnl Copyright (C) 2007-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -165,10 +165,7 @@ AC_DEFUN([gl_FUNC_FREXP_WORKS] [gl_cv_func_frexp_works=no], [case "$host_os" in netbsd* | irix*) gl_cv_func_frexp_works="guessing no" ;; - # Guess yes with MSVC, no with mingw. - windows*-gnu*) - gl_cv_func_frexp_works="guessing no" - ;; + # Guess yes with MSVC, no with mingw. windows*-msvc*) gl_cv_func_frexp_works="guessing yes" ;; diff --git a/m4/frexpf.m4 b/m4/frexpf.m4 index 2857dcc875..6f0565f803 100644 --- a/m4/frexpf.m4 +++ b/m4/frexpf.m4 @@ -1,4 +1,4 @@ -# frexpf.m4 serial 7 +# frexpf.m4 serial 8 dnl Copyright (C) 2011-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -89,10 +89,7 @@ AC_DEFUN([gl_FUNC_FREXPF_WORKS] [gl_cv_func_frexpf_works=no], [case "$host_os" in irix*) gl_cv_func_frexpf_works="guessing no" ;; - # Guess yes with MSVC, no with mingw. - windows*-gnu*) - gl_cv_func_frexpf_works="guessing no" - ;; + # Guess yes with MSVC, no with mingw. windows*-msvc*) gl_cv_func_frexpf_works="guessing yes" ;; diff --git a/m4/locale_h.m4 b/m4/locale_h.m4 index f7281ac0c8..9410e1cf91 100644 --- a/m4/locale_h.m4 +++ b/m4/locale_h.m4 @@ -1,4 +1,4 @@ -# locale_h.m4 serial 29 +# locale_h.m4 serial 30 dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -59,9 +59,6 @@ AC_DEFUN_ONCE([gl_LOCALE_H] dnl On native Windows with MSVC, merely define these member names as macros. dnl This avoids trouble in C++ mode. case "$host_os" in - windows*-gnu*) - REPLACE_STRUCT_LCONV=1 - ;; windows*-msvc*) ;; mingw* | windows*) diff --git a/m4/logb.m4 b/m4/logb.m4 index 8a4ad0d449..ec65bef49b 100644 --- a/m4/logb.m4 +++ b/m4/logb.m4 @@ -135,9 +135,6 @@ AC_DEFUN([gl_FUNC_LOGB_WORKS] [case "$host_os" in *gnu* | solaris* | cygwin*) gl_cv_func_logb_works="guessing no" ;; # Guess yes on MSVC, no on mingw. - windows*-gnu*) - gl_cv_func_logb_works="guessing no" - ;; windows*-msvc*) gl_cv_func_logb_works="guessing yes" ;; diff --git a/m4/logbf.m4 b/m4/logbf.m4 index 10fadaf11c..05ee0bce31 100644 --- a/m4/logbf.m4 +++ b/m4/logbf.m4 @@ -1,4 +1,4 @@ -# logbf.m4 serial 4 +# logbf.m4 serial 5 dnl Copyright (C) 2012-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -76,9 +76,6 @@ AC_DEFUN([gl_FUNC_LOGBF_WORKS] [case "$host_os" in *gnu* | solaris*) gl_cv_func_logbf_works="guessing no" ;; # Guess yes on MSVC, no on mingw. - windows*-gnu*) - gl_cv_func_logbf_works="guessing no" - ;; windows*-msvc*) gl_cv_func_logbf_works="guessing yes" ;; diff --git a/m4/mkdir.m4 b/m4/mkdir.m4 index 79c5e2c740..69f72ef1c6 100644 --- a/m4/mkdir.m4 +++ b/m4/mkdir.m4 @@ -1,4 +1,4 @@ -# serial 19 +# serial 20 # Copyright (C) 2001, 2003-2004, 2006, 2008-2023 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation @@ -32,7 +32,6 @@ AC_DEFUN([gl_FUNC_MKDIR] # Guess yes on glibc systems. *-gnu* | gnu*) gl_cv_func_mkdir_trailing_slash_works="guessing yes" ;; # Guess yes on MSVC, no on mingw. - windows*-gnu*) gl_cv_func_mkdir_trailing_slash_works="guessing no" ;; windows*-msvc*) gl_cv_func_mkdir_trailing_slash_works="guessing yes" ;; mingw* | windows*) AC_EGREP_CPP([Known], [ #ifdef _MSC_VER diff --git a/m4/modf.m4 b/m4/modf.m4 index 7ed6e4f357..a5c988b02e 100644 --- a/m4/modf.m4 +++ b/m4/modf.m4 @@ -1,4 +1,4 @@ -# modf.m4 serial 11 +# modf.m4 serial 12 dnl Copyright (C) 2011-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -66,7 +66,6 @@ AC_DEFUN([gl_FUNC_MODF] # Guess yes on musl systems. *-musl* | midipix*) gl_cv_func_modf_ieee="guessing yes" ;; # Guess yes on MSVC, no on mingw. - windows*-gnu*) gl_cv_func_modf_ieee="guessing no" ;; windows*-msvc*) gl_cv_func_modf_ieee="guessing yes" ;; mingw* | windows*) AC_EGREP_CPP([Known], [ #ifdef _MSC_VER diff --git a/m4/modff.m4 b/m4/modff.m4 index 36752fdd28..55626fc8b8 100644 --- a/m4/modff.m4 +++ b/m4/modff.m4 @@ -1,4 +1,4 @@ -# modff.m4 serial 13 +# modff.m4 serial 14 dnl Copyright (C) 2011-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -74,7 +74,6 @@ AC_DEFUN([gl_FUNC_MODFF] # Guess yes on musl systems. *-musl* | midipix*) gl_cv_func_modff_ieee="guessing yes" ;; # Guess yes on MSVC, no on mingw. - windows*-gnu*) gl_cv_func_modff_ieee="guessing no" ;; windows*-msvc*) gl_cv_func_modff_ieee="guessing yes" ;; mingw* | windows*) AC_EGREP_CPP([Known], [ #ifdef _MSC_VER diff --git a/m4/modfl.m4 b/m4/modfl.m4 index ddefb07f68..56220569bb 100644 --- a/m4/modfl.m4 +++ b/m4/modfl.m4 @@ -1,4 +1,4 @@ -# modfl.m4 serial 10 +# modfl.m4 serial 11 dnl Copyright (C) 2011-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -68,7 +68,6 @@ AC_DEFUN([gl_FUNC_MODFL] # Guess yes on musl systems. *-musl* | midipix*) gl_cv_func_modfl_ieee="guessing yes" ;; # Guess yes on MSVC, no on mingw. - windows*-gnu*) gl_cv_func_modfl_ieee="guessing no" ;; windows*-msvc*) gl_cv_func_modfl_ieee="guessing yes" ;; mingw* | windows*) AC_EGREP_CPP([Known], [ #ifdef _MSC_VER diff --git a/m4/printf.m4 b/m4/printf.m4 index 3be48277a6..d0d15eb969 100644 --- a/m4/printf.m4 +++ b/m4/printf.m4 @@ -1,4 +1,4 @@ -# printf.m4 serial 85 +# printf.m4 serial 86 dnl Copyright (C) 2003, 2007-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -86,7 +86,6 @@ AC_DEFUN([gl_PRINTF_SIZES_C99] linux*-android*) gl_cv_func_printf_sizes_c99="guessing yes";; changequote([,])dnl # Guess yes on MSVC, no on mingw. - windows*-gnu*) gl_cv_func_printf_sizes_c99="guessing no" ;; windows*-msvc*) gl_cv_func_printf_sizes_c99="guessing yes" ;; mingw* | windows*) AC_EGREP_CPP([Known], [ #ifdef _MSC_VER @@ -230,7 +229,6 @@ AC_DEFUN([gl_PRINTF_LONG_DOUBLE] # Guess yes on Android. linux*-android*) gl_cv_func_printf_long_double="guessing yes";; # Guess yes on MSVC, no on mingw. - windows*-gnu*) gl_cv_func_printf_long_double="guessing no" ;; windows*-msvc*) gl_cv_func_printf_long_double="guessing yes" ;; mingw* | windows*) AC_EGREP_CPP([Known], [ #ifdef _MSC_VER @@ -358,7 +356,6 @@ AC_DEFUN([gl_PRINTF_INFINITE] linux*-android*) gl_cv_func_printf_infinite="guessing no";; changequote([,])dnl # Guess yes on MSVC, no on mingw. - windows*-gnu*) gl_cv_func_printf_infinite="guessing no" ;; windows*-msvc*) gl_cv_func_printf_infinite="guessing yes" ;; mingw* | windows*) AC_EGREP_CPP([Known], [ #ifdef _MSC_VER @@ -574,7 +571,6 @@ AC_DEFUN([gl_PRINTF_INFINITE_LONG_DOUBLE] linux*-android*) gl_cv_func_printf_infinite_long_double="guessing no";; changequote([,])dnl # Guess yes on MSVC, no on mingw. - windows*-gnu*) gl_cv_func_printf_infinite_long_double="guessing no" ;; windows*-msvc*) gl_cv_func_printf_infinite_long_double="guessing yes" ;; mingw* | windows*) AC_EGREP_CPP([Known], [ #ifdef _MSC_VER @@ -865,7 +861,6 @@ AC_DEFUN([gl_PRINTF_DIRECTIVE_F] linux*-android*) gl_cv_func_printf_directive_f="guessing no";; changequote([,])dnl # Guess yes on MSVC, no on mingw. - windows*-gnu*) gl_cv_func_printf_directive_f="guessing no" ;; windows*-msvc*) gl_cv_func_printf_directive_f="guessing yes" ;; mingw* | windows*) AC_EGREP_CPP([Known], [ #ifdef _MSC_VER @@ -1629,7 +1624,6 @@ AC_DEFUN_ONCE([gl_SNPRINTF_RETVAL_C99] linux*-android*) gl_cv_func_snprintf_retval_c99="guessing yes";; changequote([,])dnl # Guess yes on MSVC, no on mingw. - windows*-gnu*) gl_cv_func_snprintf_retval_c99="guessing no" ;; windows*-msvc*) gl_cv_func_snprintf_retval_c99="guessing yes" ;; mingw* | windows*) AC_EGREP_CPP([Known], [ #ifdef _MSC_VER diff --git a/m4/round.m4 b/m4/round.m4 index 4d6290fdb7..de33ec87b3 100644 --- a/m4/round.m4 +++ b/m4/round.m4 @@ -1,4 +1,4 @@ -# round.m4 serial 25 +# round.m4 serial 26 dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -62,7 +62,6 @@ AC_DEFUN([gl_FUNC_ROUND] [case "$host_os" in netbsd* | aix*) gl_cv_func_round_works="guessing no" ;; # Guess yes on MSVC, no on mingw. - windows*-gnu*) gl_cv_func_round_works="guessing no" ;; windows*-msvc*) gl_cv_func_round_works="guessing yes" ;; mingw* | windows*) AC_EGREP_CPP([Known], [ #ifdef _MSC_VER @@ -120,7 +119,6 @@ AC_DEFUN([gl_FUNC_ROUND] # Guess yes on musl systems. *-musl* | midipix*) gl_cv_func_round_ieee="guessing yes" ;; # Guess yes on MSVC, no on mingw. - windows*-gnu*) gl_cv_func_round_ieee="guessing no" ;; windows*-msvc*) gl_cv_func_round_ieee="guessing yes" ;; mingw* | windows*) AC_EGREP_CPP([Known], [ #ifdef _MSC_VER diff --git a/m4/roundf.m4 b/m4/roundf.m4 index b8959163ce..5dc0fb9569 100644 --- a/m4/roundf.m4 +++ b/m4/roundf.m4 @@ -1,4 +1,4 @@ -# roundf.m4 serial 26 +# roundf.m4 serial 27 dnl Copyright (C) 2007-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -57,10 +57,7 @@ AC_DEFUN([gl_FUNC_ROUNDF] return (x < 0.5f && roundf (x) != 0.0f); }]])], [gl_cv_func_roundf_works=yes], [gl_cv_func_roundf_works=no], [case "$host_os" in - # Guess yes on MSVC, no on mingw. - windows*-gnu*) - gl_cv_func_roundf_works="guessing no" - ;; + # Guess yes on MSVC, no on mingw. windows*-msvc*) gl_cv_func_roundf_works="guessing yes" ;; @@ -127,7 +124,6 @@ AC_DEFUN([gl_FUNC_ROUNDF] # Guess yes on musl systems. *-musl* | midipix*) gl_cv_func_roundf_ieee="guessing yes" ;; # Guess yes on MSVC, no on mingw. - windows*-gnu*) gl_cv_func_roundf_ieee="guessing no" ;; windows*-msvc*) gl_cv_func_roundf_ieee="guessing yes" ;; mingw* | windows*) AC_EGREP_CPP([Known], [ #ifdef _MSC_VER
