re PR bootstrap/54659 (Bootstrap with --disable-nls broken under Windows)

2012-12-21  Richard Biener  <rguenther@suse.de>

	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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 90ecae0e034bdaaf8f60f75dee6a2d2819e00aeb..53bbd712442f7d336bf7f0acde426214c78638c7 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2012-12-21  Richard Biener  <rguenther@suse.de>
+
+       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  <Greta.Yorsh@arm.com>
 
         * config/arm/cortex-a7.md: New file.

diff --git a/gcc/double-int.h b/gcc/double-int.h
index f4eb6ab0a77d059f5befff8b407641a0b56c1748..b3f33863287e64a48425c6277015540805dce43f 100644 (file)
--- 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 7924fe77055c029a40ba7cf2211cb22f25275530..6d98c8cde4137fb723a4fda065a2fa44586f42f6 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-21  Richard Biener  <rguenther@suse.de>
+
+       PR bootstrap/54659
+       * gfortran.h: Do not include gmp.h here.
+
 2012-12-21  Paul Thomas  <pault@gcc.gnu.org>
 
        PR fortran/55763

diff --git a/gcc/fortran/gfortran.h b/gcc/fortran/gfortran.h
index ec0c61f09c9950ba9fe9be80312a796ecbec3e09..f12099228a01e99baf216c81f9c1842f6571cf18 100644 (file)
--- 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 <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 ab234e9195d456761edc324d0281de9ee66b7224..4cfa4fb5803db88d26700aff467fe76a24a40b8a 100644 (file)
--- a/gcc/realmpfr.h
+++ b/gcc/realmpfr.h
@@ -22,7 +22,6 @@
 #ifndef GCC_REALGMP_H
 #define GCC_REALGMP_H
 
-#include <gmp.h>
 #include <mpfr.h>
 #include <mpc.h>
 #include "real.h"

diff --git a/gcc/system.h b/gcc/system.h
index 54d86acc36021296020e69666a11e411c23ff488..ab1b887b847e6762abbb3ea53eb52eb6fb4e3c83 100644 (file)
--- a/gcc/system.h
+++ b/gcc/system.h
@@ -638,6 +638,8 @@ extern int vsnprintf(char *, size_t, const char *, va_list);
 #include <dlfcn.h>
 #endif
 
+#include <gmp.h>
+
 /* Get libiberty declarations.  */
 #include "libiberty.h"
 

diff --git a/gcc/tree-ssa-loop-niter.c b/gcc/tree-ssa-loop-niter.c
index 4a09999f434b3ea0bab52960130cc8f0f270d5cd..7a15ff82d5b988d0a634cf7c9ee060a60e620dc4 100644 (file)
--- 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)