aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2017-11-30 05:03:29 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2017-11-30 05:03:29 +0000
commit222353edef6528ab5ff0f3c029425e76e7048fd8 (patch)
tree7c3f691d318e44ce019b414bc77de715affb9883 /gcc
parent3be30be2c391a095f034fc7adae607c0d5da1f02 (diff)
downloadgcc-222353edef6528ab5ff0f3c029425e76e7048fd8.zip
gcc-222353edef6528ab5ff0f3c029425e76e7048fd8.tar.gz
gcc-222353edef6528ab5ff0f3c029425e76e7048fd8.tar.bz2
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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/go/gofrontend/MERGE2
-rw-r--r--gcc/go/gofrontend/types.cc6
2 files changed, 4 insertions, 4 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 8141a4e..9aee310 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 247f40a..2c8d143 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;
}