diff options
| author | Ian Lance Taylor <iant@golang.org> | 2020-12-04 11:34:50 -0800 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2020-12-04 14:51:09 -0800 |
| commit | 918a5b84a2c51dc9d011d39461cc276e6558069d (patch) | |
| tree | a8a120ef5393206d3bc9d2b5882bac1562824836 | |
| parent | a95753214b55d21e5b44eeb098cccf88d44c94dd (diff) | |
| download | gcc-918a5b84a2c51dc9d011d39461cc276e6558069d.zip gcc-918a5b84a2c51dc9d011d39461cc276e6558069d.tar.gz gcc-918a5b84a2c51dc9d011d39461cc276e6558069d.tar.bz2 | |
runtime: update type descriptor name in fieldtrack C support code
We were using the old name, but nothing noticed because it is a weak
reference that is permitted to be nil, so that it works with code that
does not use the field tracking library.
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/275449
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/runtime/go-fieldtrack.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index cd1a396..019aafd 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -b3a0b068f7fa2d65ba781271b2c0479d103b7d7b +342e5f0b349553a69d7c99a18162ae2a1e6e5775 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-fieldtrack.c b/libgo/runtime/go-fieldtrack.c index 22f091b..80be27c 100644 --- a/libgo/runtime/go-fieldtrack.c +++ b/libgo/runtime/go-fieldtrack.c @@ -31,7 +31,7 @@ extern void *mapassign (const struct maptype *, void *hmap, const void *key) // The type descriptor for map[string] bool. */ extern const char map_string_bool[] __attribute__ ((weak)); extern const char map_string_bool[] - __asm__ (GOSYM_PREFIX "type..map.6string.7bool"); + __asm__ (GOSYM_PREFIX "type..map_6string_7bool"); void runtime_Fieldtrack (void *) __asm__ (GOSYM_PREFIX "runtime.Fieldtrack"); |