Minor compile warning fixup and error checks

[palacios.git] / symmods / capsule / binary.S

diff --git a/symmods/capsule/binary.S b/symmods/capsule/binary.S
index 2c62f50..d7190b5 100644 (file)
--- a/symmods/capsule/binary.S
+++ b/symmods/capsule/binary.S
@@ -21,22 +21,37 @@
 
 .data
 
-#define TOSTR(str) #str
-#define MOD_PATH(dir,name) TOSTR(dir/name)
+#define IDENT(str) str
+#define TOSTR(str) #str 
+#define XSTR(str) TOSTR(str)
+#define MOD_PATH(dir, name)  TOSTR(dir/name)
 #define MOD_NM(name) TOSTR(name)
 
-.globl mod_start
+
 mod_start:
-.incbin MOD_PATH(MOD_DIR, MOD_OBJ)
+.incbin MOD_PATH(MOD_DIR,MOD_OBJ)
 mod_stop:
 
 mod_name:
 .ascii MOD_NM(MOD_NAME)
 
 
-.section "_v3_modules"
-.quad mod_name
+.section _v3_capsules, "a"
+IDENT(#ifdef __x86_64__)
+.quad mod_name 
 .quad mod_start
-.quad mod_stop
-.long MOD_TYPE
-
+.quad mod_stop 
+.byte MOD_TYPE
+.byte MOD_ARCH
+.space 2
+IDENT(#else)
+.long mod_name
+.space 4
+.long mod_start
+.space 4
+.long mod_stop
+.space 4
+.byte MOD_TYPE 
+.byte MOD_ARCH
+.space 2
+IDENT(#endif)