diff options
| author | Keith Randall <khr@golang.org> | 2015-11-16 13:20:16 -0800 |
|---|---|---|
| committer | Keith Randall <khr@golang.org> | 2015-11-16 17:19:42 -0800 |
| commit | 4304fbc4d0e024d948ef637d19d89b0b6359788f (patch) | |
| tree | e178b3d8220239ad50be4ce974b965533950c775 /test/nilptr3.go | |
| parent | 75102afce77f1376b0aab3f1d5fee9b881d0f68a (diff) | |
| parent | 2c11164db52bca183da4c3ac09ceac7565835d53 (diff) | |
| download | go-4304fbc4d0e024d948ef637d19d89b0b6359788f.tar.gz go-4304fbc4d0e024d948ef637d19d89b0b6359788f.zip | |
[dev.ssa] Merge remote-tracking branch 'origin/master' into mergebranch
Conflicts:
src/cmd/compile/internal/gc/racewalk.go
src/cmd/internal/obj/stack.go
src/cmd/internal/obj/x86/obj6.go
src/runtime/stack.go
test/nilptr3.go
test/nosplit.go
Change-Id: Ie6053eb1577fd73e8243651f25c0f1fc765ae660
Diffstat (limited to 'test/nilptr3.go')
| -rw-r--r-- | test/nilptr3.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/nilptr3.go b/test/nilptr3.go index 33045207b2..1ba774d839 100644 --- a/test/nilptr3.go +++ b/test/nilptr3.go @@ -1,7 +1,8 @@ // errorcheck -0 -d=nil // Fails on ppc64x because of incomplete optimization. // See issues 9058. -// +build !ppc64,!ppc64le,!amd64 +// Same reason for mips64x. +// +build !ppc64,!ppc64le,!mips64,!mips64le,!amd64 // Copyright 2013 The Go Authors. All rights reserved. // Use of this source code is governed by a BSD-style |