[dev.ssa] Merge remote-tracking branch 'origin/master' into mergebranch

Semi-regular merge from tip to dev.ssa.

Conflicts:
	src/runtime/sys_windows_amd64.s

Change-Id: I5f733130049c810e6ceacd46dad85faebca52b29

1 files changed, 2 insertions, 3 deletions

diff --git a/test/nosplit.go b/test/nosplit.go
index b49a7ce8e5..2bf7077808 100644
--- a/test/nosplit.go
+++ b/test/nosplit.go
@@ -9,7 +9,6 @@ package main
 
 import (
 	"bytes"
-	"cmd/internal/obj"
 	"fmt"
 	"io/ioutil"
 	"log"
@@ -303,13 +302,13 @@ TestCases:
 				// Instead of rewriting the test cases above, adjust
 				// the first stack frame to use up the extra bytes.
 				if i == 0 {
-					size += (obj.StackGuard - 128) - 128
+					size += (1024 - 128) - 128
 					// Noopt builds have a larger stackguard.
 					// See ../src/cmd/dist/buildruntime.go:stackGuardMultiplier
 					// This increase is included in obj.StackGuard
 					for _, s := range strings.Split(os.Getenv("GO_GCFLAGS"), " ") {
 						if s == "-N" {
-							size += obj.StackGuard
+							size += 1024
 						}
 					}
 				}