OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Ian Lance Taylor 2018-01-10 15:04:21 +00:00
parent 7b975de05c
commit c9edeca8b8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gcc/go/gofrontend/MERGE
View File

@ -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.

6
libgo/runtime/go-construct-map.c
View File

@ -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)