summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAustin Clements <austin@google.com>2014-10-22 14:02:04 -0400
committerAustin Clements <austin@google.com>2014-10-22 14:02:04 -0400
commitb8d4cd490ddd8ba298b5347d3e72316df768565c (patch)
treed0e9811905c0d26f93cc748346b828cc3eb78f98
parent800a826ae560191d4dbb6c529eea15cf4349a06f (diff)
downloadgo-b8d4cd490ddd8ba298b5347d3e72316df768565c.tar.gz
[dev.power64] runtime: Fix broken merge of noasm.go
The earlier dev.power64 merge missed the port of runtime/noasm.goc to runtime/noasm_arm.go. This CL fixes this by moving noasm_arm.go to noasm.go and adding a +build to share the file between arm and power64. LGTM=rsc R=rsc CC=golang-codereviews https://codereview.appspot.com/158350043
-rw-r--r--src/runtime/noasm.go (renamed from src/runtime/noasm_arm.go)2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/runtime/noasm_arm.go b/src/runtime/noasm.go
index dd3ef8267..43c16860b 100644
--- a/src/runtime/noasm_arm.go
+++ b/src/runtime/noasm.go
@@ -5,6 +5,8 @@
// Routines that are implemented in assembly in asm_{amd64,386}.s
// but are implemented in Go for arm.
+// +build arm power64 power64le
+
package runtime
func cmpstring(s1, s2 string) int {