compiler: code cleanup (unused header file)

    Remove inclusion of simple-ojbject.h (no longer needed);
    adjust comments.

    Reviewed-on: https://go-review.googlesource.com/28856

From-SVN: r240067

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 3b1f03a1fbe7cfabac2a743e5e2ba6a92f23a2a4..daa4bcf8bc6213823a3ebfc670c0f72af402aa7f 100644 (file)
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-c2bd848dce774e8009ae1d8ee5d91ddc601ce37f
+6e791d2f3c183d55fdcabe3df20f01c029fd6d54
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.

diff --git a/gcc/go/gofrontend/import.cc b/gcc/go/gofrontend/import.cc
index 54fd4c95719023bcd2aaa6314029bd2dcea16e2d..d150020a4a36f0f6333de66421ca4070f9dc430e 100644 (file)
--- a/gcc/go/gofrontend/import.cc
+++ b/gcc/go/gofrontend/import.cc
@@ -7,7 +7,6 @@
 #include "go-system.h"
 
 #include "filenames.h"
-#include "simple-object.h"
 
 #include "go-c.h"
 #include "gogo.h"
@@ -233,7 +232,7 @@ Import::find_export_data(const std::string& filename, int fd, Location location)
   return NULL;
 }
 
-// Look for export data in a simple_object.
+// Look for export data in an object file.
 
 Import::Stream*
 Import::find_object_export_data(const std::string& filename,