From 61fbdfbe1b1efc68dd02f03b0d915dc2ded0e076 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Thu, 22 Jun 2017 19:52:11 +0000
Subject: [PATCH] runtime: fix type cast in assignment to gcnextsp in C code

    Patch from Rainer Orth.

    Reviewed-on: https://go-review.googlesource.com/46459

From-SVN: r249575
---
 gcc/go/gofrontend/MERGE | 2 +-
 libgo/runtime/proc.c    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index ccc7919d2c2..e3fcdb8cc2f 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-681c8a7b0a9d52c0b81e7a4b1c55fe65ed889573
+27204e41643f4549c5ed97d48e17912f64c0aa71
 
 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 303a1b580b3..1272669a8bd 100644
--- a/libgo/runtime/proc.c
+++ b/libgo/runtime/proc.c
@@ -678,7 +678,7 @@ doentersyscallblock(uintptr pc, uintptr sp)
 	{
 		void *v;
 
-		g->gcnextsp = (byte *) &v;
+		g->gcnextsp = (uintptr)(&v);
 	}
 #endif
 
-- 
2.30.2