diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 26f36ec6868..99e32cec32d 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -4f033f29553655ad90493d55059a7bbc6cd63108 +b37a9e66ea584885043240f8f6f1d1c0284eadec 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/proc.c b/libgo/runtime/proc.c index 59dfc09ec13..7e2b172492e 100644 --- a/libgo/runtime/proc.c +++ b/libgo/runtime/proc.c @@ -2396,9 +2396,6 @@ __go_go(void (*fn)(void*), void* arg) uc = ucontext_arg(&vnewg->context[0]); getcontext(uc); uc->uc_stack.ss_sp = vsp; -#ifdef MAKECONTEXT_STACK_TOP - uc->uc_stack.ss_sp += vspsize; -#endif uc->uc_stack.ss_size = vspsize; makecontext(uc, kickoff, 0);