aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2019-03-06 05:02:16 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2019-03-06 05:02:16 +0000
commit956cb6d39762a731759f4a656f4ca0d8aae15cc2 (patch)
treed654a98072a002b9d428106b91c4b999e2c09f4a
parentd77e925912d586fe60cfc5f4c2b84134996e6fe7 (diff)
downloadgcc-956cb6d39762a731759f4a656f4ca0d8aae15cc2.zip
gcc-956cb6d39762a731759f4a656f4ca0d8aae15cc2.tar.gz
gcc-956cb6d39762a731759f4a656f4ca0d8aae15cc2.tar.bz2
re PR go/89598 (go frontend fails to build against mpfr 2.4.2)
PR go/89598 compiler: use GMP_RNDN rather than MPFR_RNDN Missed one last time around. This fixes the build with mpfr 2.4.2. Fixes https://gcc.gnu.org/PR89598 Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/165420 From-SVN: r269411
-rw-r--r--gcc/go/gofrontend/MERGE2
-rw-r--r--gcc/go/gofrontend/expressions.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 78dd824..487548a 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-3f8ddaa1d773309b6a4b8e4640f8b9675d9764c6
+9b1374ded3d5e352a655d96bfe1bfb6aa1491a98
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.
diff --git a/gcc/go/gofrontend/expressions.cc b/gcc/go/gofrontend/expressions.cc
index 9539963..f32b7a4 100644
--- a/gcc/go/gofrontend/expressions.cc
+++ b/gcc/go/gofrontend/expressions.cc
@@ -17292,7 +17292,7 @@ Numeric_constant::hash(unsigned int seed) const
mpfr_clear(m);
break;
case NC_FLOAT:
- f = mpfr_get_d_2exp(&e, this->u_.float_val, MPFR_RNDN) * 4294967295.0;
+ f = mpfr_get_d_2exp(&e, this->u_.float_val, GMP_RNDN) * 4294967295.0;
val = static_cast<unsigned long>(e + static_cast<long>(f));
break;
default: