From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Thu, 30 Nov 2017 05:03:29 +0000 (+0000)
Subject: compiler: don't make map zero value constant
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=222353edef6528ab5ff0f3c029425e76e7048fd8;p=gcc.git

compiler: don't make map zero value constant

    The map zero value is a common symbol, and it doesn't really make
    sense to have a constant common symbol. Current GCC has started to
    reject this case, probably as part of the fix for PR 83100.

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

From-SVN: r255266
---

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 8141a4efa69..9aee310c9b8 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-57adb928c3cc61ac8fa47554394670a1c455afc2
+0d6b3abcbfe04949db947081651a503ceb12fe6e
 
 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/types.cc b/gcc/go/gofrontend/types.cc
index 247f40a5202..2c8d1437040 100644
--- a/gcc/go/gofrontend/types.cc
+++ b/gcc/go/gofrontend/types.cc
@@ -7717,10 +7717,10 @@ Map_type::backend_zero_value(Gogo* gogo)
   std::string asm_name(go_selectively_encode_id(zname));
   Bvariable* zvar =
       gogo->backend()->implicit_variable(zname, asm_name,
-                                         barray_type, false, true, true,
-				       Map_type::zero_value_align);
+                                         barray_type, false, false, true,
+					 Map_type::zero_value_align);
   gogo->backend()->implicit_variable_set_init(zvar, zname, barray_type,
-					      false, true, true, NULL);
+					      false, false, true, NULL);
   return zvar;
 }