Changeset 5020 in vbox for trunk/src/VBox/VMM/testcase

Timestamp:

Sep 25, 2007 1:26:02 AM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

24810

Message:

Simplified the YASM/NASM invocations avoiding unnecessary statement duplication.

File:

• trunk/src/VBox/VMM/testcase/Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/VMM/testcase/Makefile.kmk

@@ -189 +189 @@
  VBOX_NM ?= nm -p
 endif
+
+MY_ASA_ASM_STUFF = \
+                $(addprefix -D, \
+                        $(DEFS) \
+                        $(DEFS.$(BUILD_TYPE)) \
+                        $(DEFS.$(BUILD_TARGET)) \
+                        IN_RING3 \
+                        $(DEFS.$(BUILD_TARGET_ARCH)) \
+                        $(DEFS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
+                ) \
+                -f $(if $(eq $(BUILD_TARGET),darwin),macho,elf) \
+                $(foreach inc,$(INCS) $(VBOX_PATH_VMM_SRC)/testcase $(PATH_TARGET),-I$(inc)/)
 
 # 1a. make a header file which makes all the structures+members globals.
@@ -204 +216 @@
         $(call MSG_GENERATE,tstVMStructSize,$@,$<)
 ifndef DONT_USE_YASM
-        $(QUIET)$(TOOL_YASM_AS) \
-                $(addprefix -D, \
-                        $(DEFS) \
-                        $(DEFS.$(BUILD_TYPE)) \
-                        $(DEFS.$(BUILD_TARGET)) \
-                        IN_RING3 \
-                        $(DEFS.$(BUILD_TARGET_ARCH)) \
-                        $(DEFS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
-                ) \
-                -f $(if $(eq $(BUILD_TARGET),darwin),macho,elf) \
-                $(foreach inc,$(INCS) $(VBOX_PATH_VMM_SRC)/testcase,-I$(inc)/) -o [email protected] -l [email protected] $<
+        $(QUIET)$(TOOL_YASM_AS) $(MY_ASA_ASM_STUFF) -o [email protected] -l [email protected] $<
         $(SED) -f $(VBOX_PATH_VMM_SRC)/testcase/tstAsmStructsAsm-lst.sed [email protected] > $@
 else
-        $(QUIET)$(TOOL_NASM_AS) \
-                -g \
-                $(addprefix -D, \
-                        $(DEFS) \
-                        $(DEFS.$(BUILD_TYPE)) \
-                        $(DEFS.$(BUILD_TARGET)) \
-                        IN_RING3 \
-                        $(DEFS.$(BUILD_TARGET_ARCH)) \
-                        $(DEFS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
-                ) \
-                -f $(if $(eq $(BUILD_TARGET),darwin),macho,elf) \
-                $(foreach inc,$(INCS) $(VBOX_PATH_VMM_SRC)/testcase,-I$(inc)/) -o [email protected] -l [email protected] $<
-                $(VBOX_NM) [email protected] | $(SED) \
+        $(QUIET)$(TOOL_NASM_AS) -g $(MY_ASA_ASM_STUFF) -o [email protected] -l [email protected] $<
+        $(VBOX_NM) [email protected] | $(SED) \
                         -e '/[0-9a-fA-F][0-9a-fA-F]* [^a] /d' \
                         -e 's/[0-9a-fA-F][0-9a-fA-F]* a \([^ ]*\)/global \1/' \
@@ -243 +234 @@
         $(call MSG_COMPILE,tstAsmStructsasm,$<,$@,AS)
 ifndef DONT_USE_YASM
-        $(QUIET)$(TOOL_YASM_AS) \
-                $(addprefix -D, \
-                        DO_GLOBALS \
-                        $(DEFS) \
-                        $(DEFS.$(BUILD_TYPE)) \
-                        $(DEFS.$(BUILD_TARGET)) \
-                        IN_RING3 \
-                        $(DEFS.$(BUILD_TARGET_ARCH)) \
-                        $(DEFS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
-                ) \
-                -f $(if $(eq $(BUILD_TARGET),darwin),macho,elf -g stabs) \
-                $(foreach inc,$(INCS) $(PATH_TARGET),-I$(inc)/) -o $@ $<
+        $(QUIET)$(TOOL_YASM_AS) $(MY_ASA_ASM_STUFF) -DDO_GLOBALS -o $@ $<
 else
-        $(QUIET)$(TOOL_NASM_AS) \
-                $(addprefix -D, \
-                        DO_GLOBALS \
-                        $(DEFS) \
-                        $(DEFS.$(BUILD_TYPE)) \
-                        $(DEFS.$(BUILD_TARGET)) \
-                        IN_RING3 \
-                        $(DEFS.$(BUILD_TARGET_ARCH)) \
-                        $(DEFS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
-                ) \
-                -f $(if $(eq $(BUILD_TARGET),darwin),macho,elf) \
-                $(foreach inc,$(INCS) $(PATH_TARGET) $(VBOX_PATH_VMM_SRC)/testcase,-I$(inc)/) -o $@ $<
+        $(QUIET)$(TOOL_NASM_AS) $(MY_ASA_ASM_STUFF) -DDO_GLOBALS -o $@ $<
 endif