diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 582a86b0088f..29c971c25a04 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-5c6c93f58e2aaae186bac5dcde9df1679d4896b1
+f8c451ed42fd71b85afab54a33fc321df0ff3b0b
 
 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 60d5bdbc6124..06a9c2ad6b84 100644
--- a/libgo/runtime/proc.c
+++ b/libgo/runtime/proc.c
@@ -631,7 +631,7 @@ void getTraceback(G* me, G* gp)
 #ifdef USING_SPLIT_STACK
 	__splitstack_getcontext(&me->stackcontext[0]);
 #endif
-	getcontext(ucontext_arg(&me->stackcontext[0]));
+	getcontext(ucontext_arg(&me->context[0]));
 
 	if (gp->traceback != nil) {
 		runtime_gogo(gp);