Changeset 60195 in vbox for trunk

Timestamp:

Mar 26, 2016 1:20:48 PM (9 years ago)

Author:

vboxsync

Message:

bs3kit: No need to keep the 64-bit assembly and C object files separate any longer since the latter is also OMF now.

Location:

trunk/src/VBox/ValidationKit/bootsectors

Files:

• Config.kmk (modified) (2 diffs)
• bs3kit/Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/ValidationKit/bootsectors/Config.kmk

@@ -544 +544 @@
         $(PATH_OBJ)/bs3kit-common-16/bs3kit-common-16.lib \
         $(PATH_OBJ)/bs3kit-common-32/bs3kit-common-32.lib \
-        $(PATH_OBJ)/bs3kit-common-64-asm/bs3kit-common-64-asm.lib \
-        $(PATH_OBJ)/bs3kit-common-64-c/bs3kit-common-64-c.lib \
+        $(PATH_OBJ)/bs3kit-common-64/bs3kit-common-64.lib \
        \
         $(PATH_OBJ)/bs3kit-rm/bs3kit-rm.lib \
@@ -568 +567 @@
         $(PATH_OBJ)/bs3kit-lm16/bs3kit-lm16.lib \
         $(PATH_OBJ)/bs3kit-lm32/bs3kit-lm32.lib \
-        $(PATH_OBJ)/bs3kit-lm64-asm/bs3kit-lm64-asm.lib \
-        $(PATH_OBJ)/bs3kit-lm64-c/bs3kit-lm64-c.lib
+        $(PATH_OBJ)/bs3kit-lm64/bs3kit-lm64.lib
 
 # BS3Kit template for 32-bit code.

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/Makefile.kmk

@@ -187 +187 @@
 
 # The 64-bit BS3Kit library.
-LIBRARIES += bs3kit-common-64-asm
-bs3kit-common-64-asm_TEMPLATE = VBoxBS3KitImg64
-bs3kit-common-64_asm_INSTTYPE = none
-bs3kit-common-64-asm_DEFS     = TMPL_LM64 BS3_CMN_ONLY
-bs3kit-common-64-asm_ASDEFS   = RT_ASMDEFS_INC_FIRST_FILE
-bs3kit-common-64-asm_SOURCES  = $(filter %.asm,$(VBOX_BS3KIT_COMMON_SOURCES)) \
+LIBRARIES += bs3kit-common-64
+bs3kit-common-64_TEMPLATE = VBoxBS3KitImg64
+bs3kit-common-64_INSTTYPE = none
+bs3kit-common-64_DEFS     = TMPL_LM64 BS3_CMN_ONLY
+bs3kit-common-64_ASDEFS   = RT_ASMDEFS_INC_FIRST_FILE
+bs3kit-common-64_SOURCES  = $(VBOX_BS3KIT_COMMON_SOURCES) \
        bs3-c64-Trap64Generic.asm
-
-# The 64-bit BS3Kit library.
-LIBRARIES += bs3kit-common-64-c
-bs3kit-common-64-c_TEMPLATE = VBoxBS3KitImg64
-bs3kit-common-64_c_INSTTYPE = none
-bs3kit-common-64-c_DEFS     = TMPL_LM64 BS3_CMN_ONLY
-bs3kit-common-64-c_SOURCES  = $(filter-out %.asm,$(VBOX_BS3KIT_COMMON_SOURCES))
 
 
@@ -399 +392 @@
 
 # The 64-bit long mode BS3Kit library.
-LIBRARIES += bs3kit-lm64-asm
-bs3kit-lm64-asm_TEMPLATE = VBoxBS3KitImg64
-bs3kit-lm64-asm_INSTTYPE = none
-bs3kit-lm64-asm_DEFS     = TMPL_MODE=BS3_MODE_LM64
-bs3kit-lm64-asm_SOURCES  = $(filter %.asm,$(VBOX_BS3KIT_MODE_SOURCES))
-
-# The 64-bit long mode BS3Kit library.
-LIBRARIES += bs3kit-lm64-c
-bs3kit-lm64-c_TEMPLATE = VBoxBS3KitImg64
-bs3kit-lm64-c_INSTTYPE = none
-bs3kit-lm64-c_DEFS     = TMPL_MODE=BS3_MODE_LM64
-bs3kit-lm64-c_SOURCES  = $(filter-out %.asm, $(VBOX_BS3KIT_MODE_SOURCES))
+LIBRARIES += bs3kit-lm64
+bs3kit-lm64_TEMPLATE = VBoxBS3KitImg64
+bs3kit-lm64_INSTTYPE = none
+bs3kit-lm64_DEFS     = TMPL_MODE=BS3_MODE_LM64
+bs3kit-lm64_SOURCES  = $(VBOX_BS3KIT_MODE_SOURCES)