Index: uspace/lib/c/arch/sparc64/include/libarch/context_offset.h
===================================================================
--- uspace/lib/c/arch/sparc64/include/libarch/context_offset.h	(revision 309a894300ff4341efadc0328ec245dbabf3f105)
+++ 	(revision )
@@ -1,1 +1,0 @@
-../../../../../../../kernel/arch/sparc64/include/arch/context_offset.h
Index: uspace/lib/c/arch/sparc64/include/libarch/fibril.h
===================================================================
--- uspace/lib/c/arch/sparc64/include/libarch/fibril.h	(revision 309a894300ff4341efadc0328ec245dbabf3f105)
+++ uspace/lib/c/arch/sparc64/include/libarch/fibril.h	(revision 50805c9fe7d60aa26c79db6832302ee379195077)
@@ -37,4 +37,5 @@
 
 #include <libarch/stack.h>
+#include <libarch/fibril_context.h>
 #include <sys/types.h>
 #include <align.h>
@@ -51,30 +52,4 @@
 	} while (0)
 
-/*
- * Save only registers that must be preserved across
- * function calls.
- */
-typedef struct {
-	uintptr_t sp;		/* %o6 */
-	uintptr_t pc;		/* %o7 */
-	uint64_t i0;
-	uint64_t i1;
-	uint64_t i2;
-	uint64_t i3;
-	uint64_t i4;
-	uint64_t i5;
-	uintptr_t fp;		/* %i6 */
-	uintptr_t i7;
-	uint64_t l0;
-	uint64_t l1;
-	uint64_t l2;
-	uint64_t l3;
-	uint64_t l4;
-	uint64_t l5;
-	uint64_t l6;
-	uint64_t l7;
-	uint64_t tp;		/* %g7 */
-} context_t;
-
 static inline uintptr_t context_get_fp(context_t *ctx)
 {
Index: uspace/lib/c/arch/sparc64/include/libarch/fibril_context.ag
===================================================================
--- uspace/lib/c/arch/sparc64/include/libarch/fibril_context.ag	(revision 50805c9fe7d60aa26c79db6832302ee379195077)
+++ uspace/lib/c/arch/sparc64/include/libarch/fibril_context.ag	(revision 50805c9fe7d60aa26c79db6832302ee379195077)
@@ -0,0 +1,123 @@
+# Copyright (c) 2014 Jakub Jermar 
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+{
+        name : context,
+
+        includes : [
+                {
+                        include : <sys/types.h>
+                }
+        ],
+
+        #
+        # Save only registers that must be preserved across function calls.
+        #
+        members : [
+                {
+                        # %o6
+                        name : sp,
+                        type : uintptr_t
+                },
+                {
+                        # %o7
+                        name : pc,
+                        type : uintptr_t
+                },
+                {
+                        name : i0,
+                        type : uint64_t
+                },
+                {
+                        name : i1,
+                        type : uint64_t
+                },
+                {
+                        name : i2,
+                        type : uint64_t
+                },
+                {
+                        name : i3,
+                        type : uint64_t
+                },
+                {
+                        name : i4,
+                        type : uint64_t
+                },
+                {
+                        name : i5,
+                        type : uint64_t
+                },
+                {
+                        # %i6
+                        name : fp,
+                        type : uintptr_t
+                },
+                {
+                        name : i7,
+                        type : uintptr_t
+                },
+                {
+                        name : l0,
+                        type : uint64_t
+                },
+                {
+                        name : l1,
+                        type : uint64_t
+                },
+                {
+                        name : l2,
+                        type : uint64_t
+                },
+                {
+                        name : l3,
+                        type : uint64_t
+                },
+                {
+                        name : l4,
+                        type : uint64_t
+                },
+                {
+                        name : l5,
+                        type : uint64_t
+                },
+                {
+                        name : l6,
+                        type : uint64_t
+                },
+                {
+                        name : l7,
+                        type : uint64_t
+                },
+                {
+                        # %g7
+                        name : tp,
+                        type : uint64_t
+                }
+        ]
+}
+