From 7fe9da14deb9edbcc895d6568cacaf3ae08be952 Mon Sep 17 00:00:00 2001
From: Dmitry Vyukov <dvyukov@google.com>
Date: Mon, 15 Feb 2016 21:30:49 +0100
Subject: sys: fix build with Go1.4

It does not know about arm64 arch.

Fixes #17
---
 sys/sys_amd64.go    | 3 +++
 sys/sys_arm64.go    | 3 +++
 sys/sys_ppc64le.go  | 3 +++
 sysgen/syscallnr.go | 7 +++++--
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/sys/sys_amd64.go b/sys/sys_amd64.go
index e7c387fe3..0aa52b81c 100644
--- a/sys/sys_amd64.go
+++ b/sys/sys_amd64.go
@@ -1,4 +1,7 @@
 // AUTOGENERATED FILE
+
+// +build amd64
+
 package sys
 
 // Maps internal syscall ID onto kernel syscall number.
diff --git a/sys/sys_arm64.go b/sys/sys_arm64.go
index 746c9d25a..5b8d4cc06 100644
--- a/sys/sys_arm64.go
+++ b/sys/sys_arm64.go
@@ -1,4 +1,7 @@
 // AUTOGENERATED FILE
+
+// +build arm64
+
 package sys
 
 // Maps internal syscall ID onto kernel syscall number.
diff --git a/sys/sys_ppc64le.go b/sys/sys_ppc64le.go
index cc4bc0380..ffc276672 100644
--- a/sys/sys_ppc64le.go
+++ b/sys/sys_ppc64le.go
@@ -1,4 +1,7 @@
 // AUTOGENERATED FILE
+
+// +build ppc64le
+
 package sys
 
 // Maps internal syscall ID onto kernel syscall number.
diff --git a/sysgen/syscallnr.go b/sysgen/syscallnr.go
index 10017be35..7e8131762 100644
--- a/sysgen/syscallnr.go
+++ b/sysgen/syscallnr.go
@@ -62,7 +62,7 @@ func fetchSyscallsNumbers(arch *Arch, syscalls []Syscall) {
 
 func generateSyscallsNumbersArch(arch *Arch, syscalls []Syscall) {
 	buf := new(bytes.Buffer)
-	if err := archTempl.Execute(buf, arch.Numbers); err != nil {
+	if err := archTempl.Execute(buf, arch); err != nil {
 		failf("failed to execute arch template: %v", err)
 	}
 	writeSource("sys/sys_"+arch.GOARCH+".go", buf.Bytes())
@@ -112,10 +112,13 @@ func (a SyscallArray) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
 
 var archTempl = template.Must(template.New("").Parse(
 	`// AUTOGENERATED FILE
+
+// +build {{$.GOARCH}}
+
 package sys
 
 // Maps internal syscall ID onto kernel syscall number.
-var numbers = []int{ {{range $nr := $}}{{$nr}}, {{end}} }
+var numbers = []int{ {{range $nr := $.Numbers}}{{$nr}}, {{end}} }
 `))
 
 var syscallsTempl = template.Must(template.New("").Parse(
-- 
cgit mrf-deployment