diff options
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/runtime/runtime.h | 2 | ||||
| -rw-r--r-- | libgo/runtime/stack.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 7050d78..27e74e5 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -9cc7092b84c38d77d98ed856f1f613a6ca27122d +017830d2a4bd2efbddf5e841ba9ccff8acf9d7c8 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/runtime.h b/libgo/runtime/runtime.h index 399df51..89134c1 100644 --- a/libgo/runtime/runtime.h +++ b/libgo/runtime/runtime.h @@ -475,7 +475,7 @@ bool scanstackwithmap(void*) bool doscanstack(G*, void*) __asm__("runtime.doscanstack"); -bool runtime_usestackmaps; +extern bool runtime_usestackmaps; bool probestackmaps(void) __asm__("runtime.probestackmaps"); diff --git a/libgo/runtime/stack.c b/libgo/runtime/stack.c index aff8dd5..c78f0c4 100644 --- a/libgo/runtime/stack.c +++ b/libgo/runtime/stack.c @@ -16,6 +16,8 @@ extern void * __splitstack_find_context (void *context[10], size_t *, void **, #endif +bool runtime_usestackmaps; + // Calling unwind_init in doscanstack only works if it does not do a // tail call to doscanstack1. #pragma GCC optimize ("-fno-optimize-sibling-calls") |