/tmp/foo.diff
This commit is contained in:
Richard Sandiford
parent
61f9c74a8d
commit
fcd436325b
|
|
@ -1,3 +1,9 @@
|
|||
2007-12-17 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
|
||||
|
||||
* configure.ac: Change required MPFR from 2.2.0 -> 2.2.1.
|
||||
Change recommended MPFR from 2.2.1 > 2.3.0.
|
||||
* configure: Regenerate.
|
||||
|
||||
2007-12-13 Richard Sandiford <rsandifo@nildram.co.uk>
|
||||
|
||||
* Makefile.tpl (CFLAGS_FOR_TARGET): Add -g.
|
||||
|
|
|
|||
14
Makefile.in
14
Makefile.in
|
|
@ -373,15 +373,17 @@ COMPILER_AS_FOR_TARGET=@COMPILER_AS_FOR_TARGET@
|
|||
COMPILER_LD_FOR_TARGET=@COMPILER_LD_FOR_TARGET@
|
||||
COMPILER_NM_FOR_TARGET=@COMPILER_NM_FOR_TARGET@
|
||||
|
||||
# During gcc bootstrap, if we use some random cc for stage1 then
|
||||
# CFLAGS will be just -g. We want to ensure that TARGET libraries
|
||||
# (which we know are built with gcc) are built with optimizations so
|
||||
# prepend -O2 when setting CFLAGS_FOR_TARGET.
|
||||
CFLAGS_FOR_TARGET = -O2 $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) \
|
||||
# During gcc bootstrap, if we use some random cc for stage1 then CFLAGS
|
||||
# might be empty or "-g". We don't require a C++ compiler, so CXXFLAGS
|
||||
# might also be empty (or "-g", if a non-GCC C++ compiler is in the path).
|
||||
# We want to ensure that TARGET libraries (which we know are built with
|
||||
# gcc) are built with "-O2 -g", so prepend those options when setting
|
||||
# CFLAGS_FOR_TARGET and CXXFLAGS_FOR_TARGET.
|
||||
CFLAGS_FOR_TARGET = -O2 -g $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) \
|
||||
$(DEBUG_PREFIX_CFLAGS_FOR_TARGET)
|
||||
SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
|
||||
DEBUG_PREFIX_CFLAGS_FOR_TARGET = @DEBUG_PREFIX_CFLAGS_FOR_TARGET@
|
||||
CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) \
|
||||
CXXFLAGS_FOR_TARGET = -O2 -g $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) \
|
||||
$(DEBUG_PREFIX_CFLAGS_FOR_TARGET)
|
||||
LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
|
||||
LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
|
||||
|
|
|
|||
14
Makefile.tpl
14
Makefile.tpl
|
|
@ -376,15 +376,17 @@ COMPILER_AS_FOR_TARGET=@COMPILER_AS_FOR_TARGET@
|
|||
COMPILER_LD_FOR_TARGET=@COMPILER_LD_FOR_TARGET@
|
||||
COMPILER_NM_FOR_TARGET=@COMPILER_NM_FOR_TARGET@
|
||||
|
||||
# During gcc bootstrap, if we use some random cc for stage1 then
|
||||
# CFLAGS will be just -g. We want to ensure that TARGET libraries
|
||||
# (which we know are built with gcc) are built with optimizations so
|
||||
# prepend -O2 when setting CFLAGS_FOR_TARGET.
|
||||
CFLAGS_FOR_TARGET = -O2 $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) \
|
||||
# During gcc bootstrap, if we use some random cc for stage1 then CFLAGS
|
||||
# might be empty or "-g". We don't require a C++ compiler, so CXXFLAGS
|
||||
# might also be empty (or "-g", if a non-GCC C++ compiler is in the path).
|
||||
# We want to ensure that TARGET libraries (which we know are built with
|
||||
# gcc) are built with "-O2 -g", so prepend those options when setting
|
||||
# CFLAGS_FOR_TARGET and CXXFLAGS_FOR_TARGET.
|
||||
CFLAGS_FOR_TARGET = -O2 -g $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) \
|
||||
$(DEBUG_PREFIX_CFLAGS_FOR_TARGET)
|
||||
SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
|
||||
DEBUG_PREFIX_CFLAGS_FOR_TARGET = @DEBUG_PREFIX_CFLAGS_FOR_TARGET@
|
||||
CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) \
|
||||
CXXFLAGS_FOR_TARGET = -O2 -g $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) \
|
||||
$(DEBUG_PREFIX_CFLAGS_FOR_TARGET)
|
||||
LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
|
||||
LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
|
||||
|
|
|
|||
|
|
@ -4550,7 +4550,7 @@ int
|
|||
main ()
|
||||
{
|
||||
|
||||
#if MPFR_VERSION < MPFR_VERSION_NUM(2,2,0)
|
||||
#if MPFR_VERSION < MPFR_VERSION_NUM(2,2,1)
|
||||
choke me
|
||||
#endif
|
||||
mpfr_t n;
|
||||
|
|
@ -4600,7 +4600,7 @@ int
|
|||
main ()
|
||||
{
|
||||
|
||||
#if MPFR_VERSION < MPFR_VERSION_NUM(2,2,1)
|
||||
#if MPFR_VERSION < MPFR_VERSION_NUM(2,3,0)
|
||||
choke me
|
||||
#endif
|
||||
mpfr_t n; mpfr_init(n);
|
||||
|
|
@ -4656,7 +4656,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.2.1+.
|
||||
{ { echo "$as_me:$LINENO: error: Building GCC requires GMP 4.1+ and MPFR 2.3.0+.
|
||||
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/.
|
||||
|
|
@ -4664,7 +4664,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.2.1+.
|
||||
echo "$as_me: error: Building GCC requires GMP 4.1+ and MPFR 2.3.0+.
|
||||
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/.
|
||||
|
|
|
|||
|
|
@ -1220,11 +1220,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.2.0 is acceptable but buggy, MPFR 2.2.1 is better.
|
||||
dnl MPFR 2.2.1 is acceptable, but MPFR 2.3.0 is better.
|
||||
AC_MSG_CHECKING([for correct version of mpfr.h])
|
||||
AC_TRY_LINK([#include <gmp.h>
|
||||
#include <mpfr.h>],[
|
||||
#if MPFR_VERSION < MPFR_VERSION_NUM(2,2,0)
|
||||
#if MPFR_VERSION < MPFR_VERSION_NUM(2,2,1)
|
||||
choke me
|
||||
#endif
|
||||
mpfr_t n;
|
||||
|
|
@ -1237,7 +1237,7 @@ if test -d ${srcdir}/gcc && test "x$have_gmp" = xno; then
|
|||
mpfr_subnormalize (x, t, GMP_RNDN);
|
||||
], [AC_TRY_LINK([#include <gmp.h>
|
||||
#include <mpfr.h>],[
|
||||
#if MPFR_VERSION < MPFR_VERSION_NUM(2,2,1)
|
||||
#if MPFR_VERSION < MPFR_VERSION_NUM(2,3,0)
|
||||
choke me
|
||||
#endif
|
||||
mpfr_t n; mpfr_init(n);
|
||||
|
|
@ -1248,7 +1248,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.2.1+.
|
||||
AC_MSG_ERROR([Building GCC requires GMP 4.1+ and MPFR 2.3.0+.
|
||||
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/.
|
||||
|
|
|
|||
Loading…
Reference in New Issue