diff options
| author | Russ Cox <rsc@golang.org> | 2014-10-29 12:25:24 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2014-10-29 12:25:24 -0400 |
| commit | 710efc5a3085f55968c120abb25206fb72c05d46 (patch) | |
| tree | 433262b4bdac6643d923971ea21bb39cb69822a7 /src/runtime/panic.c | |
| parent | 40520a21d8b050635a417666db959f75d757fff5 (diff) | |
| parent | cc517ca5f7183e7f5d91bf75897b23cc0f4ed04f (diff) | |
| download | go-710efc5a3085f55968c120abb25206fb72c05d46.tar.gz | |
[dev.garbage] all: merge dev.power64 (5ad5e85cfb99) into dev.garbage
The goal here is to get the big-endian fixes so that
in some upcoming code movement for write barriers
I don't make them unmergeable.
LGTM=rlh
R=rlh
CC=golang-codereviews
https://codereview.appspot.com/166890043
Diffstat (limited to 'src/runtime/panic.c')
| -rw-r--r-- | src/runtime/panic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/runtime/panic.c b/src/runtime/panic.c index 24eb6dbfe..46683b2b0 100644 --- a/src/runtime/panic.c +++ b/src/runtime/panic.c @@ -70,7 +70,7 @@ runtime·recovery_m(G *gp) // (The pc we're returning to does pop pop // before it tests the return value.) // On the arm there are 2 saved LRs mixed in too. - if(thechar == '5') + if(thechar == '5' || thechar == '9') gp->sched.sp = (uintptr)argp - 4*sizeof(uintptr); else gp->sched.sp = (uintptr)argp - 2*sizeof(uintptr); |