commit - 48ca8d21f75b734a15091b77abf5ed4a92be90f2
commit + f51bf048784abd642dea4f033bc95acbd4468b6a
blob - 718ee58913750fe93ca58306f40430d227003857
blob + e00fd2cfd04a8739c94422d87672f27dfed9a12c
--- src/Makefile
+++ src/Makefile
@@ -1,6 +1,15 @@
 ../bin/mk: mkmk.sh
 	SYSNAME=`uname` export SYSNAME; \
-	OBJTYPE=`uname -m | sed 's;i.86;386;; s;amd64;x86_64;; s;/.*;;; s; ;;g; s/PowerMacintosh/power/; s/macppc/power/g; s/ppc64/power/g; s/ppc/power/g'` export OBJTYPE; \
+	OBJTYPE=`uname -m | sed ' \
+		s;i.86;386;; \
+		s;amd64;x86_64;; \
+		s;/.*;;; s; ;;g; \
+		s;armv4l;arm;g; \
+		s;PowerMacintosh;power;g; \
+		s;macppc;power;g; \
+		s;ppc64;power;g; \
+		s;ppc;power;g; \
+		'` export OBJTYPE; \
 	PATH=/bin:/usr/bin:/usr/local/bin:`pwd`/../bin:$$PATH export PATH; \
 	PLAN9=`pwd`/.. export PLAN9; \
 	sh -x mkmk.sh
blob - /dev/null
blob + 95c8aaac419a003e9e82e6e194d7ba7db593653d (mode 644)
--- /dev/null
+++ src/libthread/Linux-arm-asm.s
@@ -0,0 +1,53 @@
+ 
+.globl _tas
+_tas:
+	mov	r3, #0xCA000000
+	add	r3, r3, #0xFE0000
+	add	r3, r3, #0xBA00
+	add	r3, r3, #0xBE
+	swp	r3, r3, [r0]
+	mov	r0, r3
+	mov	pc, lr
+
+.globl getmcontext
+getmcontext:
+	/* r0 will be overwritten */
+	str	r1, [r0,#4]!
+	str	r2, [r0,#4]!
+	str	r3, [r0,#4]!
+	str	r4, [r0,#4]!
+	str	r5, [r0,#4]!
+	str	r6, [r0,#4]!
+	str	r7, [r0,#4]!
+	str	r8, [r0,#4]!
+	str	r9, [r0,#4]!
+	str	r10, [r0,#4]!
+	str	r11, [r0,#4]!
+	str	r12, [r0,#4]!
+	str	r13, [r0,#4]!
+	str	r14, [r0,#4]!
+	/* r15 is pc */
+	mov	r0, #0
+	mov	pc, lr
+
+.globl setmcontext
+setmcontext:
+	/* r0 will be overwritten */
+	ldr	r1, [r0,#4]!
+	ldr	r2, [r0,#4]!
+	ldr	r3, [r0,#4]!
+	ldr	r4, [r0,#4]!
+	ldr	r5, [r0,#4]!
+	ldr	r6, [r0,#4]!
+	ldr	r7, [r0,#4]!
+	ldr	r8, [r0,#4]!
+	ldr	r9, [r0,#4]!
+	ldr	r10, [r0,#4]!
+	ldr	r11, [r0,#4]!
+	ldr	r12, [r0,#4]!
+	ldr	r13, [r0,#4]!
+	ldr	r14, [r0,#4]!
+	/* r15 is pc */
+	mov	r0, #1
+	mov	pc, lr
+
blob - dab12d3f6e030476fcc58d43010c291a188d432f
blob + 5d033248f45bd1c4be0bd6ec112f396fc2e5d686
--- src/libthread/Linux.c
+++ src/libthread/Linux.c
@@ -434,5 +434,45 @@ void
 _threadpexit(void)
 {
 	_exit(0);
+}
+
+#ifdef __arm__
+extern int getmcontext(mcontext_t*);
+extern int setmcontext(const mcontext_t*);
+
+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[0] = va_arg(arg, uint);
+	uc->uc_mcontext.gregs[13] = (uint)sp;
+	uc->uc_mcontext.gregs[14] = (uint)fn;
+}
+
+int
+getcontext(ucontext_t *uc)
+{
+	return getmcontext(&uc->uc_mcontext);
 }
 
+int
+setcontext(const ucontext_t *uc)
+{
+	setmcontext(&uc->uc_mcontext);
+	return 0;	/* not reached */
+}
+
+int
+swapcontext(ucontext_t *oucp, const ucontext_t *ucp)
+{
+	if(getcontext(oucp) == 0)
+		setcontext(ucp);
+	return 0;
+}
+#endif
+
blob - b5d3965e07ec3b42354697748e52930d8ee1588b
blob + 2bb9ec0fd22aa957489e4d9bda9c5a5c74715a60
--- src/mkhdr
+++ src/mkhdr
@@ -1,9 +1,11 @@
 SYSNAME=`uname`
+# objtype rules also in Makefile
 OBJTYPE=`uname -m | sed '
 	s;i.86;386;;
 	s;amd64;x86_64;;
 	s;/.*;;;
 	s; ;;g;
+	s;armv4l;arm;g;
 	s;PowerMacintosh;power;g;
 	s;macppc;power;g;
 	s;ppc64;power;g;