From d2d9bc36ee79f7c823d1f1eb181f8eb77d8ba08b Mon Sep 17 00:00:00 2001
From: Chris Manghane <cmang@google.com>
Date: Thu, 1 May 2014 01:20:07 +0000
Subject: [PATCH] go-backend.c: #include "diagnostics.h".

	* go-backend.c: #include "diagnostics.h".
	(saw_errors): New function.
	* go-c.h (saw_errors): Declare.
	* Make-lang.in (GO_OBJS): Remove go/gogo-tree.o.

From-SVN: r209968
---
 gcc/go/ChangeLog               |  7 +++++++
 gcc/go/Make-lang.in            |  1 -
 gcc/go/go-backend.c            |  9 +++++++++
 gcc/go/go-c.h                  |  2 ++
 gcc/go/gofrontend/gogo-tree.cc | 37 ----------------------------------
 5 files changed, 18 insertions(+), 38 deletions(-)
 delete mode 100644 gcc/go/gofrontend/gogo-tree.cc

diff --git a/gcc/go/ChangeLog b/gcc/go/ChangeLog
index 2bb10ed9b1c1..a468beed742b 100644
--- a/gcc/go/ChangeLog
+++ b/gcc/go/ChangeLog
@@ -1,3 +1,10 @@
+2014-04-30  Chris Manghane  <cmang@google.com>
+
+	* go-backend.c: #include "diagnostics.h".
+	(saw_errors): New function.
+	* go-c.h (saw_errors): Declare.
+	* Make-lang.in (GO_OBJS): Remove go/gogo-tree.o.
+
 2014-04-30  Chris Manghane  <cmang@google.com>
 
 	* go-lang.c (go_langhook_type_for_size): Do it here, rather than
diff --git a/gcc/go/Make-lang.in b/gcc/go/Make-lang.in
index abcae66a21f5..bbd26dc21108 100644
--- a/gcc/go/Make-lang.in
+++ b/gcc/go/Make-lang.in
@@ -60,7 +60,6 @@ GO_OBJS = \
 	go/go-linemap.o \
 	go/go-optimize.o \
 	go/go.o \
-	go/gogo-tree.o \
 	go/gogo.o \
 	go/import.o \
 	go/import-archive.o \
diff --git a/gcc/go/go-backend.c b/gcc/go/go-backend.c
index de33601db520..3f1a9f93b713 100644
--- a/gcc/go/go-backend.c
+++ b/gcc/go/go-backend.c
@@ -29,6 +29,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "output.h"	/* for assemble_string */
 #include "target.h"
 #include "common/common-target.h"
+#include "diagnostic.h"
 
 #include "go-c.h"
 
@@ -48,6 +49,14 @@ along with GCC; see the file COPYING3.  If not see
 /* This file holds all the cases where the Go frontend needs
    information from gcc's backend.  */
 
+/* Return whether or not GCC has reported any errors.  */
+
+bool
+saw_errors (void)
+{
+  return errorcount != 0 || sorrycount != 0;
+}
+
 /* Return the alignment in bytes of a struct field of type T.  */
 
 unsigned int
diff --git a/gcc/go/go-c.h b/gcc/go/go-c.h
index d5cf48f04e66..cb10f2b7be71 100644
--- a/gcc/go/go-c.h
+++ b/gcc/go/go-c.h
@@ -46,6 +46,8 @@ extern void go_write_globals (void);
 
 extern void go_preserve_from_gc (tree);
 
+extern bool saw_errors (void);
+
 extern const char *go_localize_identifier (const char*);
 
 extern unsigned int go_field_alignment (tree);
diff --git a/gcc/go/gofrontend/gogo-tree.cc b/gcc/go/gofrontend/gogo-tree.cc
deleted file mode 100644
index 9a6ffa6a0406..000000000000
--- a/gcc/go/gofrontend/gogo-tree.cc
+++ /dev/null
@@ -1,37 +0,0 @@
-// gogo-tree.cc -- convert Go frontend Gogo IR to gcc trees.
-
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "go-system.h"
-
-#include "toplev.h"
-#include "tree.h"
-#include "stringpool.h"
-#include "stor-layout.h"
-#include "varasm.h"
-#include "gimple-expr.h"
-#include "gimplify.h"
-#include "tree-iterator.h"
-#include "cgraph.h"
-#include "langhooks.h"
-#include "convert.h"
-#include "output.h"
-#include "diagnostic.h"
-#include "go-c.h"
-
-#include "types.h"
-#include "expressions.h"
-#include "statements.h"
-#include "runtime.h"
-#include "backend.h"
-#include "gogo.h"
-
-// Whether we have seen any errors.
-
-bool
-saw_errors()
-{
-  return errorcount != 0 || sorrycount != 0;
-}
-- 
2.47.3