Index: uspace/lib/libc/arch/sparc64/include/fibril.h
===================================================================
--- uspace/lib/libc/arch/sparc64/include/fibril.h	(revision 40746016dd60dc0278f89c5e937d2ce9b7136365)
+++ uspace/lib/libc/arch/sparc64/include/fibril.h	(revision b2a5b41da250fa9fd11069ca9980d8f83e70c2a2)
@@ -46,10 +46,13 @@
 #endif
 
-#define context_set(c, _pc, stack, size, ptls)			\
-	(c)->pc = ((uintptr_t) _pc) - 8;			\
-	(c)->sp = ((uintptr_t) stack) + ALIGN_UP((size),	\
-		STACK_ALIGNMENT) - (STACK_BIAS + SP_DELTA);	\
-	(c)->fp = -STACK_BIAS;					\
-	(c)->tp = ptls
+#define context_set(c, _pc, stack, size, ptls) \
+	do { \
+		(c)->pc = ((uintptr_t) _pc) - 8; \
+		(c)->sp = ((uintptr_t) stack) + ALIGN_UP((size), \
+		    STACK_ALIGNMENT) - (STACK_BIAS + SP_DELTA); \
+		(c)->fp = -STACK_BIAS; \
+		(c)->tp = ptls; \
+		(c)->i7 = 0; \
+	} while (0)
 	
 /*