diff options
Diffstat (limited to 'src/cmd/ld/dwarf.c')
| -rw-r--r-- | src/cmd/ld/dwarf.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/cmd/ld/dwarf.c b/src/cmd/ld/dwarf.c index 373cf5523..57e5a4283 100644 --- a/src/cmd/ld/dwarf.c +++ b/src/cmd/ld/dwarf.c @@ -775,7 +775,7 @@ enum { KindNoPointers = 1<<7, // size of Type interface header + CommonType structure. - CommonSize = 2*PtrSize+ 4*PtrSize + 8, + CommonSize = 2*PtrSize+ 5*PtrSize + 8, }; static Reloc* @@ -1439,7 +1439,7 @@ defdwsymb(Sym* sym, char *s, int t, vlong v, vlong size, int ver, Sym *gotype) if (strncmp(s, "go.string.", 10) == 0) return; - if (strncmp(s, "type.", 5) == 0 && strcmp(s, "type.*") != 0) { + if (strncmp(s, "type.", 5) == 0 && strcmp(s, "type.*") != 0 && strncmp(s, "type..", 6) != 0) { defgotype(sym); return; } @@ -1601,7 +1601,7 @@ finddebugruntimepath(void) char *c; for (i = 1; i < histfilesize; i++) { - if ((c = strstr(histfile[i], "runtime/runtime_defs.go")) != nil) { + if ((c = strstr(histfile[i], "runtime/zruntime_defs")) != nil) { l = c - histfile[i]; memmove(gdbscript, histfile[i], l); memmove(gdbscript + l, "runtime/runtime-gdb.py", strlen("runtime/runtime-gdb.py") + 1); @@ -2317,7 +2317,7 @@ dwarfemitdebugsections(void) // Needed by the prettyprinter code for interface inspection. defgotype(lookup_or_diag("type.runtime.commonType")); - defgotype(lookup_or_diag("type.runtime.InterfaceType")); + defgotype(lookup_or_diag("type.runtime.interfaceType")); defgotype(lookup_or_diag("type.runtime.itab")); genasmsym(defdwsymb); |