summaryrefslogtreecommitdiff
path: root/src/runtime/vlop_arm.s
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2014-11-15 08:00:38 -0500
committerRuss Cox <rsc@golang.org>2014-11-15 08:00:38 -0500
commit8b46a22b652d6e7a4a69b9523d57aff12f9dc945 (patch)
tree8f1c3f2d7e06daa3a9ad5721658a31b63519d748 /src/runtime/vlop_arm.s
parent66fbfa707147ff58e13beed2d4a957a06bede869 (diff)
parent0b7f128e76956367ddb4f9ddbee4477d3b462e96 (diff)
downloadgo-8b46a22b652d6e7a4a69b9523d57aff12f9dc945.tar.gz
[dev.garbage] all: merge dev.cc into dev.garbage
The garbage collector is now written in Go. There is plenty to clean up (just like on dev.cc). all.bash passes on darwin/amd64, darwin/386, linux/amd64, linux/386. TBR=rlh R=austin, rlh, bradfitz CC=golang-codereviews https://codereview.appspot.com/173250043
Diffstat (limited to 'src/runtime/vlop_arm.s')
-rw-r--r--src/runtime/vlop_arm.s5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/runtime/vlop_arm.s b/src/runtime/vlop_arm.s
index b4b905bb7..5354bf911 100644
--- a/src/runtime/vlop_arm.s
+++ b/src/runtime/vlop_arm.s
@@ -23,7 +23,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-#include "zasm_GOOS_GOARCH.h"
+#include "go_asm.h"
+#include "go_tls.h"
#include "textflag.h"
arg=0
@@ -100,7 +101,7 @@ TEXT _sfloat(SB), NOSPLIT, $68-0 // 4 arg + 14*4 saved regs + cpsr + return valu
// load the signal fault address into LR, and jump
// to the real sigpanic.
// This simulates what sighandler does for a memory fault.
-TEXT _sfloatpanic(SB),NOSPLIT,$-4
+TEXT runtimeĀ·_sfloatpanic(SB),NOSPLIT,$-4
MOVW $0, R0
MOVW.W R0, -4(R13)
MOVW g_sigpc(g), LR