From 4af4078ced45287e8effeaa6612773084377ceb1 Mon Sep 17 00:00:00 2001
From: ghazi <ghazi@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sat, 2 Dec 2006 16:52:15 +0000
Subject: [PATCH] 	* configure.in: Update MPFR version in error message.

	* configure: Regenerate.

gcc:
	* doc/install.texi: Update recommended MPFR version.  Remove
	obsolete reference to cumulative patch.

gcc/testsuite:
	* gcc.dg/torture/builtin-sin-mpfr-1.c: Update MPFR comment.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@119447 138bc75d-0d04-0410-961f-82ee72b054a4
---
 ChangeLog                                         |  6 ++++++
 configure                                         |  2 +-
 configure.in                                      |  2 +-
 gcc/ChangeLog                                     |  5 +++++
 gcc/doc/install.texi                              | 14 ++++++--------
 gcc/testsuite/ChangeLog                           |  4 ++++
 gcc/testsuite/gcc.dg/torture/builtin-sin-mpfr-1.c |  3 +--
 7 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4034b820f574..ff02b6079900 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-02  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* configure.in: Update MPFR version in error message.
+
+	* configure: Regenerate.
+
 2006-11-26  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* configure.in (--with-mpfr-dir, --with-gmp-dir): Remove flags.
diff --git a/configure b/configure
index 6519af09c69c..d76717ac833a 100755
--- a/configure
+++ b/configure
@@ -2392,7 +2392,7 @@ fi
 CFLAGS="$saved_CFLAGS"
 
 if test -d ${srcdir}/gcc && test x$have_gmp != xyes; then
-  { echo "configure: error: Building GCC requires GMP 4.1+ and MPFR 2.2+.
+  { echo "configure: error: Building GCC requires GMP 4.1+ and MPFR 2.2.1+.
 Try the --with-gmp and/or --with-mpfr options to specify their locations.
 Copies of these libraries' source code can be found at their respective
 hosting sites as well as at ftp://gcc.gnu.org/pub/gcc/infrastructure/.
diff --git a/configure.in b/configure.in
index f9d6bca3bc32..094e910131ec 100644
--- a/configure.in
+++ b/configure.in
@@ -1130,7 +1130,7 @@ fi
 CFLAGS="$saved_CFLAGS"
 
 if test -d ${srcdir}/gcc && test x$have_gmp != xyes; then
-  AC_MSG_ERROR([Building GCC requires GMP 4.1+ and MPFR 2.2+.
+  AC_MSG_ERROR([Building GCC requires GMP 4.1+ and MPFR 2.2.1+.
 Try the --with-gmp and/or --with-mpfr options to specify their locations.
 Copies of these libraries' source code can be found at their respective
 hosting sites as well as at ftp://gcc.gnu.org/pub/gcc/infrastructure/.
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e1ae8cb62f47..6601a1d7c1db 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-02  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* doc/install.texi: Update recommended MPFR version.  Remove
+	obsolete reference to cumulative patch.
+
 2006-12-02  Lee Millward  <lee.millward@codesourcery.com>
 
 	PR c/27953
diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
index 0fee98af0256..ab2a9f29996e 100644
--- a/gcc/doc/install.texi
+++ b/gcc/doc/install.texi
@@ -297,16 +297,14 @@ library search path, you will have to configure with the
 @option{--with-gmp} configure option.  See also
 @option{--with-gmp-lib} and @option{--with-gmp-include}.
 
-@item MPFR Library version 2.2 (or later)
+@item MPFR Library version 2.2.1 (or later)
 
 Necessary to build GCC.  It can be downloaded from
-@uref{http://www.mpfr.org/}.  If you're using version 2.2.0, You
-should also apply revision 16 (or later) of the cumulative patch from
-@uref{http://www.mpfr.org/mpfr-current/}.  The version of MPFR that is
-bundled with GMP 4.1.x contains numerous bugs.  Although GCC will
-appear to function with the buggy versions of MPFR, there are a few
-bugs that will not be fixed when using this version.  It is strongly
-recommended to upgrade to the recommended version of MPFR.
+@uref{http://www.mpfr.org/}.  The version of MPFR that is bundled with
+GMP 4.1.x contains numerous bugs.  Although GCC may appear to function
+with the buggy versions of MPFR, there are a few bugs that will not be
+fixed when using this version.  It is strongly recommended to upgrade
+to the recommended version of MPFR.
 
 The @option{--with-mpfr} configure option should be used if your MPFR
 Library is not installed in your default library search path.  See
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6159e46895e1..381647a5bfb7 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2006-12-02  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* gcc.dg/torture/builtin-sin-mpfr-1.c: Update MPFR comment.
+
 2006-12-02  Lee Millward  <lee.millward@codesourcery.com>
 
        PR c/27953
diff --git a/gcc/testsuite/gcc.dg/torture/builtin-sin-mpfr-1.c b/gcc/testsuite/gcc.dg/torture/builtin-sin-mpfr-1.c
index 86396f5c46a7..359728708941 100644
--- a/gcc/testsuite/gcc.dg/torture/builtin-sin-mpfr-1.c
+++ b/gcc/testsuite/gcc.dg/torture/builtin-sin-mpfr-1.c
@@ -1,7 +1,6 @@
 /* Version 2.2.0 of MPFR had bugs in sin rounding.  This test checks
    to see if that buggy version was installed.  The problem is fixed
-   in the MPFR cumulative patch http://www.mpfr.org/mpfr-current and
-   presumably later MPFR versions.
+   in version 2.2.1 and presumably later MPFR versions.
 
    Origin: Kaveh R. Ghazi 10/23/2006.  */
 
-- 
GitLab