diff options
author | Keith Randall <khr@golang.org> | 2016-01-19 09:59:21 -0800 |
---|---|---|
committer | Keith Randall <khr@golang.org> | 2016-01-19 14:13:16 -0800 |
commit | 23d5810c8fd2dc079f06c6052f404d81896d74f0 (patch) | |
tree | 1a9626a10d06dcea19bc8272fac788a19167f0e8 /test/nosplit.go | |
parent | 90065eaba42c044af0a35cfc2abda76e9c58ccd3 (diff) | |
parent | c7754c8f54a1ace5fc0a8e36df809c713d2623d6 (diff) | |
download | go-23d5810c8fd2dc079f06c6052f404d81896d74f0.tar.gz go-23d5810c8fd2dc079f06c6052f404d81896d74f0.zip |
[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
Diffstat (limited to 'test/nosplit.go')
-rw-r--r-- | test/nosplit.go | 5 |
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 } } } |