commit - 1e05fdf92cf4c3ae32c52d6928f3e74000b76f6a
commit + 33a102fc287a36969db773a4c55f182081a291e1
blob - 969c19f20c5eb86ab000bd12c7d83bcbddebcb25
blob + 683ddd12710973a6da4271e918ecddf8281491a0
--- src/libthread/Linux.c
+++ src/libthread/Linux.c
@@ -437,9 +437,6 @@ _threadpexit(void)
 }
 
 #ifdef __arm__
-#define	setcontext(u)	setmcontext(&(u)->uc_mcontext)
-#define	getcontext(u)	getmcontext(&(u)->uc_mcontext)
-
 void
 makecontext(ucontext_t *uc, void (*fn)(void), int argc, ...)
 {
blob - 9757526ea1b6a05991590c1e8dee7a0131def2f2
blob + 5be45677409ea7594164c798b4e145a6a4db6e99
--- src/libthread/threadimpl.h
+++ src/libthread/threadimpl.h
@@ -42,6 +42,11 @@ extern	void		makecontext(ucontext_t*, void(*)(), int, 
 extern pid_t rfork_thread(int, void*, int(*)(void*), void*);
 #endif
 
+#if defined(__arm__)
+int _getmcontext(mcontext_t*);
+void _setmcontext(mcontext_t*);
+#endif
+
 typedef struct Context Context;
 typedef struct Execjob Execjob;
 typedef struct Proc Proc;