arm: build fixes

Get p9p to build cleanly for ARM - based on suggestions from rsc and eekee, plus a final tweak from me.  Tested (a bit) on sheevaplug (ubuntu jaunty), Nokia N800 (maemo 4) and Nokia N900 (maemo 5).

R=rsc
CC=plan9port.codebot
http://codereview.appspot.com/4524056

1 files changed, 13 insertions, 13 deletions

diff --git a/src/libthread/Linux-arm-swapcontext.c b/src/libthread/Linux-arm-swapcontext.c
index 43358800..907fb0c3 100644
--- a/src/libthread/Linux-arm-swapcontext.c
+++ b/src/libthread/Linux-arm-swapcontext.c
@@ -3,24 +3,24 @@
 void
 makecontext(ucontext_t *uc, void (*fn)(void), int argc, ...)
 {
-        int i, *sp;
-        va_list arg;
-        
-        sp = (int*)uc->uc_stack.ss_sp+uc->uc_stack.ss_size/4;
-        va_start(arg, argc);
-        for(i=0; i<4 && i<argc; i++)
-                uc->uc_mcontext.gregs[i] = va_arg(arg, uint);
-        va_end(arg);
-        uc->uc_mcontext.gregs[13] = (uint)sp;
-        uc->uc_mcontext.gregs[14] = (uint)fn;
+	int i, *sp;
+	va_list arg;
+
+	sp = (int*)uc->uc_stack.ss_sp+uc->uc_stack.ss_size/4;
+	va_start(arg, argc);
+	for(i=0; i<4 && i<argc; i++)
+		(&uc->uc_mcontext.arm_r0)[i] = va_arg(arg, uint);
+	va_end(arg);
+	uc->uc_mcontext.arm_sp = (uint)sp;
+	uc->uc_mcontext.arm_lr = (uint)fn;
 }
 
 int
 swapcontext(ucontext_t *oucp, const ucontext_t *ucp)
 {
-        if(getcontext(oucp) == 0)
-                setcontext(ucp);
-        return 0;
+	if(getcontext(oucp) == 0)
+		setcontext(ucp);
+	return 0;
 }