diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/doc/install.texi | 2 | ||||
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/simplify.c | 37 |
4 files changed, 13 insertions, 38 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0148acc..9bb8513 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2019-11-11 Janne Blomqvist <jb@gcc.gnu.org> + + PR fortran/91828 + * doc/install.texi: Document that the minimum MPFR version is + 3.1.0. + 2019-11-11 Claudiu Zissulescu <claziss@gmail.com> * config/arc/arc.md (movsi_ne): Reorder instruction variants and diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi index 2cb8a34..93b01ff 100644 --- a/gcc/doc/install.texi +++ b/gcc/doc/install.texi @@ -384,7 +384,7 @@ and @option{--with-gmp-include}. The in-tree build is only supported with the GMP version that download_prerequisites installs. -@item MPFR Library version 2.4.2 (or later) +@item MPFR Library version 3.1.0 (or later) Necessary to build GCC@. It can be downloaded from @uref{https://www.mpfr.org}. If an MPFR source distribution is found diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 0a8efed..0f14ad1 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2019-11-11 Janne Blomqvist <jb@gcc.gnu.org> + + PR fortran/91828 + * simplify.c (gfc_simplify_fraction): Remove fallback path for + MPFR < 3.1.0. + 2019-11-11 Tobias Burnus <tobias@codesourcery.com> Kwok Cheung Yeung <kcy@codesourcery.com> diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c index 2eb1943..0461d31 100644 --- a/gcc/fortran/simplify.c +++ b/gcc/fortran/simplify.c @@ -3076,12 +3076,7 @@ gfc_expr * gfc_simplify_fraction (gfc_expr *x) { gfc_expr *result; - -#if MPFR_VERSION < MPFR_VERSION_NUM(3,1,0) - mpfr_t absv, exp, pow2; -#else mpfr_exp_t e; -#endif if (x->expr_type != EXPR_CONSTANT) return NULL; @@ -3095,41 +3090,9 @@ gfc_simplify_fraction (gfc_expr *x) return result; } -#if MPFR_VERSION < MPFR_VERSION_NUM(3,1,0) - - /* MPFR versions before 3.1.0 do not include mpfr_frexp. - TODO: remove the kludge when MPFR 3.1.0 or newer will be required */ - - if (mpfr_sgn (x->value.real) == 0) - { - mpfr_set (result->value.real, x->value.real, GFC_RND_MODE); - return result; - } - - gfc_set_model_kind (x->ts.kind); - mpfr_init (exp); - mpfr_init (absv); - mpfr_init (pow2); - - mpfr_abs (absv, x->value.real, GFC_RND_MODE); - mpfr_log2 (exp, absv, GFC_RND_MODE); - - mpfr_trunc (exp, exp); - mpfr_add_ui (exp, exp, 1, GFC_RND_MODE); - - mpfr_ui_pow (pow2, 2, exp, GFC_RND_MODE); - - mpfr_div (result->value.real, x->value.real, pow2, GFC_RND_MODE); - - mpfr_clears (exp, absv, pow2, NULL); - -#else - /* mpfr_frexp() correctly handles zeros and NaNs. */ mpfr_frexp (&e, result->value.real, x->value.real, GFC_RND_MODE); -#endif - return range_check (result, "FRACTION"); } |