From: Austin Clements <austin@google.com>
Date: Wed, 22 Oct 2014 18:02:04 +0000 (-0400)
Subject: [dev.power64] runtime: Fix broken merge of noasm.go
X-Git-Tag: go1.5beta1~2684^2~25^2~16
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=977fba763a5e45e5527e45619ed0712ca09d910d;p=gostls13.git

[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://golang.org/cl/158350043
---

diff --git a/src/runtime/noasm_arm.go b/src/runtime/noasm.go
similarity index 96%
rename from src/runtime/noasm_arm.go
rename to src/runtime/noasm.go
index dd3ef82676..43c16860b2 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 {