From: Jack Lange Date: Thu, 6 May 2010 16:47:33 +0000 (-0500) Subject: module build fixes X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=5d078e1a82b626909107896c2a5cf1a17be3a607 module build fixes --- diff --git a/symmods/capsule/Makefile b/symmods/capsule/Makefile index 9f35bfe..eaae927 100644 --- a/symmods/capsule/Makefile +++ b/symmods/capsule/Makefile @@ -1,12 +1,26 @@ +ifeq ($(MOD_TYPE),V3_LINUX_MOD) + MOD_IDX := 1 +else ifeq ($(MOD_TYPE),V3_SYM_MOD) + MOD_IDX := 2 +else ifeq($(MOD_TYPE),V3_SEC_MOD) + MOD_IDX := 3 +endif + + DEFS := -DMOD_NAME=$(MOD_NAME) \ -DMOD_DIR=$(MOD_DIR) \ -DMOD_OBJ=$(MOD_OBJ) \ - -DMOD_TYPE=$(MOD_TYPE) + -DMOD_TYPE=$(MOD_IDX) + + +# cpp -undef $(DEFS) binary.S -o $(MOD_DIR)/.tmp.binary.S +# cpp $(DEFS) $(MOD_DIR)/.tmp.binary.S + module: FORCE cpp -undef $(DEFS) binary.S -o $(MOD_DIR)/.tmp.binary.S gcc $(DEFS) -c $(MOD_DIR)/.tmp.binary.S -o $(MOD_DIR)/$(MOD_NAME).vo rm -f $(MOD_DIR)/.tmp.binary.S -FORCE: \ No newline at end of file +FORCE: diff --git a/symmods/capsule/binary.S b/symmods/capsule/binary.S index 5ff3796..4e4fa2f 100644 --- a/symmods/capsule/binary.S +++ b/symmods/capsule/binary.S @@ -40,7 +40,7 @@ mod_name: .section "_v3_modules" -IDENT(#ifdef __X86_64__) +IDENT(#ifdef __x86_64__) .quad mod_name .quad mod_start .quad mod_stop