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

	PR bootstrap/54659

compiler: Don't include <gmp.h>, now included by go-system.h.

	* go-system.h: Don't include <cstdio>.

From-SVN: r194669

diff --git a/gcc/go/ChangeLog b/gcc/go/ChangeLog
index 477e6ed32f799d71e28d4884de3738a3f86aa020..6d6b14b110988fa17869c836ce02696d482077b5 100644 (file)
--- a/gcc/go/ChangeLog
+++ b/gcc/go/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-21  Ian Lance Taylor  <iant@google.com>
+
+       PR bootstrap/54659
+       * go-system.h: Don't include <cstdio>.
+
 2012-12-18  Ian Lance Taylor  <iant@google.com>
 
        PR go/55201

diff --git a/gcc/go/go-system.h b/gcc/go/go-system.h
index 2decc555df5999f2491260829692c2ff22f39556..85160cd49100a88a3b8d66222c75b3cca6152295 100644 (file)
--- a/gcc/go/go-system.h
+++ b/gcc/go/go-system.h
@@ -125,15 +125,6 @@ struct hash<T*>
 // system.h.
 #include <iostream>
 
-// Some versions of gmp.h assume that #include <iostream> will define
-// std::FILE.  This is not true with libstdc++ 4.3 and later.  This is
-// fixed in GMP 4.3, but at this point we don't know which version of
-// GMP is in use.  Since the top level configure script accepts GMP
-// 4.2, at least for now we #include <cstdio> to ensure that GMP 4.2
-// will work.  FIXME: This can be removed when we require GMP 4.3 or
-// later.
-#include <cstdio>
-
 #include "system.h"
 #include "ansidecl.h"
 #include "coretypes.h"

diff --git a/gcc/go/gofrontend/expressions.cc b/gcc/go/gofrontend/expressions.cc
index f10627295b8411a198e8ff34db47f484c8c8ac31..9abd2247f37f0d5f43ca840c932337b349a91248 100644 (file)
--- a/gcc/go/gofrontend/expressions.cc
+++ b/gcc/go/gofrontend/expressions.cc
@@ -8,8 +8,6 @@
 
 #include <algorithm>
 
-#include <gmp.h>
-
 #include "toplev.h"
 #include "intl.h"
 #include "tree.h"

diff --git a/gcc/go/gofrontend/expressions.h b/gcc/go/gofrontend/expressions.h
index 66e05a7bcfde770d56e8fcc17ff27523b9661c0d..152c2232454d43bf88f8a931ed42503eb7662058 100644 (file)
--- a/gcc/go/gofrontend/expressions.h
+++ b/gcc/go/gofrontend/expressions.h
@@ -7,7 +7,6 @@
 #ifndef GO_EXPRESSIONS_H
 #define GO_EXPRESSIONS_H
 
-#include <gmp.h>
 #include <mpfr.h>
 
 #include "operator.h"

diff --git a/gcc/go/gofrontend/gogo-tree.cc b/gcc/go/gofrontend/gogo-tree.cc
index 7159dfb6244ede5f7e2a38f615788e286cf3d156..2ffc5085be816b2fb50729310b619aac08cf3afe 100644 (file)
--- a/gcc/go/gofrontend/gogo-tree.cc
+++ b/gcc/go/gofrontend/gogo-tree.cc
@@ -6,8 +6,6 @@
 
 #include "go-system.h"
 
-#include <gmp.h>
-
 #include "toplev.h"
 #include "tree.h"
 #include "gimple.h"

diff --git a/gcc/go/gofrontend/lex.h b/gcc/go/gofrontend/lex.h
index fc9258b880a33978c80135369fbd040088962053..383a91787802c563337ea80ddfde83bcca9d155b 100644 (file)
--- a/gcc/go/gofrontend/lex.h
+++ b/gcc/go/gofrontend/lex.h
@@ -7,7 +7,6 @@
 #ifndef GO_LEX_H
 #define GO_LEX_H
 
-#include <gmp.h>
 #include <mpfr.h>
 
 #include "operator.h"

diff --git a/gcc/go/gofrontend/runtime.cc b/gcc/go/gofrontend/runtime.cc
index 059263db44e276a541751a54816773570fa5574a..ecc508d0dccb753fcd547b3666e193a5cb98cf38 100644 (file)
--- a/gcc/go/gofrontend/runtime.cc
+++ b/gcc/go/gofrontend/runtime.cc
@@ -6,8 +6,6 @@
 
 #include "go-system.h"
 
-#include <gmp.h>
-
 #include "gogo.h"
 #include "types.h"
 #include "expressions.h"

diff --git a/gcc/go/gofrontend/statements.cc b/gcc/go/gofrontend/statements.cc
index fb1322f42f3df976127b3509a2d1087fa079b359..7870dad729efa43999c94e644dca9dd21c01f7fc 100644 (file)
--- a/gcc/go/gofrontend/statements.cc
+++ b/gcc/go/gofrontend/statements.cc
@@ -6,8 +6,6 @@
 
 #include "go-system.h"
 
-#include <gmp.h>
-
 #include "go-c.h"
 #include "types.h"
 #include "expressions.h"

diff --git a/gcc/go/gofrontend/types.cc b/gcc/go/gofrontend/types.cc
index 44d6a61f8e67cbf2d222ed01d9a85d5dfac21f04..c0aeb91acff1a7c8f2f9527421e0115eb7cdb9e4 100644 (file)
--- a/gcc/go/gofrontend/types.cc
+++ b/gcc/go/gofrontend/types.cc
@@ -6,8 +6,6 @@
 
 #include "go-system.h"
 
-#include <gmp.h>
-
 #include "toplev.h"
 #include "intl.h"
 #include "tree.h"