diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-12-13 22:10:44 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-12-13 22:10:44 +0000 |
| commit | 51426017f8fe0f18295ca467feba3fbb5aad3fa8 (patch) | |
| tree | 2f686f2d4657aa570473986e7d0924794093c67b /libgo/runtime | |
| parent | 0cec14923830569b8727d461bcf64adaf965de83 (diff) | |
| parent | c926fd82bbd336b317266d43b9fa67a83397b06b (diff) | |
| download | gcc-51426017f8fe0f18295ca467feba3fbb5aad3fa8.zip gcc-51426017f8fe0f18295ca467feba3fbb5aad3fa8.tar.gz gcc-51426017f8fe0f18295ca467feba3fbb5aad3fa8.tar.bz2 | |
Merge from trunk revision 279830.
From-SVN: r279387
Diffstat (limited to 'libgo/runtime')
| -rw-r--r-- | libgo/runtime/go-context.S | 3 | ||||
| -rw-r--r-- | libgo/runtime/runtime.h | 2 | ||||
| -rw-r--r-- | libgo/runtime/stack.c | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/libgo/runtime/go-context.S b/libgo/runtime/go-context.S index 170bced..d55baa2 100644 --- a/libgo/runtime/go-context.S +++ b/libgo/runtime/go-context.S @@ -66,8 +66,9 @@ __go_makecontext: ret - .section .note.GNU-stack,"",@progbits .section .note.GNU-split-stack,"",@progbits .section .note.GNU-no-split-stack,"",@progbits #endif + + .section .note.GNU-stack,"",@progbits 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") |