arm

src/libthread/Linux-arm-asm.s

@@ -9,8 +9,9 @@ _tas:
 	mov	r0, r3
 	mov	pc, lr
 
-.globl getmcontext
-getmcontext:
+.globl getcontext
+getcontext:
+	add	r0, r0, #148	/* walk to mcontext */
 	str	r1, [r0,#4]
 	str	r2, [r0,#8]
 	str	r3, [r0,#12]
@@ -32,8 +33,9 @@ getmcontext:
 	mov	r0, #0
 	mov	pc, lr
 
-.globl setmcontext
-setmcontext:
+.globl setcontext
+setcontext:
+	add	r0, r0, #148	/* walk to mcontext */
 	ldr	r1, [r0,#4]
 	ldr	r2, [r0,#8]
 	ldr	r3, [r0,#12]

src/libthread/Linux.c

@@ -455,19 +455,6 @@ makecontext(ucontext_t *uc, void (*fn)(void), int argc, ...)
 	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)
 {