diff --git a/ChangeLog b/ChangeLog index 533bc9faba6..5b5c4a61667 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-04-08 Kaveh R. Ghazi + + * configure.ac: Bump minimum GMP/MPFR versions to 4.2 and 2.3.1. + * configure: Regenerate. + 2009-04-01 Steve Ellcey * Makefil.def (languages): New entries. diff --git a/configure b/configure index ecbbce689ba..8f29c6201e8 100755 --- a/configure +++ b/configure @@ -4622,7 +4622,7 @@ int main () { - #if __GNU_MP_VERSION < 4 || (__GNU_MP_VERSION == 4 && __GNU_MP_VERSION_MINOR < 1) + #if __GNU_MP_VERSION < 4 || (__GNU_MP_VERSION == 4 && __GNU_MP_VERSION_MINOR < 2) choke me #endif @@ -4680,7 +4680,7 @@ int main () { - #if MPFR_VERSION < MPFR_VERSION_NUM(2,3,0) + #if MPFR_VERSION < MPFR_VERSION_NUM(2,3,1) choke me #endif mpfr_t n; @@ -4786,7 +4786,7 @@ rm -f conftest.err conftest.$ac_objext \ CFLAGS="$saved_CFLAGS" if test x$have_gmp != xyes; then - { { echo "$as_me:$LINENO: error: Building GCC requires GMP 4.1+ and MPFR 2.3.2+. + { { echo "$as_me:$LINENO: error: Building GCC requires GMP 4.2+ and MPFR 2.3.2+. 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/. @@ -4794,7 +4794,7 @@ See also http://gcc.gnu.org/install/prerequisites.html for additional info. If you obtained GMP and/or MPFR from a vendor distribution package, make sure that you have installed both the libraries and the header files. They may be located in separate packages." >&5 -echo "$as_me: error: Building GCC requires GMP 4.1+ and MPFR 2.3.2+. +echo "$as_me: error: Building GCC requires GMP 4.2+ and MPFR 2.3.2+. 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.ac b/configure.ac index a34cbe1175b..2a8c746ae88 100644 --- a/configure.ac +++ b/configure.ac @@ -1264,7 +1264,7 @@ if test -d ${srcdir}/gcc && test "x$have_gmp" = xno; then # Check GMP actually works AC_MSG_CHECKING([for correct version of gmp.h]) AC_TRY_COMPILE([#include "gmp.h"],[ - #if __GNU_MP_VERSION < 4 || (__GNU_MP_VERSION == 4 && __GNU_MP_VERSION_MINOR < 1) + #if __GNU_MP_VERSION < 4 || (__GNU_MP_VERSION == 4 && __GNU_MP_VERSION_MINOR < 2) choke me #endif ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); have_gmp=no]) @@ -1272,11 +1272,11 @@ if test -d ${srcdir}/gcc && test "x$have_gmp" = xno; then if test x"$have_gmp" = xyes; then saved_LIBS="$LIBS" LIBS="$LIBS $gmplibs" - dnl MPFR 2.3.0 is acceptable, but MPFR 2.3.2 is better. + dnl MPFR 2.3.1 is acceptable, but MPFR 2.3.2 is better. AC_MSG_CHECKING([for correct version of mpfr.h]) AC_TRY_LINK([#include #include ],[ - #if MPFR_VERSION < MPFR_VERSION_NUM(2,3,0) + #if MPFR_VERSION < MPFR_VERSION_NUM(2,3,1) choke me #endif mpfr_t n; @@ -1300,7 +1300,7 @@ if test -d ${srcdir}/gcc && test "x$have_gmp" = xno; then CFLAGS="$saved_CFLAGS" if test x$have_gmp != xyes; then - AC_MSG_ERROR([Building GCC requires GMP 4.1+ and MPFR 2.3.2+. + AC_MSG_ERROR([Building GCC requires GMP 4.2+ and MPFR 2.3.2+. 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 45ed3e53d29..e997af5a70f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2009-04-08 Kaveh R. Ghazi + + * doc/install.texi: Update minimum GMP version. Remove obsolete + text in MPFR section. + 2009-04-08 Jakub Jelinek * dwarf2out.c (class_scope_p): New static inline. diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi index 79b7dfde113..dbac0fa9d3a 100644 --- a/gcc/doc/install.texi +++ b/gcc/doc/install.texi @@ -302,7 +302,7 @@ Necessary (only on some platforms) to untar the source code. Many systems' @command{tar} programs will also work, only try GNU @command{tar} if you have problems. -@item GNU Multiple Precision Library (GMP) version 4.1 (or later) +@item GNU Multiple Precision Library (GMP) version 4.2 (or later) Necessary to build GCC@. If you do not have it installed in your library search path, you will have to configure with the @@ -314,18 +314,12 @@ distribution is found in a subdirectory of your GCC sources named @item MPFR Library version 2.3.2 (or later) Necessary to build GCC@. It can be downloaded from -@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 also -@option{--with-mpfr-lib} and @option{--with-mpfr-include}. -Alternatively, if a MPFR source distribution is found in a subdirectory -of your GCC sources named @file{mpfr}, it will be built together with -GCC@. +@uref{http://www.mpfr.org/}. The @option{--with-mpfr} configure +option should be used if your MPFR Library is not installed in your +default library search path. See also @option{--with-mpfr-lib} and +@option{--with-mpfr-include}. Alternatively, if a MPFR source +distribution is found in a subdirectory of your GCC sources named +@file{mpfr}, it will be built together with GCC@. @item Parma Polyhedra Library (PPL) version 0.10