From af8b82c474643a45809afa7bc13b0a2f57825b1f Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Tue, 7 Sep 2010 19:28:01 +0000 Subject: [PATCH] merge from gcc --- libdecnumber/ChangeLog | 11 +++++++++++ libdecnumber/configure | 12 ++++++++---- libdecnumber/configure.ac | 3 +++ 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/libdecnumber/ChangeLog b/libdecnumber/ChangeLog index b7952d08968..2690ea5b0ab 100644 --- a/libdecnumber/ChangeLog +++ b/libdecnumber/ChangeLog @@ -1,3 +1,14 @@ +2010-09-06 H.J. Lu + + PR target/45524 + * configure.ac (enable_decimal_float): Set to + $default_decimal_float. + * configure: Regenerated. + +2010-09-06 Andreas Schwab + + * configure: Regenerate. + 2010-09-03 Andreas Krebbel * configure.ac: Use the GCC_AC_ENABLE_DECIMAL_FLOAT macro. diff --git a/libdecnumber/configure b/libdecnumber/configure index 636839cf369..f94f6808190 100755 --- a/libdecnumber/configure +++ b/libdecnumber/configure @@ -4594,7 +4594,7 @@ $as_echo_n "checking for decimal floating point... " >&6; } if test "${enable_decimal_float+set}" = set; then : enableval=$enable_decimal_float; case $enable_decimal_float in - yes | no | bid | dpd) ;; + yes | no | bid | dpd) default_decimal_float=$enable_decimal_float ;; *) as_fn_error "'$enable_decimal_float' is an invalid value for --enable-decimal-float. Valid choices are 'yes', 'bid', 'dpd', and 'no'." "$LINENO" 5 ;; esac @@ -4606,8 +4606,8 @@ else enable_decimal_float=yes ;; *) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: decimal float is not supported for this target" >&5 -$as_echo "$as_me: WARNING: decimal float is not supported for this target" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: decimal float is not supported for this target, ignored" >&5 +$as_echo "$as_me: WARNING: decimal float is not supported for this target, ignored" >&2;} enable_decimal_float=no ;; esac @@ -4626,17 +4626,21 @@ case x$enable_decimal_float in enable_decimal_float=dpd ;; esac + default_decimal_float=$enable_decimal_float ;; xno) # ENABLE_DECIMAL_FLOAT is set to 0. But we have to have proper # dependency on libdecnumber. - enable_decimal_float=dpd + default_decimal_float=dpd ;; esac +# Use default_decimal_float for dependency. +enable_decimal_float=$default_decimal_float + # If BID is being used, additional objects should be linked in. if test x$enable_decimal_float = xbid; then ADDITIONAL_OBJS="$ADDITIONAL_OBJS \$(bid_OBJS)" diff --git a/libdecnumber/configure.ac b/libdecnumber/configure.ac index a4cbf55f1a4..87820bf2205 100644 --- a/libdecnumber/configure.ac +++ b/libdecnumber/configure.ac @@ -78,6 +78,9 @@ AC_MSG_CHECKING([for decimal floating point]) GCC_AC_ENABLE_DECIMAL_FLOAT([$target]) +# Use default_decimal_float for dependency. +enable_decimal_float=$default_decimal_float + # If BID is being used, additional objects should be linked in. if test x$enable_decimal_float = xbid; then ADDITIONAL_OBJS="$ADDITIONAL_OBJS \$(bid_OBJS)" -- 2.30.2