diff options
| author | Keith Randall <khr@golang.org> | 2014-09-25 08:37:04 -0700 |
|---|---|---|
| committer | Keith Randall <khr@golang.org> | 2014-09-25 08:37:04 -0700 |
| commit | fadd371f5df44d1f6caa6aaae0b46ab5b7e1f3c7 (patch) | |
| tree | f41c02573967b27e3ea4577ee50360147daa43cc /src/runtime/cgo | |
| parent | 0c34008d4e1b07c77820b855e95971ca0e2d9a8b (diff) | |
| download | go-fadd371f5df44d1f6caa6aaae0b46ab5b7e1f3c7.tar.gz | |
runtime: add load_g call in arm callback.
Need to restore the g register. Somehow this line vaporized from
CL 144130043. Also cgo_topofstack -> _cgo_topofstack, that vaporized also.
TBR=rsc
CC=golang-codereviews
https://codereview.appspot.com/150940044
Diffstat (limited to 'src/runtime/cgo')
| -rw-r--r-- | src/runtime/cgo/callbacks.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/runtime/cgo/callbacks.c b/src/runtime/cgo/callbacks.c index cea9b1667..282beeea8 100644 --- a/src/runtime/cgo/callbacks.c +++ b/src/runtime/cgo/callbacks.c @@ -79,5 +79,5 @@ void (*_cgo_free)(void*) = x_cgo_free; extern void x_cgo_thread_start(void*); void (*_cgo_thread_start)(void*) = x_cgo_thread_start; -#pragma cgo_export_static cgo_topofstack -#pragma cgo_export_dynamic cgo_topofstack +#pragma cgo_export_static _cgo_topofstack +#pragma cgo_export_dynamic _cgo_topofstack |