[dev.garbage] all: merge dev.cc (493ad916c3b1) into dev.garbage

TBR=austin
CC=golang-codereviews
https://codereview.appspot.com/179290043

1 files changed, 17 insertions, 0 deletions

diff --git a/src/runtime/os_nacl_arm.go b/src/runtime/os_nacl_arm.go
new file mode 100644
index 000000000..a43e7c47b
--- /dev/null
+++ b/src/runtime/os_nacl_arm.go
@@ -0,0 +1,17 @@
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package runtime
+
+func checkgoarm() {
+	return // NaCl/ARM only supports ARMv7
+}
+
+//go:nosplit
+func cputicks() int64 {
+	// Currently cputicks() is used in blocking profiler and to seed runtime·fastrand1().
+	// runtime·nanotime() is a poor approximation of CPU ticks that is enough for the profiler.
+	// TODO: need more entropy to better seed fastrand1.
+	return nanotime()
+}