diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 4ebc803a915..2632f4e6724 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -2bf7c643a1d2f8503070c8e6cb87852026e32400 +d5aad2f400a0f21724e33e4ae48e1583ed8b1a87 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/runtime/mprof.goc b/libgo/runtime/mprof.goc index d9c220bca23..c9022df3dfb 100644 --- a/libgo/runtime/mprof.goc +++ b/libgo/runtime/mprof.goc @@ -402,10 +402,9 @@ func ThreadCreateProfile(p Slice) (n int, ok bool) { } func Stack(b Slice, all bool) (n int) { - byte *pc, *sp; + byte *pc; bool enablegc; - sp = runtime_getcallersp(&b); pc = (byte*)(uintptr)runtime_getcallerpc(&b); if(all) { @@ -423,7 +422,6 @@ func Stack(b Slice, all bool) (n int) { g->writebuf = (byte*)b.__values; g->writenbuf = b.__count; USED(pc); - USED(sp); runtime_goroutineheader(g); runtime_traceback(); runtime_printcreatedby(g);