From 918a5b84a2c51dc9d011d39461cc276e6558069d Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Fri, 4 Dec 2020 11:34:50 -0800 Subject: [PATCH] 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 --- gcc/go/gofrontend/MERGE | 2 +- 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 cd1a3961a06..019aafdde9a 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 22f091be3f4..80be27ca5e3 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"); -- 2.30.2