From d106911b0d8a0575daba3c7097c2c2d8878da8c7 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Fri, 21 Dec 2012 14:33:13 +0000 Subject: [PATCH] re PR bootstrap/54659 (Bootstrap with --disable-nls broken under Windows) 2012-12-21 Richard Biener PR bootstrap/54659 * system.h: Include gmp.h. * tree-ssa-loop-niter.c: Do not include gmp.h here. * double-int.h: Likewise. * realmpfr.h: Likewise. fortran/ * gfortran.h: Do not include gmp.h here. From-SVN: r194665 --- gcc/ChangeLog | 8 ++++++++ gcc/double-int.h | 4 ---- gcc/fortran/ChangeLog | 5 +++++ gcc/fortran/gfortran.h | 1 - gcc/realmpfr.h | 1 - gcc/system.h | 2 ++ gcc/tree-ssa-loop-niter.c | 1 - 7 files changed, 15 insertions(+), 7 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 90ecae0e034..53bbd712442 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2012-12-21 Richard Biener + + PR bootstrap/54659 + * system.h: Include gmp.h. + * tree-ssa-loop-niter.c: Do not include gmp.h here. + * double-int.h: Likewise. + * realmpfr.h: Likewise. + 2012-12-21 Greta Yorsh * config/arm/cortex-a7.md: New file. diff --git a/gcc/double-int.h b/gcc/double-int.h index f4eb6ab0a77..b3f33863287 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 -#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 7924fe77055..6d98c8cde41 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2012-12-21 Richard Biener + + PR bootstrap/54659 + * gfortran.h: Do not include gmp.h here. + 2012-12-21 Paul Thomas PR fortran/55763 diff --git a/gcc/fortran/gfortran.h b/gcc/fortran/gfortran.h index ec0c61f09c9..f12099228a0 100644 --- a/gcc/fortran/gfortran.h +++ b/gcc/fortran/gfortran.h @@ -1699,7 +1699,6 @@ gfc_intrinsic_sym; EXPR_COMPCALL Function (or subroutine) call of a procedure pointer component or type-bound procedure. */ -#include #include #include #define GFC_RND_MODE GMP_RNDN diff --git a/gcc/realmpfr.h b/gcc/realmpfr.h index ab234e9195d..4cfa4fb5803 100644 --- a/gcc/realmpfr.h +++ b/gcc/realmpfr.h @@ -22,7 +22,6 @@ #ifndef GCC_REALGMP_H #define GCC_REALGMP_H -#include #include #include #include "real.h" diff --git a/gcc/system.h b/gcc/system.h index 54d86acc360..ab1b887b847 100644 --- a/gcc/system.h +++ b/gcc/system.h @@ -638,6 +638,8 @@ extern int vsnprintf(char *, size_t, const char *, va_list); #include #endif +#include + /* Get libiberty declarations. */ #include "libiberty.h" diff --git a/gcc/tree-ssa-loop-niter.c b/gcc/tree-ssa-loop-niter.c index 4a09999f434..7a15ff82d5b 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) -- 2.30.2