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

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index ccc7919d2c22ee5cab7a6a4f7bedc4c7abbe53f4..e3fcdb8cc2f70ac5203858ba7e9cd536f17aa9bc 100644 (file)
--- 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 303a1b580b354069e0e5c38ff1917984f183afbe..1272669a8bd03964cc23a003aa1291b08adcd8b7 100644 (file)
--- 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