aboutsummaryrefslogtreecommitdiff
path: root/src/runtime/race
diff options
context:
space:
mode:
authorFilippo Valsorda <filippo@golang.org>2019-02-08 15:36:33 -0500
committerFilippo Valsorda <filippo@golang.org>2019-02-08 17:54:25 -0500
commit4ed8ad4d69d68da66fac413ed897bdde8d47057b (patch)
treecacacea336211dd3b82bb814f288157f1d601782 /src/runtime/race
parent14c64dbc4a4cd359d0cede6e4a7fd01ba9e9d23b (diff)
parent7ccd3583eddcd79679fb29cfc83a6e6fb6973f1e (diff)
downloadgo-4ed8ad4d69d68da66fac413ed897bdde8d47057b.tar.xz
[dev.boringcrypto] all: merge master into dev.boringcrypto
Change-Id: I9246c8228d38559c40e69fa403fa946ac1b31dbe
Diffstat (limited to 'src/runtime/race')
-rw-r--r--src/runtime/race/README1
-rw-r--r--src/runtime/race/race.go2
-rw-r--r--src/runtime/race/race_linux_arm64.sysobin0 -> 418080 bytes
3 files changed, 2 insertions, 1 deletions
diff --git a/src/runtime/race/README b/src/runtime/race/README
index 1c66c63695..be53b4c37c 100644
--- a/src/runtime/race/README
+++ b/src/runtime/race/README
@@ -10,3 +10,4 @@ race_linux_amd64.syso built with LLVM fe2c72c59aa7f4afa45e3f65a5d16a374b6cce26 a
race_linux_ppc64le.syso built with LLVM fe2c72c59aa7f4afa45e3f65a5d16a374b6cce26 and Go 323c85862a7afbde66a3bba0776bf4ba6cd7c030.
race_netbsd_amd64.syso built with LLVM fe2c72c59aa7f4afa45e3f65a5d16a374b6cce26 and Go 323c85862a7afbde66a3bba0776bf4ba6cd7c030.
race_windows_amd64.syso built with LLVM ae08a22cc215448aa3ad5a6fb099f6df77e9fa01 and Go 323c85862a7afbde66a3bba0776bf4ba6cd7c030.
+race_linux_arm64.syso built with LLVM 3aa2b775d08f903f804246af10b80a439c16b436 and Go ef2c48659880c7e8a989e6721a21f018790f7793.
diff --git a/src/runtime/race/race.go b/src/runtime/race/race.go
index 95e965411b..d298e805cf 100644
--- a/src/runtime/race/race.go
+++ b/src/runtime/race/race.go
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-// +build race,linux,amd64 race,freebsd,amd64 race,netbsd,amd64 race,darwin,amd64 race,windows,amd64 race,linux,ppc64le
+// +build race,linux,amd64 race,freebsd,amd64 race,netbsd,amd64 race,darwin,amd64 race,windows,amd64 race,linux,ppc64le race,linux,arm64
package race
diff --git a/src/runtime/race/race_linux_arm64.syso b/src/runtime/race/race_linux_arm64.syso
new file mode 100644
index 0000000000..65bc1ececa
--- /dev/null
+++ b/src/runtime/race/race_linux_arm64.syso
Binary files differ