diff options
author | Austin Clements <austin@google.com> | 2014-10-22 15:51:54 -0400 |
---|---|---|
committer | Austin Clements <austin@google.com> | 2014-10-22 15:51:54 -0400 |
commit | fc92f8a400cf3e4d053940e0b86b72d6de27d67a (patch) | |
tree | ad0b517f2a9cd798c909e59d982b9061f16c0348 /src/go/build | |
parent | 48b04a95e5f719cbef174124780dce00bb410c2c (diff) | |
parent | b8d4cd490ddd8ba298b5347d3e72316df768565c (diff) | |
download | go-fc92f8a400cf3e4d053940e0b86b72d6de27d67a.tar.gz |
[dev.power64] all: merge default into dev.power64
This brings dev.power64 up-to-date with the current tip of
default. go_bootstrap is still panicking with a bad defer
when initializing the runtime (even on amd64).
LGTM=rsc
R=rsc
CC=golang-codereviews
https://codereview.appspot.com/152570049
Diffstat (limited to 'src/go/build')
-rw-r--r-- | src/go/build/build.go | 2 | ||||
-rw-r--r-- | src/go/build/syslist.go | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/go/build/build.go b/src/go/build/build.go index 7a51cf3c0..ed79df293 100644 --- a/src/go/build/build.go +++ b/src/go/build/build.go @@ -1384,6 +1384,8 @@ func ArchChar(goarch string) (string, error) { return "6", nil case "arm": return "5", nil + case "power64", "power64le": + return "9", nil } return "", errors.New("unsupported GOARCH " + goarch) } diff --git a/src/go/build/syslist.go b/src/go/build/syslist.go index 965f873df..2ab53bb9c 100644 --- a/src/go/build/syslist.go +++ b/src/go/build/syslist.go @@ -5,4 +5,4 @@ package build const goosList = "android darwin dragonfly freebsd linux nacl netbsd openbsd plan9 solaris windows " -const goarchList = "386 amd64 amd64p32 arm " +const goarchList = "386 amd64 amd64p32 arm power64 power64le " |