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

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 78dd824fc74e536160dbcf0d514a66432afac8c1..487548a3b934459ef43a5356f9abc9fa5f1bc0c3 100644 (file)
--- 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 953996336a8d02a561770f4c139fd4db52b378b4..f32b7a4b1b9633ec0bde6eb83d6898d8ac59b3d3 100644 (file)
--- 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: