merge from gcc

This commit is contained in:
DJ Delorie
2010-09-07 19:28:01 +00:00
parent f4923a1611
commit af8b82c474
3 changed files with 22 additions and 4 deletions

View File

@ -1,3 +1,14 @@
2010-09-06 H.J. Lu <hongjiu.lu@intel.com>
PR target/45524
* configure.ac (enable_decimal_float): Set to
$default_decimal_float.
* configure: Regenerated.
2010-09-06 Andreas Schwab <schwab@redhat.com>
* configure: Regenerate.
2010-09-03 Andreas Krebbel <Andreas.Krebbel@de.ibm.com> 2010-09-03 Andreas Krebbel <Andreas.Krebbel@de.ibm.com>
* configure.ac: Use the GCC_AC_ENABLE_DECIMAL_FLOAT macro. * configure.ac: Use the GCC_AC_ENABLE_DECIMAL_FLOAT macro.

View File

@ -4594,7 +4594,7 @@ $as_echo_n "checking for decimal floating point... " >&6; }
if test "${enable_decimal_float+set}" = set; then : if test "${enable_decimal_float+set}" = set; then :
enableval=$enable_decimal_float; enableval=$enable_decimal_float;
case $enable_decimal_float in 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. *) as_fn_error "'$enable_decimal_float' is an invalid value for --enable-decimal-float.
Valid choices are 'yes', 'bid', 'dpd', and 'no'." "$LINENO" 5 ;; Valid choices are 'yes', 'bid', 'dpd', and 'no'." "$LINENO" 5 ;;
esac esac
@ -4606,8 +4606,8 @@ else
enable_decimal_float=yes 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:${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" >&2;} $as_echo "$as_me: WARNING: decimal float is not supported for this target, ignored" >&2;}
enable_decimal_float=no enable_decimal_float=no
;; ;;
esac esac
@ -4626,17 +4626,21 @@ case x$enable_decimal_float in
enable_decimal_float=dpd enable_decimal_float=dpd
;; ;;
esac esac
default_decimal_float=$enable_decimal_float
;; ;;
xno) xno)
# ENABLE_DECIMAL_FLOAT is set to 0. But we have to have proper # ENABLE_DECIMAL_FLOAT is set to 0. But we have to have proper
# dependency on libdecnumber. # dependency on libdecnumber.
enable_decimal_float=dpd default_decimal_float=dpd
;; ;;
esac 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 BID is being used, additional objects should be linked in.
if test x$enable_decimal_float = xbid; then if test x$enable_decimal_float = xbid; then
ADDITIONAL_OBJS="$ADDITIONAL_OBJS \$(bid_OBJS)" ADDITIONAL_OBJS="$ADDITIONAL_OBJS \$(bid_OBJS)"

View File

@ -78,6 +78,9 @@ AC_MSG_CHECKING([for decimal floating point])
GCC_AC_ENABLE_DECIMAL_FLOAT([$target]) 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 BID is being used, additional objects should be linked in.
if test x$enable_decimal_float = xbid; then if test x$enable_decimal_float = xbid; then
ADDITIONAL_OBJS="$ADDITIONAL_OBJS \$(bid_OBJS)" ADDITIONAL_OBJS="$ADDITIONAL_OBJS \$(bid_OBJS)"