diff options
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/double-int.h | 4 | ||||
| -rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fortran/gfortran.h | 1 | ||||
| -rw-r--r-- | gcc/realmpfr.h | 5 | ||||
| -rw-r--r-- | gcc/system.h | 4 | ||||
| -rw-r--r-- | gcc/tree-ssa-loop-niter.c | 1 |
7 files changed, 21 insertions, 7 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ef89872e600..dff3e9abc80 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2012-08-16 Diego Novillo <dnovillo@google.com> + + PR bootstrap/54281 + * double-int.h: Move including of gmp.h ... + * system.h: ... here. + * realmpfr.h: Do not include gmp.h. + * tree-ssa-loop-niter.c: Do not include gmp.h. + 2012-08-16 Steven Bosscher <steven@gcc.gnu.org> PR middle-end/54146 diff --git a/gcc/double-int.h b/gcc/double-int.h index 3d9aa2caa9d..7ea05288b9e 100644 --- a/gcc/double-int.h +++ b/gcc/double-int.h @@ -20,10 +20,6 @@ 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 - /* A large integer is currently represented as a pair of HOST_WIDE_INTs. It therefore represents a number with precision of 2 * HOST_BITS_PER_WIDE_INT bits (it is however possible that the diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 17b14a98ec6..25b276b4108 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2012-08-16 Diego Novillo <dnovillo@google.com> + + PR bootstrap/54281 + * gfortran.h: Do not include gmp.h. + 2012-08-15 Janus Weil <janus@gcc.gnu.org> PR fortran/54243 diff --git a/gcc/fortran/gfortran.h b/gcc/fortran/gfortran.h index 7c4c0a42bf0..611d16d265d 100644 --- a/gcc/fortran/gfortran.h +++ b/gcc/fortran/gfortran.h @@ -1681,7 +1681,6 @@ gfc_intrinsic_sym; EXPR_COMPCALL Function (or subroutine) call of a procedure pointer component or type-bound procedure. */ -#include <gmp.h> #include <mpfr.h> #include <mpc.h> #define GFC_RND_MODE GMP_RNDN diff --git a/gcc/realmpfr.h b/gcc/realmpfr.h index ab234e9195d..ada876e2854 100644 --- a/gcc/realmpfr.h +++ b/gcc/realmpfr.h @@ -22,7 +22,10 @@ #ifndef GCC_REALGMP_H #define GCC_REALGMP_H -#include <gmp.h> +/* Note that we do not include gmp.h. It is included in system.h + because it wrecks intl.h when compiling in C++ mode. + See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54281 for details. */ + #include <mpfr.h> #include <mpc.h> #include "real.h" diff --git a/gcc/system.h b/gcc/system.h index 9e7d5030465..0ccd9917b94 100644 --- a/gcc/system.h +++ b/gcc/system.h @@ -1037,4 +1037,8 @@ helper_const_non_const_cast (const char *p) #define DEBUG_VARIABLE #endif +#ifndef GENERATOR_FILE +#include <gmp.h> +#endif + #endif /* ! GCC_SYSTEM_H */ diff --git a/gcc/tree-ssa-loop-niter.c b/gcc/tree-ssa-loop-niter.c index c719a74d47a..4c67c26faf3 100644 --- a/gcc/tree-ssa-loop-niter.c +++ b/gcc/tree-ssa-loop-niter.c @@ -38,7 +38,6 @@ along with GCC; see the file COPYING3. If not see #include "flags.h" #include "diagnostic-core.h" #include "tree-inline.h" -#include "gmp.h" #define SWAP(X, Y) do { affine_iv *tmp = (X); (X) = (Y); (Y) = tmp; } while (0) |
