From 71d0d50aa3b292a1137dc2e7ed468aff24efdb83 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Mon, 6 Jan 2014 19:24:23 +0000
Subject: go/build: Set GOARCH on arm64 systems.

I am reliably informed that the architecture name and letter for the
plan9/inferno compilers for 64-bit ARM systems will be "arm64" and "7"
respectively, so let's get that bit in nice and early.

From Michael Hudson-Doyle.
https://codereview.appspot.com/34830045/

From-SVN: r206374
---
 libgo/go/go/build/build.go     | 2 ++
 libgo/go/go/build/deps_test.go | 2 +-
 libgo/go/go/build/syslist.go   | 2 +-
 libgo/go/runtime/extern.go     | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'libgo/go')

diff --git a/libgo/go/go/build/build.go b/libgo/go/go/build/build.go
index 50d2fb4..d06a9be 100644
--- a/libgo/go/go/build/build.go
+++ b/libgo/go/go/build/build.go
@@ -1211,6 +1211,8 @@ func ArchChar(goarch string) (string, error) {
 		return "6", nil
 	case "arm":
 		return "5", nil
+	case "arm64":
+		return "7", nil
 	}
 	return "", errors.New("unsupported GOARCH " + goarch)
 }
diff --git a/libgo/go/go/build/deps_test.go b/libgo/go/go/build/deps_test.go
index dd162c7..88f3eca 100644
--- a/libgo/go/go/build/deps_test.go
+++ b/libgo/go/go/build/deps_test.go
@@ -360,7 +360,7 @@ func allowed(pkg string) map[string]bool {
 
 var bools = []bool{false, true}
 var geese = []string{"darwin", "dragonfly", "freebsd", "linux", "netbsd", "openbsd", "plan9", "windows"}
-var goarches = []string{"386", "amd64", "arm"}
+var goarches = []string{"386", "amd64", "arm", "arm64"}
 
 type osPkg struct {
 	goos, pkg string
diff --git a/libgo/go/go/build/syslist.go b/libgo/go/go/build/syslist.go
index a322c88..3580d82 100644
--- a/libgo/go/go/build/syslist.go
+++ b/libgo/go/go/build/syslist.go
@@ -5,4 +5,4 @@
 package build
 
 const goosList = "darwin dragonfly freebsd linux netbsd openbsd plan9 windows solaris "
-const goarchList = "386 amd64 arm alpha m68k mipso32 mipsn32 mipsn64 mipso64 ppc ppc64 sparc sparc64 "
+const goarchList = "386 amd64 arm arm64 alpha m68k mipso32 mipsn32 mipsn64 mipso64 ppc ppc64 sparc sparc64 "
diff --git a/libgo/go/runtime/extern.go b/libgo/go/runtime/extern.go
index 527e9cd..f45104f 100644
--- a/libgo/go/runtime/extern.go
+++ b/libgo/go/runtime/extern.go
@@ -185,5 +185,5 @@ func Version() string {
 const GOOS string = theGoos
 
 // GOARCH is the running program's architecture target:
-// 386, amd64, or arm.
+// 386, amd64, arm or arm64.
 const GOARCH string = theGoarch
-- 
cgit v1.1