diff options
| author | Richard Sandiford <rsandifo@nildram.co.uk> | 2008-02-08 19:10:25 +0000 |
|---|---|---|
| committer | Richard Sandiford <rsandifo@gcc.gnu.org> | 2008-02-08 19:10:25 +0000 |
| commit | 34917a102a4e0cf6b85e5cb48921885a36f3c758 (patch) | |
| tree | 8da9730c286292669f3782559a5bce0322051a59 | |
| parent | 40891f69fb7217b034a1f59d0086dde0db97f1c7 (diff) | |
| download | gcc-34917a102a4e0cf6b85e5cb48921885a36f3c758.zip gcc-34917a102a4e0cf6b85e5cb48921885a36f3c758.tar.gz gcc-34917a102a4e0cf6b85e5cb48921885a36f3c758.tar.bz2 | |
re PR bootstrap/35051 (Build machine requires GMP and MPFR for building cross-host gccs)
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
| -rw-r--r-- | gcc/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/double-int.h | 5 | ||||
| -rw-r--r-- | gcc/real.h | 4 | ||||
| -rw-r--r-- | gcc/tree.h | 2 |
4 files changed, 19 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index aef6158..910417b 100644 --- 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 e82c37e..df82688 100644 --- 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 */ @@ -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); @@ -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); |