Index: abi/include/abi/asmtool.h
===================================================================
--- abi/include/abi/asmtool.h	(revision 805729be3460a2b7ab347e7bf590d2d1ed2638ed)
+++ abi/include/abi/asmtool.h	(revision 87fa4a7132ec4ff82d50273ed736ed502cea35a3)
@@ -36,11 +36,23 @@
 #define ABI_ASMTOOL_H_
 
+#define SYMBOL(sym) \
+	.global sym; \
+	sym:
+#define SYMBOL_BEGIN(sym) \
+	SYMBOL(sym)
+#define SYMBOL_END(sym) \
+	.size sym, . - sym
+
+#define OBJECT_BEGIN(obj) \
+	.type obj, @object; \
+	SYMBOL_BEGIN(obj)
+#define OBJECT_END(obj) \
+	SYMBOL_END(obj)
+
 #define FUNCTION_BEGIN(func) \
-	.global func; \
 	.type func, @function; \
-	func: 	
-
+	SYMBOL_BEGIN(func) 	
 #define FUNCTION_END(func) \
-	.size func, . - func
+	SYMBOL_END(func)
 
 #endif