diff options
| -rw-r--r-- | gcc/aclocal.m4 | 1 | ||||
| -rwxr-xr-x | gcc/configure | 25 | ||||
| -rw-r--r-- | libdecnumber/aclocal.m4 | 1 | ||||
| -rwxr-xr-x | libdecnumber/configure | 38 | ||||
| -rw-r--r-- | libgcc/configure | 34 |
5 files changed, 64 insertions, 35 deletions
diff --git a/gcc/aclocal.m4 b/gcc/aclocal.m4 index 0aeaf6e52d7..73afd7fedee 100644 --- a/gcc/aclocal.m4 +++ b/gcc/aclocal.m4 @@ -106,6 +106,7 @@ m4_include([../ltversion.m4]) m4_include([../lt~obsolete.m4]) m4_include([../config/acx.m4]) m4_include([../config/codeset.m4]) +m4_include([../config/dfp.m4]) m4_include([../config/gettext-sister.m4]) m4_include([../config/iconv.m4]) m4_include([../config/lcmessage.m4]) diff --git a/gcc/configure b/gcc/configure index f6230e45d02..da0c48bcb09 100755 --- a/gcc/configure +++ b/gcc/configure @@ -6649,6 +6649,7 @@ fi # Enable C extension for decimal float if target supports it. + # Check whether --enable-decimal-float was given. if test "${enable_decimal_float+set}" = set; then : enableval=$enable_decimal_float; @@ -6661,7 +6662,7 @@ Valid choices are 'yes', 'bid', 'dpd', and 'no'." "$LINENO" 5 ;; else case $target in - powerpc*-*-linux* | i?86*-*-linux* | x86_64*-*-linux*) + powerpc*-*-linux* | i?86*-*-linux* | x86_64*-*-linux* | s390*-*-linux*) enable_decimal_float=yes ;; *) @@ -6674,18 +6675,11 @@ $as_echo "$as_me: WARNING: decimal float is not supported for this target" >&2;} fi -dfp=`if test $enable_decimal_float != no; then echo 1; else echo 0; fi` - -cat >>confdefs.h <<_ACEOF -#define ENABLE_DECIMAL_FLOAT $dfp -_ACEOF - - # x86's use BID format instead of DPD case x$enable_decimal_float in xyes) case $target in - i?86*-*-linux* | x86_64*-*-linux*) + i?86*-*-* | x86_64*-*-*) enable_decimal_float=bid ;; *) @@ -6701,6 +6695,15 @@ case x$enable_decimal_float in esac + + +dfp=`if test $enable_decimal_float != no; then echo 1; else echo 0; fi` + +cat >>confdefs.h <<_ACEOF +#define ENABLE_DECIMAL_FLOAT $dfp +_ACEOF + + bid=`if test $enable_decimal_float = bid; then echo 1; else echo 0; fi` cat >>confdefs.h <<_ACEOF @@ -17130,7 +17133,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 17133 "configure" +#line 17136 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -17236,7 +17239,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 17239 "configure" +#line 17242 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/libdecnumber/aclocal.m4 b/libdecnumber/aclocal.m4 index 7dc0312687f..fda021e817f 100644 --- a/libdecnumber/aclocal.m4 +++ b/libdecnumber/aclocal.m4 @@ -11,6 +11,7 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_include([../config/dfp.m4]) m4_include([../config/override.m4]) m4_include([../config/stdint.m4]) m4_include([../config/warnings.m4]) diff --git a/libdecnumber/configure b/libdecnumber/configure index ce319763ba4..636839cf369 100755 --- a/libdecnumber/configure +++ b/libdecnumber/configure @@ -4588,6 +4588,8 @@ test -n "$target_alias" && # If you change the defaults here, be sure to change them in the GCC directory also { $as_echo "$as_me:${as_lineno-$LINENO}: checking for decimal floating point" >&5 $as_echo_n "checking for decimal floating point... " >&6; } + + # Check whether --enable-decimal-float was given. if test "${enable_decimal_float+set}" = set; then : enableval=$enable_decimal_float; @@ -4600,10 +4602,12 @@ Valid choices are 'yes', 'bid', 'dpd', and 'no'." "$LINENO" 5 ;; else case $target in - powerpc*-*-linux* | i?86*-*-linux* | x86_64*-*-linux*) + powerpc*-*-linux* | i?86*-*-linux* | x86_64*-*-linux* | s390*-*-linux*) 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;} enable_decimal_float=no ;; esac @@ -4612,18 +4616,26 @@ fi # x86's use BID format instead of DPD -# In theory --enable-decimal-float=no should not compile anything -# For the sake of simplicity, just use the default format in this directory -if test x$enable_decimal_float = xyes -o x$enable_decimal_float = xno; then - case $target in - i?86*-*-linux* | x86_64*-*-linux*) - enable_decimal_float=bid - ;; - *) - enable_decimal_float=dpd - ;; - esac -fi +case x$enable_decimal_float in + xyes) + case $target in + i?86*-*-* | x86_64*-*-*) + enable_decimal_float=bid + ;; + *) + enable_decimal_float=dpd + ;; + esac + ;; + xno) + # ENABLE_DECIMAL_FLOAT is set to 0. But we have to have proper + # dependency on libdecnumber. + enable_decimal_float=dpd + ;; +esac + + + # If BID is being used, additional objects should be linked in. if test x$enable_decimal_float = xbid; then diff --git a/libgcc/configure b/libgcc/configure index f5224276693..e6d42a1e46d 100644 --- a/libgcc/configure +++ b/libgcc/configure @@ -3634,6 +3634,7 @@ $as_echo "$libgcc_cv_dfp" >&6; } decimal_float=$libgcc_cv_dfp + # Check whether --enable-decimal-float was given. if test "${enable_decimal_float+set}" = set; then : enableval=$enable_decimal_float; @@ -3646,10 +3647,12 @@ Valid choices are 'yes', 'bid', 'dpd', and 'no'." "$LINENO" 5 ;; else case $host in - powerpc*-*-linux* | i?86*-*-linux* | x86_64*-*-linux*) + powerpc*-*-linux* | i?86*-*-linux* | x86_64*-*-linux* | s390*-*-linux*) 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;} enable_decimal_float=no ;; esac @@ -3658,16 +3661,25 @@ fi # x86's use BID format instead of DPD -if test x$enable_decimal_float = xyes; then - case $host in - i?86*-*-linux* | x86_64*-*-linux*) - enable_decimal_float=bid - ;; - *) - enable_decimal_float=dpd - ;; - esac -fi +case x$enable_decimal_float in + xyes) + case $host in + i?86*-*-* | x86_64*-*-*) + enable_decimal_float=bid + ;; + *) + enable_decimal_float=dpd + ;; + esac + ;; + xno) + # ENABLE_DECIMAL_FLOAT is set to 0. But we have to have proper + # dependency on libdecnumber. + enable_decimal_float=dpd + ;; +esac + + # Check for fixed-point support. |