From: hjl Date: Mon, 6 Sep 2010 14:52:54 +0000 (+0000) Subject: Don't set enable_decimal_float to dpd if DFP is disabled. X-Git-Url: http://git.sourceforge.jp/view?a=commitdiff_plain;ds=sidebyside;h=a87eb01159126249fcdbde78b65c25b8b16b9c89;p=pf3gnuchains%2Fgcc-fork.git Don't set enable_decimal_float to dpd if DFP is disabled. config/ 2010-09-06 H.J. Lu 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 PR target/45524 * configure.ac (enable_decimal_float): Set to $default_decimal_float. * configure: Regenerated. libdecnumber/ 2010-09-06 H.J. Lu PR target/45524 * configure.ac (enable_decimal_float): Set to $default_decimal_float. * configure: Regenerated. libgcc/ 2010-09-06 H.J. Lu PR target/45524 * configure: Regenerated. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@163921 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/config/ChangeLog b/config/ChangeLog index bbde1fcb80d..6fdf36cb691 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,9 @@ +2010-09-06 H.J. Lu + + 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 * dfp.m4: Quote argument of AC_MSG_WARN. diff --git a/config/dfp.m4 b/config/dfp.m4 index 3b7de7043ab..d5dbaf59b3b 100644 --- a/config/dfp.m4 +++ b/config/dfp.m4 @@ -13,7 +13,7 @@ AC_ARG_ENABLE(decimal-float, to use], [ 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. Valid choices are 'yes', 'bid', 'dpd', and 'no'.]) ;; esac @@ -41,13 +41,14 @@ 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 AC_SUBST(enable_decimal_float) -]) \ No newline at end of file +]) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 18893e72a5e..4ae341895a4 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +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 Krebbel * combine.c (try_combine): Set subst_low_luid to i0. diff --git a/gcc/configure b/gcc/configure index a59420da250..240a8765b79 100755 --- a/gcc/configure +++ b/gcc/configure @@ -6654,7 +6654,7 @@ fi 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 @@ -6686,11 +6686,12 @@ 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 @@ -6704,6 +6705,9 @@ cat >>confdefs.h <<_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` cat >>confdefs.h <<_ACEOF @@ -17133,7 +17137,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 17136 "configure" +#line 17140 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -17239,7 +17243,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 17242 "configure" +#line 17246 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/gcc/configure.ac b/gcc/configure.ac index 101e84c9f6d..75cded6c791 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -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, [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` AC_DEFINE_UNQUOTED(ENABLE_DECIMAL_BID_FORMAT, $bid, [Define to 1 to specify that we are using the BID decimal floating diff --git a/libdecnumber/ChangeLog b/libdecnumber/ChangeLog index 351c251ef3f..2690ea5b0ab 100644 --- a/libdecnumber/ChangeLog +++ b/libdecnumber/ChangeLog @@ -1,3 +1,10 @@ +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. diff --git a/libdecnumber/configure b/libdecnumber/configure index 134c2574563..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 @@ -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)" diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 8cafd6fec33..aa5a736e42e 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,8 @@ +2010-09-06 H.J. Lu + + PR target/45524 + * configure: Regenerated. + 2010-09-06 Andreas Schwab * configure: Regenerate. diff --git a/libgcc/configure b/libgcc/configure index c1a76ee1557..1649e14312b 100644 --- a/libgcc/configure +++ b/libgcc/configure @@ -3639,7 +3639,7 @@ decimal_float=$libgcc_cv_dfp 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 @@ -3671,11 +3671,12 @@ 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