diff options
| -rw-r--r-- | tools/mbench/Makefile | 2 | ||||
| -rw-r--r-- | tools/mbench/mfv5-mpfr.cc | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/tools/mbench/Makefile b/tools/mbench/Makefile index c126e84c1..bb264ea7a 100644 --- a/tools/mbench/Makefile +++ b/tools/mbench/Makefile @@ -38,6 +38,8 @@ ARPREC=$(GMP) CRLIBM=$(GMP) LIDIA=/localdisk/lidia/ +GMP_INCLUDE=$(GMP)/include + MPFR_INCLUDE=$(MPFR)/include MPFR_LIB=$(MPFR)/lib diff --git a/tools/mbench/mfv5-mpfr.cc b/tools/mbench/mfv5-mpfr.cc index 48496bae0..4e417fd8a 100644 --- a/tools/mbench/mfv5-mpfr.cc +++ b/tools/mbench/mfv5-mpfr.cc @@ -135,16 +135,14 @@ public: } }; -#ifdef mpfr_fmma +#if MPFR_VERSION_MAJOR >= 4 class mpfr_fmma_test { public: int func(mpfr_ptr a, mpfr_srcptr b, mpfr_srcptr c, mpfr_srcptr d, mpfr_srcptr e, mp_rnd_t r) { return mpfr_fmma (a,b,c,d,e,r); } }; -#endif -#ifdef mpfr_fmms class mpfr_fmms_test { public: int func(mpfr_ptr a, mpfr_srcptr b, mpfr_srcptr c, mpfr_srcptr d, mpfr_srcptr e, mp_rnd_t r) { @@ -281,10 +279,8 @@ static mpfr_test<mpfr_sub_test> test2 ("mpfr_sub"); static mpfr_test<mpfr_mul_test> test3 ("mpfr_mul"); static mpfr_test3<mpfr_fma_test> test10 ("mpfr_fma"); static mpfr_test3<mpfr_fms_test> test11 ("mpfr_fms"); -#ifdef mpfr_fmma +#if MPFR_VERSION_MAJOR >= 4 static mpfr_test4<mpfr_fmma_test> test12 ("mpfr_fmma"); -#endif -#ifdef mpfr_fmms static mpfr_test4<mpfr_fmms_test> test13 ("mpfr_fmms"); #endif static mpfr_test<mpfr_sqr_test> test14 ("mpfr_sqr"); |