diff options
| author | Ian Lance Taylor <iant@golang.org> | 2021-02-02 12:42:10 -0800 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2021-02-02 12:42:10 -0800 |
| commit | 8910f1cd79445bbe2da01f8ccf7c37909349529e (patch) | |
| tree | ba67a346969358fd7cc2b7c12384479de8364cab /libgo/runtime | |
| parent | 45c32be1f96ace25b66c34a84818dc5e07e9d516 (diff) | |
| parent | 8e4a738d2540ab6aff77506d368bf4e3fa6963bd (diff) | |
| download | gcc-8910f1cd79445bbe2da01f8ccf7c37909349529e.zip gcc-8910f1cd79445bbe2da01f8ccf7c37909349529e.tar.gz gcc-8910f1cd79445bbe2da01f8ccf7c37909349529e.tar.bz2 | |
Merge from trunk revision 8e4a738d2540ab6aff77506d368bf4e3fa6963bd.
Diffstat (limited to 'libgo/runtime')
| -rw-r--r-- | libgo/runtime/go-caller.c | 7 | ||||
| -rw-r--r-- | libgo/runtime/proc.c | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/libgo/runtime/go-caller.c b/libgo/runtime/go-caller.c index a187876..f1077df 100644 --- a/libgo/runtime/go-caller.c +++ b/libgo/runtime/go-caller.c @@ -65,10 +65,9 @@ callback (void *data, uintptr_t pc __attribute__ ((unused)), if (c->index == 0) { - /* If there are more frames after the indexed one, and we should - skip this one, then skip it. */ - if (c->more - && c->fn.len > 0 + /* If we should skip the frame we have, then see if we can get + another one. */ + if (c->fn.len > 0 && runtime_skipInCallback((const char *) c->fn.str, NULL)) return 0; diff --git a/libgo/runtime/proc.c b/libgo/runtime/proc.c index 274ce01..c037df6 100644 --- a/libgo/runtime/proc.c +++ b/libgo/runtime/proc.c @@ -222,6 +222,9 @@ runtime_m(void) } // Set g. + +void runtime_setg(G*) __attribute__ ((no_split_stack)); + void runtime_setg(G* gp) { |