From: Shenghou Ma <minux@golang.org>
Date: Fri, 19 Dec 2014 05:36:26 +0000 (-0500)
Subject: test/fixedbugs/issue9355: fix build on arm and power64
X-Git-Tag: go1.5beta1~2525
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=958e0792b5a3cbbc4a633bbf829441d51a299e28;p=gostls13.git

test/fixedbugs/issue9355: fix build on arm and power64

Change-Id: I1ef770184ad1d42bcb58714d559f2cc866a919ab
Signed-off-by: Shenghou Ma <minux@golang.org>
Reviewed-on: https://go-review.googlesource.com/1880
Reviewed-by: Keith Randall <khr@golang.org>
---

diff --git a/test/fixedbugs/issue9355.go b/test/fixedbugs/issue9355.go
index a6cf0e32a8..607197fe95 100644
--- a/test/fixedbugs/issue9355.go
+++ b/test/fixedbugs/issue9355.go
@@ -26,11 +26,12 @@ func main() {
 		os.Exit(1)
 	}
 	out := run("go", "tool", a+"g", "-S", filepath.Join("fixedbugs", "issue9355.dir", "a.go"))
+	// 6g/8g print the offset as dec, but 5g/9g print the offset as hex.
 	patterns := []string{
-		`rel 0\+\d t=1 \"\"\.x\+8\r?\n`,  // y = &x.b
-		`rel 0\+\d t=1 \"\"\.x\+28\r?\n`, // z = &x.d.q
-		`rel 0\+\d t=1 \"\"\.b\+5\r?\n`,  // c = &b[5]
-		`rel 0\+\d t=1 \"\"\.x\+88\r?\n`, // w = &x.f[3].r
+		`rel 0\+\d t=1 \"\"\.x\+8\r?\n`,       // y = &x.b
+		`rel 0\+\d t=1 \"\"\.x\+(28|1c)\r?\n`, // z = &x.d.q
+		`rel 0\+\d t=1 \"\"\.b\+5\r?\n`,       // c = &b[5]
+		`rel 0\+\d t=1 \"\"\.x\+(88|58)\r?\n`, // w = &x.f[3].r
 	}
 	for _, p := range patterns {
 		if ok, err := regexp.Match(p, out); !ok || err != nil {