From 3ff15c3be3a3ebeade100538cd6c022154ead68f Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <iant@google.com>
Date: Fri, 21 Dec 2012 15:59:27 +0000
Subject: [PATCH] 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
---
 gcc/go/ChangeLog                 | 5 +++++
 gcc/go/go-system.h               | 9 ---------
 gcc/go/gofrontend/expressions.cc | 2 --
 gcc/go/gofrontend/expressions.h  | 1 -
 gcc/go/gofrontend/gogo-tree.cc   | 2 --
 gcc/go/gofrontend/lex.h          | 1 -
 gcc/go/gofrontend/runtime.cc     | 2 --
 gcc/go/gofrontend/statements.cc  | 2 --
 gcc/go/gofrontend/types.cc       | 2 --
 9 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/gcc/go/ChangeLog b/gcc/go/ChangeLog
index 477e6ed32f7..6d6b14b1109 100644
--- 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 2decc555df5..85160cd4910 100644
--- 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 f10627295b8..9abd2247f37 100644
--- 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 66e05a7bcfd..152c2232454 100644
--- 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 7159dfb6244..2ffc5085be8 100644
--- 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 fc9258b880a..383a9178780 100644
--- 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 059263db44e..ecc508d0dcc 100644
--- 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 fb1322f42f3..7870dad729e 100644
--- 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 44d6a61f8e6..c0aeb91acff 100644
--- 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"
-- 
2.30.2