Commit cc0ae0ca by H.J. Lu Committed by H.J. Lu

Don't set enable_decimal_float to dpd if DFP is disabled.

config/

2010-09-06  H.J. Lu  <hongjiu.lu@intel.com>

	PR target/45524
	* dfp.m4: Don't set enable_decimal_float to dpd if DFP is
	disabled.  Set default_decimal_float.

gcc/

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.

libdecnumber/

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.

libgcc/

2010-09-06  H.J. Lu  <hongjiu.lu@intel.com>

	PR target/45524
	* configure: Regenerated.

From-SVN: r163921
parent 6f295bbf
2010-09-06 H.J. Lu <hongjiu.lu@intel.com>
PR target/45524
* dfp.m4: Don't set enable_decimal_float to dpd if DFP is
disabled. Set default_decimal_float.
2010-09-06 Andreas Schwab <schwab@redhat.com> 2010-09-06 Andreas Schwab <schwab@redhat.com>
* dfp.m4: Quote argument of AC_MSG_WARN. * dfp.m4: Quote argument of AC_MSG_WARN.
......
...@@ -13,7 +13,7 @@ AC_ARG_ENABLE(decimal-float, ...@@ -13,7 +13,7 @@ AC_ARG_ENABLE(decimal-float,
to use], to use],
[ [
case $enable_decimal_float in case $enable_decimal_float in
yes | no | bid | dpd) ;; yes | no | bid | dpd) default_decimal_float=$enable_decimal_float ;;
*) AC_MSG_ERROR(['$enable_decimal_float' is an invalid value for --enable-decimal-float. *) AC_MSG_ERROR(['$enable_decimal_float' is an invalid value for --enable-decimal-float.
Valid choices are 'yes', 'bid', 'dpd', and 'no'.]) ;; Valid choices are 'yes', 'bid', 'dpd', and 'no'.]) ;;
esac esac
...@@ -41,13 +41,14 @@ case x$enable_decimal_float in ...@@ -41,13 +41,14 @@ 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
AC_SUBST(enable_decimal_float) AC_SUBST(enable_decimal_float)
]) ])
\ No newline at end of file
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 Krebbel <Andreas.Krebbel@de.ibm.com> 2010-09-06 Andreas Krebbel <Andreas.Krebbel@de.ibm.com>
* combine.c (try_combine): Set subst_low_luid to i0. * combine.c (try_combine): Set subst_low_luid to i0.
......
...@@ -6654,7 +6654,7 @@ fi ...@@ -6654,7 +6654,7 @@ fi
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
...@@ -6686,11 +6686,12 @@ case x$enable_decimal_float in ...@@ -6686,11 +6686,12 @@ 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
...@@ -6704,6 +6705,9 @@ cat >>confdefs.h <<_ACEOF ...@@ -6704,6 +6705,9 @@ cat >>confdefs.h <<_ACEOF
_ACEOF _ACEOF
# Use default_decimal_float for dependency.
enable_decimal_float=$default_decimal_float
bid=`if test $enable_decimal_float = bid; then echo 1; else echo 0; fi` bid=`if test $enable_decimal_float = bid; then echo 1; else echo 0; fi`
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
...@@ -17133,7 +17137,7 @@ else ...@@ -17133,7 +17137,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 17136 "configure" #line 17140 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
...@@ -17239,7 +17243,7 @@ else ...@@ -17239,7 +17243,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 17242 "configure" #line 17246 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
......
...@@ -612,6 +612,9 @@ dfp=`if test $enable_decimal_float != no; then echo 1; else echo 0; fi` ...@@ -612,6 +612,9 @@ dfp=`if test $enable_decimal_float != no; then echo 1; else echo 0; fi`
AC_DEFINE_UNQUOTED(ENABLE_DECIMAL_FLOAT, $dfp, AC_DEFINE_UNQUOTED(ENABLE_DECIMAL_FLOAT, $dfp,
[Define to 1 to enable decimal float extension to C.]) [Define to 1 to enable decimal float extension to C.])
# Use default_decimal_float for dependency.
enable_decimal_float=$default_decimal_float
bid=`if test $enable_decimal_float = bid; then echo 1; else echo 0; fi` bid=`if test $enable_decimal_float = bid; then echo 1; else echo 0; fi`
AC_DEFINE_UNQUOTED(ENABLE_DECIMAL_BID_FORMAT, $bid, AC_DEFINE_UNQUOTED(ENABLE_DECIMAL_BID_FORMAT, $bid,
[Define to 1 to specify that we are using the BID decimal floating [Define to 1 to specify that we are using the BID decimal floating
......
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> 2010-09-06 Andreas Schwab <schwab@redhat.com>
* configure: Regenerate. * configure: Regenerate.
......
...@@ -4594,7 +4594,7 @@ $as_echo_n "checking for decimal floating point... " >&6; } ...@@ -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
...@@ -4626,17 +4626,21 @@ case x$enable_decimal_float in ...@@ -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)"
......
...@@ -78,6 +78,9 @@ AC_MSG_CHECKING([for decimal floating point]) ...@@ -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)"
......
2010-09-06 H.J. Lu <hongjiu.lu@intel.com>
PR target/45524
* configure: Regenerated.
2010-09-06 Andreas Schwab <schwab@redhat.com> 2010-09-06 Andreas Schwab <schwab@redhat.com>
* configure: Regenerate. * configure: Regenerate.
......
...@@ -3639,7 +3639,7 @@ decimal_float=$libgcc_cv_dfp ...@@ -3639,7 +3639,7 @@ decimal_float=$libgcc_cv_dfp
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
...@@ -3671,11 +3671,12 @@ case x$enable_decimal_float in ...@@ -3671,11 +3671,12 @@ 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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment