re PR bootstrap/35051 (Build machine requires GMP and MPFR for building cross-host...

gcc/
	PR bootstrap/35051
	* double-int.h: Don't include gmp.h for GENERATOR_FILEs.
	(mpz_set_double_int, mpz_get_double_int): Hide from GENERATOR_FILEs.
	* real.h: Don't include gmp.h or mpfr.h for GENERATOR_FILEs.
	(real_from_mpfr, mpfr_from_real): Hide from GENERATOR_FILEs.
	* tree.h (get_type_static_bounds): Likewise.

From-SVN: r132188

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index aef6158e9c72621e571f3d4e63060420ece9c35b..910417b73f12ccfd8f79b775f66fac7107cac84d 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2008-02-08  Richard Sandiford  <rsandifo@nildram.co.uk>
+
+       PR bootstrap/35051
+       * double-int.h: Don't include gmp.h for GENERATOR_FILEs.
+       (mpz_set_double_int, mpz_get_double_int): Hide from GENERATOR_FILEs.
+       * real.h: Don't include gmp.h or mpfr.h for GENERATOR_FILEs.
+       (real_from_mpfr, mpfr_from_real): Hide from GENERATOR_FILEs.
+       * tree.h (get_type_static_bounds): Likewise.
+
 2008-02-08  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * doc/invoke.texi (Option Summary, C++ Dialect Options)

diff --git a/gcc/double-int.h b/gcc/double-int.h
index e82c37ee6d28e67dfdaccfc0a70eefaf71df0409..df82688e6b689d54010c2bc6cd2ac5dc98e37ba1 100644 (file)
--- a/gcc/double-int.h
+++ b/gcc/double-int.h
@@ -20,7 +20,9 @@ along with GCC; see the file COPYING3.  If not see
 #ifndef DOUBLE_INT_H
 #define DOUBLE_INT_H
 
+#ifndef GENERATOR_FILE
 #include <gmp.h>
+#endif
 #include "coretypes.h"
 
 /* A large integer is currently represented as a pair of HOST_WIDE_INTs.
@@ -176,10 +178,11 @@ double_int_equal_p (double_int cst1, double_int cst2)
   return cst1.low == cst2.low && cst1.high == cst2.high;
 }
 
+#ifndef GENERATOR_FILE
 /* Conversion to and from GMP integer representations.  */
 
 void mpz_set_double_int (mpz_t, double_int, bool);
 double_int mpz_get_double_int (const_tree, mpz_t, bool);
-
+#endif
 
 #endif /* DOUBLE_INT_H */

diff --git a/gcc/real.h b/gcc/real.h
index e482c888f34da044562004ebcbc29e2f1a2e30a1..6cf0d1f511b588d5ba607176eeec57cd6a9cd98a 100644 (file)
--- a/gcc/real.h
+++ b/gcc/real.h
@@ -21,8 +21,10 @@
 #ifndef GCC_REAL_H
 #define GCC_REAL_H
 
+#ifndef GENERATOR_FILE
 #include <gmp.h>
 #include <mpfr.h>
+#endif
 #include "machmode.h"
 
 /* An expanded form of the represented number.  */
@@ -426,11 +428,13 @@ extern void real_round (REAL_VALUE_TYPE *, enum machine_mode,
 /* Set the sign of R to the sign of X.  */
 extern void real_copysign (REAL_VALUE_TYPE *, const REAL_VALUE_TYPE *);
 
+#ifndef GENERATOR_FILE
 /* Convert between MPFR and REAL_VALUE_TYPE.  The caller is
    responsible for initializing and clearing the MPFR parameter.  */
 
 extern void real_from_mpfr (REAL_VALUE_TYPE *, mpfr_srcptr, tree, mp_rnd_t);
 extern void mpfr_from_real (mpfr_ptr, const REAL_VALUE_TYPE *, mp_rnd_t);
+#endif
 
 /* Check whether the real constant value given is an integer.  */
 extern bool real_isinteger (const REAL_VALUE_TYPE *c, enum machine_mode mode);

diff --git a/gcc/tree.h b/gcc/tree.h
index de0b11d4e4abbe15e66176fa1b6da23ef222dba2..99c4aeadab14d04e7993f61cb8711c54279c5d16 100644 (file)
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -4891,7 +4891,9 @@ extern int objects_must_conflict_p (tree, tree);
 /* In tree.c */
 extern int really_constant_p (const_tree);
 extern int int_fits_type_p (const_tree, const_tree);
+#ifndef GENERATOR_FILE
 extern void get_type_static_bounds (const_tree, mpz_t, mpz_t);
+#endif
 extern bool variably_modified_type_p (tree, tree);
 extern int tree_log2 (const_tree);
 extern int tree_floor_log2 (const_tree);