diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2018-01-10 15:04:21 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2018-01-10 15:04:21 +0000 |
| commit | c9edeca8b88d20afa80143302be64e2e625e707a (patch) | |
| tree | 890926a27857f11a1772650766c7dac371679641 | |
| parent | 7b975de05c3d724c2e7e09474da6d160669fb341 (diff) | |
| download | gcc-c9edeca8b88d20afa80143302be64e2e625e707a.zip gcc-c9edeca8b88d20afa80143302be64e2e625e707a.tar.gz gcc-c9edeca8b88d20afa80143302be64e2e625e707a.tar.bz2 | |
runtime: fix makemap calls in __go_construct_map
The signature of makemap changed with the update to 1.10beta1,
but I forgot to update the call from C code.
Reviewed-on: https://go-review.googlesource.com/87135
From-SVN: r256431
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/runtime/go-construct-map.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 18c23cf..6f8fa9c 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -c18c6bd80e0995827ad3396eb1c2401451de88fd +c22eb29a62b4fd72ad2ea09ebe5fcea5b8ed78b8 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/runtime/go-construct-map.c b/libgo/runtime/go-construct-map.c index 9a48d57..0e71ba93 100644 --- a/libgo/runtime/go-construct-map.c +++ b/libgo/runtime/go-construct-map.c @@ -11,8 +11,8 @@ #include "runtime.h" #include "go-type.h" -extern void *makemap (const struct __go_map_type *, int64_t hint, - void *, void *) +extern void *makemap (const struct __go_map_type *, intgo hint, + void *) __asm__ (GOSYM_PREFIX "runtime.makemap"); extern void *mapassign (const struct __go_map_type *, void *hmap, @@ -29,7 +29,7 @@ __go_construct_map (const struct __go_map_type *type, uintptr_t i; void *p; - ret = makemap(type, (int64_t) count, NULL, NULL); + ret = makemap(type, (intgo) count, NULL); entries = (const unsigned char *) ventries; for (i = 0; i < count; ++i) |