From 3d076231c6a00272b46067b61283638de23a44db Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 15 Jan 2016 23:00:30 +0000 Subject: [PATCH] PR libstdc++/69294 Check for isinf and isnan on AIX PR libstdc++/69294 * acinclude.m4 (GLIBCXX_CHECK_MATH11_PROTO): Check for obsolete isinf and isnan on AIX. Quote variables. * configure: Regenerate. From-SVN: r232455 --- libstdc++-v3/ChangeLog | 7 +++++++ libstdc++-v3/acinclude.m4 | 8 ++++---- libstdc++-v3/configure | 8 ++++---- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 0c9728bd44b..5e293546e98 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2016-01-15 Jonathan Wakely + + PR libstdc++/69294 + * acinclude.m4 (GLIBCXX_CHECK_MATH11_PROTO): Check for obsolete isinf + and isnan on AIX. Quote variables. + * configure: Regenerate. + 2016-01-15 Torvald Riegel * include/bits/basic_string.h (basic_string): Declare friends. diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 1e256603a29..f8dbb95265a 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -2186,7 +2186,7 @@ AC_DEFUN([GLIBCXX_CHECK_MATH11_PROTO], [ fi AC_MSG_RESULT([$glibcxx_cv_math11_overload]) ;; - *-*-*gnu*) + *-*-*gnu* | *-*-aix*) # If defines the obsolete isinf(double) and isnan(double) # functions (instead of or as well as the C99 generic macros) then we # can't define std::isinf(double) and std::isnan(double) in @@ -3445,9 +3445,9 @@ EOF AC_LANG_RESTORE # Set atomicity_dir to builtins if all but the long long test above passes. - if test $glibcxx_cv_atomic_bool = yes \ - && test $glibcxx_cv_atomic_short = yes \ - && test $glibcxx_cv_atomic_int = yes; then + if test "$glibcxx_cv_atomic_bool" = yes \ + && test "$glibcxx_cv_atomic_short" = yes \ + && test "$glibcxx_cv_atomic_int" = yes; then AC_DEFINE(_GLIBCXX_ATOMIC_BUILTINS, 1, [Define if the compiler supports C++11 atomics.]) atomicity_dir=cpu/generic/atomicity_builtins diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 94e88a52d7c..5e91deb0016 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -15539,9 +15539,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # Set atomicity_dir to builtins if all but the long long test above passes. - if test $glibcxx_cv_atomic_bool = yes \ - && test $glibcxx_cv_atomic_short = yes \ - && test $glibcxx_cv_atomic_int = yes; then + if test "$glibcxx_cv_atomic_bool" = yes \ + && test "$glibcxx_cv_atomic_short" = yes \ + && test "$glibcxx_cv_atomic_int" = yes; then $as_echo "#define _GLIBCXX_ATOMIC_BUILTINS 1" >>confdefs.h @@ -18177,7 +18177,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_math11_overload" >&5 $as_echo "$glibcxx_cv_math11_overload" >&6; } ;; - *-*-*gnu*) + *-*-*gnu* | *-*-aix*) # If defines the obsolete isinf(double) and isnan(double) # functions (instead of or as well as the C99 generic macros) then we # can't define std::isinf(double) and std::isnan(double) in -- 2.30.2