[PATCH] libstdc++: Use AS_IF in configure.ac

[Jonathan Wakely]

On Thu, 1 Jun 2023 at 16:59, Jonathan Wakely via Libstdc++ <
libstdc++@gcc.gnu.org> wrote:

> Tested x86_64-linux. I'd appreciate a second set of eyeballs on this
> before I push it.
>

Pushed to trunk now.



>
> -- >8 --
>
> This ensures that anything that depends on AC_REQUIRE is hoisted out of
> the conditional block.
>
> The always-false test x"long_double_math_on_this_cpu" = x"yes" condition
> is not altered by this commit, only changed to use the AS_IF syntax.
>
> libstdc++-v3/ChangeLog:
>
>         * configure.ac: Use AS_IF.
>         * configure: Regenerate.
> ---
>  libstdc++-v3/configure    | 1148 +++++++++++++++++++------------------
>  libstdc++-v3/configure.ac |   20 +-
>  2 files changed, 590 insertions(+), 578 deletions(-)
>
> diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac
> index 0abe54e7b9a..f3bcf7affdd 100644
> --- a/libstdc++-v3/configure.ac
> +++ b/libstdc++-v3/configure.ac
> @@ -266,7 +266,7 @@ AC_CHECK_HEADERS([linux/random.h], [], [],
>  AC_CHECK_HEADERS([xlocale.h])
>
>  # Only do link tests if native. Else, hardcode.
> -if $GLIBCXX_IS_NATIVE; then
> +AS_IF([$GLIBCXX_IS_NATIVE],[
>
>    # We can do more elaborate tests that assume a working linker.
>    CANADIAN=no
> @@ -298,7 +298,7 @@ if $GLIBCXX_IS_NATIVE; then
>    # For iconv support.
>    AM_ICONV
>
> -else
> +],[
>
>    # This lets us hard-code the functionality we know we'll have in the
> cross
>    # target environment.  "Let" is a sugar-coated word placed on an
> especially
> @@ -330,7 +330,7 @@ else
>
>    # First, test for "known" system libraries.  We may be using newlib even
>    # on a hosted environment.
> -  if test "x${with_newlib}" = "xyes"; then
> +  AS_IF([test "x${with_newlib}" = "xyes"],[
>      os_include_dir="os/newlib"
>      AC_DEFINE(HAVE_HYPOT)
>
> @@ -386,14 +386,14 @@ else
>          AC_DEFINE(HAVE_USLEEP)
>          ;;
>      esac
> -  elif test "x$with_headers" != "xno"; then
> +  ],[test "x$with_headers" != "xno" ],[
>      GLIBCXX_CROSSCONFIG
> -  fi
> +  ])
>
>    # At some point, we should differentiate between architectures
>    # like x86, which have long double versions, and alpha/powerpc/etc.,
>    # which don't. For the time being, punt.
> -  if test x"long_double_math_on_this_cpu" = x"yes"; then
> +  AS_IF([test x"long_double_math_on_this_cpu" = x"yes"],[
>      AC_DEFINE(HAVE_ACOSL)
>      AC_DEFINE(HAVE_ASINL)
>      AC_DEFINE(HAVE_ATAN2L)
> @@ -417,8 +417,8 @@ else
>      AC_DEFINE(HAVE_SQRTL)
>      AC_DEFINE(HAVE_TANL)
>      AC_DEFINE(HAVE_TANHL)
> -  fi
> -fi
> +  ])
> +])
>
>  # Check for _Unwind_GetIPInfo.
>  GCC_CHECK_UNWIND_GETIPINFO
> @@ -449,7 +449,7 @@ case "$target" in
>  #error no need for long double compatibility
>  #endif
>    ], [ac_ldbl_compat=yes], [ac_ldbl_compat=no])
> -  if test "$ac_ldbl_compat" = yes; then
> +  AS_IF([test "$ac_ldbl_compat" = yes],[
>      AC_DEFINE([_GLIBCXX_LONG_DOUBLE_COMPAT],1,
>               [Define if compatibility should be provided for
> -mlong-double-64.])
>
>  port_specific_symbol_files="\$(top_srcdir)/config/os/gnu-linux/ldbl-extra.ver"
> @@ -485,7 +485,7 @@ case "$target" in
>          fi
>         ;;
>      esac
> -  fi
> +  ])
>  esac
>  AC_SUBST(LONG_DOUBLE_COMPAT_FLAGS)
>  AC_SUBST(LONG_DOUBLE_128_FLAGS)
> --
> 2.40.1
>
>