diff options
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/runtime/go-callers.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index ca79704..dce38e7 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -d53e8a0e94e34dc609e34dd5e404debda2640cfb +6543b7fc6da533eb976b37649a925e7fd5a521fa 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-callers.c b/libgo/runtime/go-callers.c index 3178369..1d4dee6 100644 --- a/libgo/runtime/go-callers.c +++ b/libgo/runtime/go-callers.c @@ -107,7 +107,7 @@ callback (void *data, uintptr_t pc, const char *filename, int lineno, p = function; if (__builtin_strncmp (p, "___", 3) == 0) ++p; - if (__builtin_strncmp (p, "__morestack_", 12) == 0) + if (__builtin_strncmp (p, "__morestack", 11) == 0) return 0; } else if (filename != NULL) |