diff options
| author | Diego Novillo <dnovillo@google.com> | 2012-08-16 14:24:22 -0400 |
|---|---|---|
| committer | Diego Novillo <dnovillo@gcc.gnu.org> | 2012-08-16 14:24:22 -0400 |
| commit | 6c76b723d23c2976d2275bb20122f1655b418eb3 (patch) | |
| tree | 0f8c1aeacbb194e1610043236374f255b6dba383 | |
| parent | e426fa99fe47e9460dd690b18527b17b89fc586e (diff) | |
| download | gcc-6c76b723d23c2976d2275bb20122f1655b418eb3.zip gcc-6c76b723d23c2976d2275bb20122f1655b418eb3.tar.gz gcc-6c76b723d23c2976d2275bb20122f1655b418eb3.tar.bz2 | |
revert: re PR bootstrap/54281 (Fails to bootstrap with --disable-nls)
2012-08-16 Diego Novillo <dnovillo@google.com>
Revert
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.
From-SVN: r190449
| -rw-r--r-- | gcc/ChangeLog | 10 | ||||
| -rw-r--r-- | gcc/double-int.h | 4 | ||||
| -rw-r--r-- | gcc/fortran/ChangeLog | 7 | ||||
| -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, 24 insertions, 8 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index aeabc51..a8ff00d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,13 @@ +2012-08-16 Diego Novillo <dnovillo@google.com> + + Revert + + 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 Segher Boessenkool <segher@kernel.crashing.org> * config/rs6000/darwin.h (TARGET_IEEE_QUAD): Fix comment. diff --git a/gcc/double-int.h b/gcc/double-int.h index 7ea0528..3d9aa2c 100644 --- a/gcc/double-int.h +++ b/gcc/double-int.h @@ -20,6 +20,10 @@ 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 25b276b..f066e55 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,12 @@ 2012-08-16 Diego Novillo <dnovillo@google.com> + Revert + + PR bootstrap/54281 + * gfortran.h: Do not include gmp.h. + +2012-08-16 Diego Novillo <dnovillo@google.com> + PR bootstrap/54281 * gfortran.h: Do not include gmp.h. diff --git a/gcc/fortran/gfortran.h b/gcc/fortran/gfortran.h index 611d16d..7c4c0a4 100644 --- a/gcc/fortran/gfortran.h +++ b/gcc/fortran/gfortran.h @@ -1681,6 +1681,7 @@ 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 ada876e..ab234e9 100644 --- a/gcc/realmpfr.h +++ b/gcc/realmpfr.h @@ -22,10 +22,7 @@ #ifndef GCC_REALGMP_H #define GCC_REALGMP_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 <gmp.h> #include <mpfr.h> #include <mpc.h> #include "real.h" diff --git a/gcc/system.h b/gcc/system.h index 0ccd991..9e7d503 100644 --- a/gcc/system.h +++ b/gcc/system.h @@ -1037,8 +1037,4 @@ 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 38b47b0..8f1e2b4 100644 --- a/gcc/tree-ssa-loop-niter.c +++ b/gcc/tree-ssa-loop-niter.c @@ -38,6 +38,7 @@ 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) |