Commit 6c54bf99 authored by Shenghou Ma's avatar Shenghou Ma

runtime: fix build for Linux/ARM

R=dave, rsc
CC=golang-dev
https://golang.org/cl/7299055
parent c94eddd1
...@@ -183,10 +183,15 @@ runtime·gentraceback(byte *pc0, byte *sp, byte *lr0, G *gp, int32 skip, uintptr ...@@ -183,10 +183,15 @@ runtime·gentraceback(byte *pc0, byte *sp, byte *lr0, G *gp, int32 skip, uintptr
if(f->entry == (uintptr)runtime·deferproc || f->entry == (uintptr)runtime·newproc) if(f->entry == (uintptr)runtime·deferproc || f->entry == (uintptr)runtime·newproc)
sp += 12; sp += 12;
// sighandler saves the lr on stack before fake a call to sigpanic // sighandler saves the lr on stack before faking a call to sigpanic
if(waspanic) { if(waspanic) {
pc = *(uintptr *)sp; x = *(uintptr *)sp;
sp += 4; sp += 4;
f = runtime·findfunc(pc);
if (f == nil) {
pc = x;
} else if (f->frame == 0)
lr = x;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment