compiler: use macro Unordered_map instead of std::unordered_map

    Per gcc/go/go-system.h, this is what it is supposed to be, to
    support wider platforms.

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

From-SVN: r256389

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index d836309e6a0edc1c77eb9ba7ca7f0c985beb3dbc..9ed20786abaf36cfe9b7852e4821eb5e67af036c 100644 (file)
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-dbc0c7e4329aada2ae3554c20cfb8cfa48041213
+0445dc01fd75325ff99f839cfaab29cb9f2a1f97
 
 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/escape.cc b/gcc/go/gofrontend/escape.cc
index 870680860d5e72546459832a3bd6d3dd433e3cb9..50878ff9bfc1b9dd3fe3ec3207e894f9d9d5d503 100644 (file)
--- a/gcc/go/gofrontend/escape.cc
+++ b/gcc/go/gofrontend/escape.cc
@@ -858,7 +858,7 @@ Gogo::analyze_escape()
 
       // Propagate levels across each dst.  This is the flood phase.
       std::set<Node*> dsts = context->dsts();
-      std::unordered_map<Node*, int> escapes;
+      Unordered_map(Node*, int) escapes;
       for (std::set<Node*>::iterator n = dsts.begin();
            n != dsts.end();
            ++n)