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
This commit is contained in:
Diego Novillo 2012-08-16 14:24:22 -04:00 committed by Diego Novillo
parent e426fa99fe
commit 6c76b723d2
7 changed files with 24 additions and 8 deletions

View file

@ -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.

View file

@ -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

View file

@ -1,3 +1,10 @@
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

View file

@ -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

View file

@ -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"

View file

@ -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 */

View file

@ -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)