Index: uspace/lib/c/arch/ia32/src/fibril.S
===================================================================
--- uspace/lib/c/arch/ia32/src/fibril.S	(revision e74b24f3342648875f8cb8c32a63b5062cb9a903)
+++ uspace/lib/c/arch/ia32/src/fibril.S	(revision 91889d5ab500b69c3a8cd21cfadf2bdf7524dc43)
@@ -27,10 +27,8 @@
 #
 
+#include <abi/asmtool.h>
 #include <libarch/fibril_context.h>
 
 .text
-
-.global context_save
-.global context_restore
 
 ## Save current CPU context
@@ -39,5 +37,5 @@
 # pointed by the 1st argument. Returns 1 in EAX.
 #
-context_save:
+FUNCTION_BEGIN(context_save)
 	movl 0(%esp), %eax  # the caller's return %eip
 	movl 4(%esp), %edx  # address of the context variable to save context to
@@ -58,4 +56,5 @@
 	incl %eax
 	ret
+FUNCTION_END(context_save)
 
 ## Restore saved CPU context
@@ -64,5 +63,5 @@
 # pointed by the 1st argument. Returns 0 in EAX.
 #
-context_restore:
+FUNCTION_BEGIN(context_restore)
 	movl 4(%esp), %eax  # address of the context variable to restore context from
 	
@@ -86,3 +85,4 @@
 	xorl %eax, %eax		# context_restore returns 0
 	ret
+FUNCTION_END(context_restore)