From: Richard Biener <rguenther@suse.de>
Date: Fri, 21 Dec 2012 14:33:13 +0000 (+0000)
Subject: re PR bootstrap/54659 (Bootstrap with --disable-nls broken under Windows)
X-Git-Tag: releases/gcc-4.8.0~1272
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d106911b0d8a0575daba3c7097c2c2d8878da8c7;p=thirdparty%2Fgcc.git

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 90ecae0e034b..53bbd712442f 100644
--- 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 f4eb6ab0a77d..b3f33863287e 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 7924fe77055c..6d98c8cde413 100644
--- 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 ec0c61f09c99..f12099228a01 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 <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 ab234e9195d4..4cfa4fb5803d 100644
--- 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 54d86acc3602..ab1b887b847e 100644
--- 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 4a09999f434b..7a15ff82d5b9 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)