Changeset 72503 in vbox

Timestamp:

Jun 11, 2018 11:27:07 AM (7 years ago)

Author:

vboxsync

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

122989

Message:

VMM/testcase/Makefile.kmk: Need to pass VMM_COMMON_DEFS to a number of targets there too.

Location:

trunk/src/VBox/VMM

Files:

• Config.kmk (added)
• Makefile.kmk (modified) (2 diffs)
• testcase/Makefile.kmk (modified) (6 diffs)

trunk/src/VBox/VMM/Makefile.kmk

@@ -19 +19 @@
 include $(KBUILD_PATH)/subheader.kmk
 
+# Include our Config.kmk if kmk is invoked from a parent directory.
+ifndef VBOX_VMM_CONFIG_KMK_INCLUDED
+ include $(PATH_SUB_CURRENT)/Config.kmk
+endif
+
 # Include sub-makefiles.
 ifndef VBOX_ONLY_EXTPACKS
@@ -34 +39 @@
  endif
 endif
-
-
-#
-# Globals
-#
-
-## DEFS variable that is picked up by all three VMM targets (R0, R3, RC).
-# Can be prepended to by setting it in LocalConfig.kmk
-VMM_COMMON_DEFS ?= VBOX_IN_VMM
-ifdef VBOX_WITH_2ND_IEM_STEP
- VMM_COMMON_DEFS += VBOX_WITH_2ND_IEM_STEP
-endif
-ifdef VBOX_WITH_3RD_IEM_STEP
- VMM_COMMON_DEFS += VBOX_WITH_3RD_IEM_STEP
-endif
-ifdef VBOX_WITH_NESTED_HWVIRT_SVM
- VMM_COMMON_DEFS += VBOX_WITH_NESTED_HWVIRT_SVM
-endif
-ifdef VBOX_WITH_NESTED_HWVIRT_ONLY_IN_IEM
- VMM_COMMON_DEFS += VBOX_WITH_NESTED_HWVIRT_ONLY_IN_IEM
-endif
-#ifdef VBOX_WITH_IEM
-# VMM_COMMON_DEFS += VBOX_WITH_IEM
-#endif
-# part of global DEFS
-#ifdef VBOX_WITH_REM
-# VMM_COMMON_DEFS += VBOX_WITH_REM
-#endif
-ifdef VBOX_WITH_MULTI_CORE
- VMM_COMMON_DEFS += VBOX_WITH_MULTI_CORE
-endif
-ifdef VBOX_WITH_R0_LOGGING
- VMM_COMMON_DEFS += VBOX_WITH_R0_LOGGING
-endif
-ifdef VBOX_WITH_VMMR0_DISABLE_LAPIC_NMI
- VMM_COMMON_DEFS += VBOX_WITH_VMMR0_DISABLE_LAPIC_NMI
-endif
-ifdef VBOX_WITH_PCI_PASSTHROUGH
- VMM_COMMON_DEFS += VBOX_WITH_PCI_PASSTHROUGH
-endif
-ifdef VBOX_WITH_DTRACE_RC
- VMM_COMMON_DEFS += VBOX_WITH_DTRACE_RC
-endif
-ifdef VBOX_WITH_SAFE_STR
- VMM_COMMON_DEFS += VBOX_WITH_SAFE_STR
-endif
-ifdef VBOX_WITH_RAW_RING1
- VMM_COMMON_DEFS += VBOX_WITH_RAW_RING1
-endif
-ifdef VBOX_WITH_64ON32_IDT
- VMM_COMMON_DEFS += VBOX_WITH_64ON32_IDT
-endif
-ifdef VBOX_WITH_64ON32_CMOS_DEBUG
- VMM_COMMON_DEFS += VBOX_WITH_64ON32_CMOS_DEBUG
-endif
-ifdef VBOXSTRICTRC_STRICT_ENABLED
- VMM_COMMON_DEFS += VBOXSTRICTRC_STRICT_ENABLED
-endif
-ifeq ($(KBUILD_TARGET),amd64)
- VMM_COMMON_DEFS += VBOX_WITH_MORE_RING0_MEM_MAPPINGS
-endif
-
-# VMM_COMMON_DEFS += VBOX_WITH_NS_ACCOUNTING_STATS
-
 
 

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

@@ -144 +144 @@
 ifdef VBOX_WITH_RAW_MODE
  tstVMStructRC_TEMPLATE  = VBoxRcExe
- tstVMStructRC_DEFS      = IN_VMM_RC IN_DIS IN_RT_RC VBOX_WITH_RAW_MODE
+ tstVMStructRC_DEFS      = IN_VMM_RC IN_DIS IN_RT_RC VBOX_WITH_RAW_MODE $(VMM_COMMON_DEFS)
  ifdef VBOX_WITH_R0_LOGGING
   tstVMStructRC_DEFS    += VBOX_WITH_R0_LOGGING
@@ -158 +158 @@
 
 tstVMStructSize_TEMPLATE= VBOXR3AUTOTST
-tstVMStructSize_DEFS    = IN_VMM_R3 IN_DIS
+tstVMStructSize_DEFS    = IN_VMM_R3 IN_DIS $(VMM_COMMON_DEFS)
 ifdef VBOX_WITH_RAW_MODE
  tstVMStructSize_DEFS  += VBOX_WITH_RAW_MODE
@@ -178 +178 @@
 
 tstAsmStructs_TEMPLATE  = VBOXR3AUTOTST
-tstAsmStructs_DEFS      = IN_VMM_R3 IN_DIS
+tstAsmStructs_DEFS      = IN_VMM_R3 IN_DIS $(VMM_COMMON_DEFS)
 ifdef VBOX_WITH_RAW_MODE
  tstAsmStructs_DEFS    += VBOX_WITH_RAW_MODE
@@ -196 +196 @@
 ifdef VBOX_WITH_RAW_MODE
  tstAsmStructsRC_TEMPLATE= VBoxRcExe
- tstAsmStructsRC_DEFS    = IN_VMM_RC IN_DIS IN_RT_RC VBOX_WITH_RAW_MODE
+ tstAsmStructsRC_DEFS    = IN_VMM_RC IN_DIS IN_RT_RC VBOX_WITH_RAW_MODE $(VMM_COMMON_DEFS)
  ifdef VBOX_WITH_R0_LOGGING
   tstAsmStructsRC_DEFS  += VBOX_WITH_R0_LOGGING
@@ -231 +231 @@
 tstIEMCheckMc_TEMPLATE  = VBOXR3TSTEXE
 tstIEMCheckMc_SOURCES   = tstIEMCheckMc.cpp
+tstIEMCheckMc_DEFS      = $(VMM_COMMON_DEFS)
 tstIEMCheckMc_LIBS      = $(LIB_RUNTIME)
 ifeq ($(KBUILD_TARGET),win)
@@ -469 +470 @@
      || defined(VBOX_WITH_DTRACE_RC))
  tstVMStructDTrace_TEMPLATE= VBOXR3AUTOTST
- tstVMStructDTrace_DEFS    = IN_VMM_R3 IN_DIS
+ tstVMStructDTrace_DEFS    = IN_VMM_R3 IN_DIS $(VMM_COMMON_DEFS)
  ifdef VBOX_WITH_RAW_MODE
   tstVMStructDTrace_DEFS  += VBOX_WITH_RAW_MODE