all: merge upstream

.gitattributes

@@ -0,0 +1,10 @@
+# Treat all files in the Go repo as binary, with no git magic updating
+# line endings. Windows users contributing to Go will need to use a
+# modern version of git and editors capable of LF line endings.
+#
+# We'll prevent accidental CRLF line endings from entering the repo
+# via the git-review gofmt checks.
+#
+# See golang.org/issue/9281
+
+* -text

.gitignore

@@ -37,7 +37,8 @@ src/cmd/gc/y.output
 src/cmd/go/zdefaultcc.go
 src/go/doc/headscan
 src/runtime/mkversion
-src/runtime/z*
+src/runtime/zaexperiment.h
+src/runtime/zversion.go
 src/unicode/maketables
 src/*.*/
 test/pass.out

CONTRIBUTING.md

@@ -1,15 +1,29 @@
-The Go project is an open source project.
-For information, see: https://golang.org/
+# Contributing to Go
 
-Its canonical Git repository is located at https://go.googlesource.com/go.
-(There is a mirror of the repository at https://github.com/golang/go.)
+Go is an open source project.
 
-Report issues here: https://github.com/golang/go/issues
+It is the work of hundreds of contributors. We appreciate your help!
 
-Go is the work of hundreds of contributors. We appreciate your help!
 
-To contribute, please read the contribution guidelines:
-	http://golang.org/doc/contribute.html
+## Filing issues
 
-## We DO NOT accept pull requests.
+When filing an issue, make sure to answer these five questions:
+
+1. What version of Go are you using (`go version`)?
+2. What operating system and processor architecture are you using?
+3. What did you do?
+4. What did you expect to see?
+5. What did you see instead?
+
+
+## Contributing code
+
+Please read the [Contribution Guidelines](https://golang.org/doc/contribute.html)
+before sending patches.
+
+**We do not accept GitHub pull requests**
+(we use [Gerrit](https://code.google.com/p/gerrit/) instead for code review).
+
+Unless otherwise noted, the Go source files are distributed under
+the BSD-style license found in the LICENSE file.
 

README.md

@@ -0,0 +1,44 @@
+# The Go Programming Language
+
+Go is an open source programming language that makes it easy to build simple,
+reliable, and efficient software.
+
+![Gopher image](doc/gopher/fiveyears.jpg)
+
+For documentation about how to install and use Go,
+visit https://golang.org/ or load doc/install-source.html
+in your web browser.
+
+Our canonical Git repository is located at https://go.googlesource.com/go.
+(There is a mirror of the repository at https://github.com/golang/go.)
+
+Please report issues here: https://golang.org/issue/new
+
+Go is the work of hundreds of contributors. We appreciate your help!
+
+To contribute, please read the contribution guidelines:
+	https://golang.org/doc/contribute.html
+
+Unless otherwise noted, the Go source files are distributed
+under the BSD-style license found in the LICENSE file.
+
+--
+
+## Binary Distribution Notes
+
+If you have just untarred a binary Go distribution, you need to set
+the environment variable $GOROOT to the full path of the go
+directory (the one containing this file).  You can omit the
+variable if you unpack it into /usr/local/go, or if you rebuild
+from sources by running all.bash (see doc/install-source.html).
+You should also add the Go binary directory $GOROOT/bin
+to your shell's path.
+
+For example, if you extracted the tar file into $HOME/go, you might
+put the following in your .profile:
+
+	export GOROOT=$HOME/go
+	export PATH=$PATH:$GOROOT/bin
+
+See https://golang.org/doc/install or doc/install.html for more details.
+