commit - 229086e79014909293b56271b529ed97e700932e
commit + 8712d1a38e87e8f51257a80246f51d075aae7f5b
blob - ac6fd5bc6ed7e0d621fd1c9a2078da58ae1e346c
blob + a621b7a1b8fd1e979490d344c17d0d9e518f143f
--- src/libthread/Linux-sparc64-swapcontext.c
+++ src/libthread/Linux-sparc64-swapcontext.c
@@ -19,18 +19,21 @@
 
 #include <ucontext.h>
 
+#define UC_M_PC 40
+#define UC_M_NPC 48
+
 extern int __getcontext (ucontext_t *ucp);
 extern int __setcontext (const ucontext_t *ucp, int restoremask);
 
 int
-__swapcontext (ucontext_t *oucp, const ucontext_t *ucp)
+swapcontext (ucontext_t *oucp, const ucontext_t *ucp)
 {
   extern void __swapcontext_ret (void);
   /* Save the current machine context to oucp.  */
   __getcontext (oucp);
   /* Modify oucp to skip the __setcontext call on reactivation.  */
-  oucp->uc_mcontext.mc_gregs[MC_PC] = (long) __swapcontext_ret;
-  oucp->uc_mcontext.mc_gregs[MC_NPC] = ((long) __swapcontext_ret) + 4;
+  *(long*)((char*)oucp+UC_M_PC) = (long)__swapcontext_ret;
+  *(long*)((char*)oucp+UC_M_NPC) = (long)__swapcontext_ret + 4;
   /* Restore the machine context in ucp.  */
   __setcontext (ucp, 1);
   return 0;
@@ -45,4 +48,3 @@ __swapcontext_ret:					\n\
 	.size	__swapcontext_ret, .-__swapcontext_ret	\n\
      ");
 
-weak_alias (__swapcontext, swapcontext)