From: Aram Hăvărneanu <aram@mgk.ro>
Date: Sun, 8 Mar 2015 13:27:51 +0000 (+0100)
Subject: test: fix nosplit test, and disable nilptr3 test on arm64
X-Git-Tag: go1.5beta1~1569
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=ddf6d8005dc25ddc0a72e70cf3fc55343119867d;p=gostls13.git

test: fix nosplit test, and disable nilptr3 test on arm64

Change-Id: I5d40e04395de743a8fdcfa8bdc0e580729bc66a3
Reviewed-on: https://go-review.googlesource.com/7147
Reviewed-by: Minux Ma <minux@golang.org>
Reviewed-by: Dave Cheney <dave@cheney.net>
Reviewed-by: Russ Cox <rsc@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
---

diff --git a/test/nilptr3.go b/test/nilptr3.go
index cf26993ef9..a62b262407 100644
--- a/test/nilptr3.go
+++ b/test/nilptr3.go
@@ -1,6 +1,7 @@
 // errorcheck -0 -d=nil
-// Fails on ppc64x because of incomplete optimization.  See issue 9058.
-// +build !ppc64,!ppc64le
+// Fails on ppc64x and arm64 because of incomplete optimization.
+// See issues 9058 and 10105.
+// +build !ppc64,!ppc64le,!arm64
 
 // Copyright 2013 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/test/nosplit.go b/test/nosplit.go
index 0bd13c1db4..bd4e60bc13 100644
--- a/test/nosplit.go
+++ b/test/nosplit.go
@@ -261,6 +261,9 @@ TestCases:
 			fmt.Fprintf(&buf, "#define CALL BL\n#define REGISTER (CTR)\n#define RET RETURN\n")
 		case "arm":
 			fmt.Fprintf(&buf, "#define CALL BL\n#define REGISTER (R0)\n")
+		case "arm64":
+			ptrSize = 8
+			fmt.Fprintf(&buf, "#define CALL BL\n#define REGISTER (R0)\n")
 		case "amd64":
 			ptrSize = 8
 			fmt.Fprintf(&buf, "#define REGISTER AX\n")