configure.in: Require GMP-4.1+ and MPFR-2.2+.
* configure.in: Require GMP-4.1+ and MPFR-2.2+. Don't check need_gmp anymore. * configure: Regenerate. gcc: * Makefile.in (LIBS): Add $(GMPLIBS). * doc/install.texi: Update GMP and MPFR requirements. * doc/sourcebuild.texi (need_gmp): Delete. gcc/fortran: * Make-lang.in (F95_LIBS): Delete. * f951$(exeext): Use $(LIBS) instead of $(F95_LIBS). * config-lang.in (need_gmp): Delete. From-SVN: r117933
This commit is contained in:
Kaveh R. Ghazi
Kaveh Ghazi
parent
0778d4e84a
commit
70ec446fab
10 changed files with 166 additions and 198 deletions
|
|
@ -1,3 +1,9 @@
|
|||
2006-10-21 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
|
||||
|
||||
* configure.in: Require GMP-4.1+ and MPFR-2.2+. Don't check
|
||||
need_gmp anymore.
|
||||
* configure: Regenerate.
|
||||
|
||||
2006-10-16 Tobias Burnus <burnus@net-b.de>
|
||||
|
||||
* MAINTAINERS (Write After Approval): Add myself.
|
||||
|
|
|
|||
31
configure.in
31
configure.in
|
|
@ -1103,24 +1103,24 @@ choke me
|
|||
], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); have_gmp=no])
|
||||
|
||||
if test x"$have_gmp" = xyes; then
|
||||
saved_LIBS="$LIBS"
|
||||
LIBS="$LIBS $gmplibs"
|
||||
AC_MSG_CHECKING([for correct version of mpfr.h])
|
||||
AC_TRY_COMPILE([#include "gmp.h"
|
||||
AC_TRY_LINK([#include <gmp.h>
|
||||
#include <mpfr.h>],[
|
||||
#if MPFR_VERSION_MAJOR < 2 || (MPFR_VERSION_MAJOR == 2 && MPFR_VERSION_MINOR < 2)
|
||||
choke me
|
||||
#endif
|
||||
], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([buggy version of MPFR detected])])
|
||||
|
||||
saved_LIBS="$LIBS"
|
||||
LIBS="$LIBS $gmplibs"
|
||||
AC_MSG_CHECKING([for any version of mpfr.h])
|
||||
AC_TRY_LINK([#include <gmp.h>
|
||||
#include <mpfr.h>], [mpfr_t n; mpfr_init(n);],
|
||||
[AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); have_gmp=no])
|
||||
mpfr_t n; mpfr_init(n);
|
||||
], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); have_gmp=no])
|
||||
LIBS="$saved_LIBS"
|
||||
fi
|
||||
CFLAGS="$saved_CFLAGS"
|
||||
|
||||
if test x$have_gmp != xyes; then
|
||||
AC_MSG_ERROR([Building GCC requires GMP 4.1+ and MPFR 2.2+. Try the --with-gmp and/or --with-mpfr options.])
|
||||
fi
|
||||
|
||||
# Flags needed for both GMP and/or MPFR
|
||||
AC_SUBST(gmplibs)
|
||||
AC_SUBST(gmpinc)
|
||||
|
|
@ -1208,7 +1208,6 @@ if test -d ${srcdir}/gcc; then
|
|||
subdir_requires=
|
||||
boot_language=
|
||||
build_by_default=
|
||||
need_gmp=
|
||||
. ${lang_frag}
|
||||
potential_languages="${potential_languages},${language}"
|
||||
# This is quite sensitive to the ordering of the case statement arms.
|
||||
|
|
@ -1254,18 +1253,6 @@ if test -d ${srcdir}/gcc; then
|
|||
esac
|
||||
done
|
||||
|
||||
# Disable languages that need GMP if it isn't available.
|
||||
case ,${enable_languages},:${have_gmp}:${need_gmp} in
|
||||
*,${language},*:no:yes)
|
||||
# Specifically requested language; tell them.
|
||||
AC_MSG_ERROR([GMP 4.1 and MPFR 2.2 or newer versions required by $language])
|
||||
;;
|
||||
*:no:yes)
|
||||
# Silently disable.
|
||||
add_this_lang=no
|
||||
;;
|
||||
esac
|
||||
|
||||
# Disable a language that is unsupported by the target.
|
||||
case " $unsupported_languages " in
|
||||
*" $language "*)
|
||||
|
|
|
|||
|
|
@ -1,3 +1,9 @@
|
|||
2006-10-21 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
|
||||
|
||||
* Makefile.in (LIBS): Add $(GMPLIBS).
|
||||
* doc/install.texi: Update GMP and MPFR requirements.
|
||||
* doc/sourcebuild.texi (need_gmp): Delete.
|
||||
|
||||
2006-10-21 Richard Guenther <rguenther@suse.de>
|
||||
|
||||
PR tree-optimization/3511
|
||||
|
|
|
|||
|
|
@ -846,7 +846,7 @@ BUILD_LIBDEPS= $(BUILD_LIBIBERTY)
|
|||
|
||||
# How to link with both our special library facilities
|
||||
# and the system's installed libraries.
|
||||
LIBS = @LIBS@ $(CPPLIB) $(LIBINTL) $(LIBICONV) $(LIBIBERTY) $(LIBDECNUMBER)
|
||||
LIBS = @LIBS@ $(CPPLIB) $(LIBINTL) $(LIBICONV) $(LIBIBERTY) $(LIBDECNUMBER) $(GMPLIBS)
|
||||
|
||||
# Any system libraries needed just for GNAT.
|
||||
SYSLIBS = @GNAT_LIBEXC@
|
||||
|
|
|
|||
|
|
@ -292,18 +292,20 @@ systems' @command{tar} programs will also work, only try GNU
|
|||
|
||||
@item GNU Multiple Precision Library (GMP) version 4.1 (or later)
|
||||
|
||||
Necessary to build the Fortran frontend. If you do not have it
|
||||
installed in your library search path, you will have to configure with
|
||||
the @option{--with-gmp} or @option{--with-gmp-dir} configure option.
|
||||
Necessary to build GCC. If you do not have it installed in your
|
||||
library search path, you will have to configure with the
|
||||
@option{--with-gmp} or @option{--with-gmp-dir} configure option.
|
||||
|
||||
@item MPFR Library version 2.2 (or later)
|
||||
|
||||
Necessary to build the Fortran frontend. 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 GNU Fortran will appear
|
||||
to function with the buggy versions of MPFR, there are a few GNU Fortran
|
||||
bugs that will not be fixed when using this version. It is strongly
|
||||
recommended to upgrade to at least MPFR version 2.2.
|
||||
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 GNU Fortran
|
||||
will appear to function with the buggy versions of MPFR, there are a
|
||||
few GNU Fortran bugs that will not be fixed when using this version.
|
||||
It is strongly recommended to upgrade to at least MPFR version 2.2.
|
||||
|
||||
The @option{--with-mpfr} or @option{--with-mpfr-dir} configure option should
|
||||
be used if your MPFR Library is not installed in your library search path.
|
||||
|
|
|
|||
|
|
@ -721,10 +721,6 @@ If defined, a space-separated list of files that should be scanned by
|
|||
gengtype.c to generate the garbage collection tables and routines for
|
||||
this language. This excludes the files that are common to all front
|
||||
ends. @xref{Type Information}.
|
||||
@item need_gmp
|
||||
If defined to @samp{yes}, this frontend requires the GMP library.
|
||||
Enables configure tests for GMP, which set @code{GMPLIBS} and
|
||||
@code{GMPINC} appropriately.
|
||||
|
||||
@end table
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,9 @@
|
|||
2006-10-21 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
|
||||
|
||||
* Make-lang.in (F95_LIBS): Delete.
|
||||
* f951$(exeext): Use $(LIBS) instead of $(F95_LIBS).
|
||||
* config-lang.in (need_gmp): Delete.
|
||||
|
||||
2006-10-19 Brooks Moses <bmoses@stanford.edu>
|
||||
|
||||
* invoke.texi: Fixed "denormal" typo.
|
||||
|
|
|
|||
|
|
@ -76,9 +76,6 @@ F95_OBJS = $(F95_PARSER_OBJS) \
|
|||
fortran/trans-intrinsic.o fortran/trans-io.o fortran/trans-openmp.o \
|
||||
fortran/trans-stmt.o fortran/trans-types.o
|
||||
|
||||
# GFORTRAN uses GMP for its internal arithmetics.
|
||||
F95_LIBS = $(GMPLIBS) $(LIBS)
|
||||
|
||||
#
|
||||
# Define the names for selecting gfortran in LANGUAGES.
|
||||
fortran: f951$(exeext)
|
||||
|
|
@ -107,7 +104,7 @@ gfortran-cross$(exeext): gfortran$(exeext)
|
|||
f951$(exeext): $(F95_OBJS) \
|
||||
$(BACKEND) $(LIBDEPS)
|
||||
$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \
|
||||
$(F95_OBJS) $(BACKEND) $(F95_LIBS)
|
||||
$(F95_OBJS) $(BACKEND) $(LIBS)
|
||||
|
||||
gt-fortran-trans.h : s-gtype; @true
|
||||
#
|
||||
|
|
|
|||
|
|
@ -16,5 +16,3 @@ target_libs=target-libgfortran
|
|||
|
||||
gtfiles="\$(srcdir)/fortran/f95-lang.c \$(srcdir)/fortran/trans-decl.c \$(srcdir)/fortran/trans-intrinsic.c \$(srcdir)/fortran/trans-io.c \$(srcdir)/fortran/trans-types.c \$(srcdir)/fortran/trans-types.h \$(srcdir)/fortran/trans.h \$(srcdir)/fortran/trans-const.h"
|
||||
|
||||
need_gmp="yes"
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue