summaryrefslogtreecommitdiff
path: root/src/runtime/panic.c
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2014-11-14 12:09:42 -0500
committerRuss Cox <rsc@golang.org>2014-11-14 12:09:42 -0500
commit66fbfa707147ff58e13beed2d4a957a06bede869 (patch)
tree7840efde671c3cf7bfc68400770eca53aabcb6f8 /src/runtime/panic.c
parentf4110c2e9cc8f316e14f3a4a35789bc821b326bf (diff)
parent9cabb766eb4acbe2c11ad0084659710919f40c0d (diff)
downloadgo-66fbfa707147ff58e13beed2d4a957a06bede869.tar.gz
[dev.garbage] all: merge dev.power64 (7667e41f3ced) into dev.garbage
Now the only difference between dev.cc and dev.garbage is the runtime conversion on the one side and the garbage collection on the other. They both have the same set of changes from default and dev.power64. LGTM=austin R=austin CC=golang-codereviews https://codereview.appspot.com/172570043
Diffstat (limited to 'src/runtime/panic.c')
-rw-r--r--src/runtime/panic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/runtime/panic.c b/src/runtime/panic.c
index 46683b2b0..b19fdd0e1 100644
--- a/src/runtime/panic.c
+++ b/src/runtime/panic.c
@@ -69,7 +69,7 @@ runtime·recovery_m(G *gp)
// each call to deferproc.
// (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.
+ // On the arm and power there are 2 saved LRs mixed in too.
if(thechar == '5' || thechar == '9')
gp->sched.sp = (uintptr)argp - 4*sizeof(uintptr);
else