From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id BF3483856258; Tue, 10 May 2022 18:25:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BF3483856258 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc/azanella/clang] powerpc: Replace AC_LANG_PROGRAM with AC_TRY_COMMAND X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/azanella/clang X-Git-Oldrev: 7e90d9a8fdf004d13dd0390b75e1c9472458b2b9 X-Git-Newrev: e80dad4464d2b7d8d7979e72774e7cfe11832115 Message-Id: <20220510182509.BF3483856258@sourceware.org> Date: Tue, 10 May 2022 18:25:09 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 May 2022 18:25:09 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=e80dad4464d2b7d8d7979e72774e7cfe11832115 commit e80dad4464d2b7d8d7979e72774e7cfe11832115 Author: Adhemerval Zanella Date: Wed Mar 16 13:58:16 2022 -0300 powerpc: Replace AC_LANG_PROGRAM with AC_TRY_COMMAND The IBM long double configure checks uses function, which turn in nested functions by AC_LANG_PROGRAM. If the compiler does not supported nested function, the test always fail. Diff: --- sysdeps/unix/sysv/linux/powerpc/configure | 59 +++++++++++----------------- sysdeps/unix/sysv/linux/powerpc/configure.ac | 42 +++++++++++--------- 2 files changed, 47 insertions(+), 54 deletions(-) diff --git a/sysdeps/unix/sysv/linux/powerpc/configure b/sysdeps/unix/sysv/linux/powerpc/configure index 7183573bc0..9000c0c98c 100644 --- a/sysdeps/unix/sysv/linux/powerpc/configure +++ b/sysdeps/unix/sysv/linux/powerpc/configure @@ -1,36 +1,29 @@ # This file is generated from configure.ac by Autoconf. DO NOT EDIT! # Local configure fragment for sysdeps/unix/sysv/linux/powerpc/. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC $CFLAGS -mlong-double-128 uses IBM extended format" >&5 $as_echo_n "checking whether $CC $CFLAGS -mlong-double-128 uses IBM extended format... " >&6; } if ${libc_cv_mlong_double_128ibm+:} false; then : $as_echo_n "(cached) " >&6 else - save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS -mlong-double-128" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + cat > conftest.c < -int -main () -{ - #if LDBL_MANT_DIG != 106 # error "compiler doesn't implement IBM extended format of long double" #endif long double foobar (long double x) { return x; } - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +EOF +libc_cv_mlong_double_128ibm=no +if { ac_try='${CC-cc} $CFLAGS -mlong-double-128 $CPPFLAGS $LDFLAGS -nostdlib $no_ssp -c conftest.c 1>&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; } +then libc_cv_mlong_double_128ibm=yes -else - libc_cv_mlong_double_128ibm=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -CFLAGS="$save_CFLAGS" +rm -f conftest* fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_mlong_double_128ibm" >&5 $as_echo "$libc_cv_mlong_double_128ibm" >&6; } @@ -41,30 +34,24 @@ $as_echo_n "checking whether $CC $CFLAGS supports -mabi=ibmlongdouble... " >&6; if ${libc_cv_mabi_ibmlongdouble+:} false; then : $as_echo_n "(cached) " >&6 else - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -mlong-double-128 -mabi=ibmlongdouble" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + cat > conftest.c < -int -main () -{ - #if LDBL_MANT_DIG != 106 # error "compiler doesn't implement IBM extended format of long double" #endif long double foobar (long double x) { return x; } - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - libc_cv_mabi_ibmlongdouble=yes -else +EOF libc_cv_mabi_ibmlongdouble=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CFLAGS="$save_CFLAGS" + if { ac_try='${CC-cc} $CFLAGS -mlong-double-128 -mabi=ibmlongdouble $CPPFLAGS $LDFLAGS $no_ssp -c conftest.c 1>&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; } + then + libc_cv_mabi_ibmlongdouble=yes + fi + rm -f conftest* fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_mabi_ibmlongdouble" >&5 $as_echo "$libc_cv_mabi_ibmlongdouble" >&6; } diff --git a/sysdeps/unix/sysv/linux/powerpc/configure.ac b/sysdeps/unix/sysv/linux/powerpc/configure.ac index 8d2ec60f68..215e07ca82 100644 --- a/sysdeps/unix/sysv/linux/powerpc/configure.ac +++ b/sysdeps/unix/sysv/linux/powerpc/configure.ac @@ -2,32 +2,38 @@ sinclude(./aclocal.m4)dnl Autoconf lossage GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. # Local configure fragment for sysdeps/unix/sysv/linux/powerpc/. -AC_CACHE_CHECK(whether $CC $CFLAGS -mlong-double-128 uses IBM extended format, - libc_cv_mlong_double_128ibm, [dnl -save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS -mlong-double-128" -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[ +AC_CACHE_CHECK([whether $CC $CFLAGS -mlong-double-128 uses IBM extended format], + [libc_cv_mlong_double_128ibm], [dnl +cat > conftest.c < #if LDBL_MANT_DIG != 106 # error "compiler doesn't implement IBM extended format of long double" #endif -long double foobar (long double x) { return x; }]])], - libc_cv_mlong_double_128ibm=yes, - libc_cv_mlong_double_128ibm=no) -CFLAGS="$save_CFLAGS"]) +long double foobar (long double x) { return x; } +EOF +libc_cv_mlong_double_128ibm=no +if AC_TRY_COMMAND([${CC-cc} $CFLAGS -mlong-double-128 $CPPFLAGS $LDFLAGS -nostdlib $no_ssp -c conftest.c 1>&AS_MESSAGE_LOG_FD]) +then + libc_cv_mlong_double_128ibm=yes +fi +rm -f conftest*]) if test "$libc_cv_mlong_double_128ibm" = no; then - AC_CACHE_CHECK(whether $CC $CFLAGS supports -mabi=ibmlongdouble, - libc_cv_mabi_ibmlongdouble, [dnl - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -mlong-double-128 -mabi=ibmlongdouble" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[ + AC_CACHE_CHECK([whether $CC $CFLAGS supports -mabi=ibmlongdouble], + [libc_cv_mabi_ibmlongdouble], [dnl +cat > conftest.c < #if LDBL_MANT_DIG != 106 # error "compiler doesn't implement IBM extended format of long double" #endif -long double foobar (long double x) { return x; }]])], - libc_cv_mabi_ibmlongdouble=yes, - libc_cv_mabi_ibmlongdouble=no) - CFLAGS="$save_CFLAGS"]) +long double foobar (long double x) { return x; } +EOF + libc_cv_mabi_ibmlongdouble=no + if AC_TRY_COMMAND([${CC-cc} $CFLAGS -mlong-double-128 -mabi=ibmlongdouble $CPPFLAGS $LDFLAGS $no_ssp -c conftest.c 1>&AS_MESSAGE_LOG_FD]) + then + libc_cv_mabi_ibmlongdouble=yes + fi + rm -f conftest*]) if test "$libc_cv_mabi_ibmlongdouble" = yes; then CFLAGS="$CFLAGS -mabi=ibmlongdouble"