diff options
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | 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 ccc7919..e3fcdb8 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 303a1b5..1272669 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 |