VirtualBox

Ignore:
Timestamp:
Dec 4, 2024 3:20:14 PM (6 weeks ago)
Author:
vboxsync
Message:

VMM: Cleaning up ARMv8 / x86 split. jiraref:VBP-1470

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r106945 r107227  
    156156ifdef VBOX_WITH_RAW_MODE
    157157 tstVMStructRC_TEMPLATE = VBoxRcExe
    158  tstVMStructRC_DEFS     = VBOX_IN_VMM IN_VMM_RC IN_DIS IN_RT_RC VBOX_WITH_RAW_MODE $(VMM_COMMON_DEFS)
     158 tstVMStructRC_DEFS     = VBOX_VMM_TARGET_AGNOSTIC VBOX_IN_VMM IN_VMM_RC IN_DIS IN_RT_RC VBOX_WITH_RAW_MODE $(VMM_COMMON_DEFS)
    159159 ifdef VBOX_WITH_R0_LOGGING
    160160  tstVMStructRC_DEFS   += VBOX_WITH_R0_LOGGING
    … …  
    170170 tstVMStructSize_CXXFLAGS += $(VBOX_GCC_Wno-invalid-offsetof)
    171171endif
    172 tstVMStructSize_DEFS    = VBOX_IN_VMM IN_VMM_R3 IN_DIS $(VMM_COMMON_DEFS)
     172tstVMStructSize_DEFS    = VBOX_VMM_TARGET_AGNOSTIC VBOX_IN_VMM IN_VMM_R3 IN_DIS $(VMM_COMMON_DEFS)
    173173ifdef VBOX_WITH_RAW_MODE
    174174 tstVMStructSize_DEFS  += VBOX_WITH_RAW_MODE
    … …  
    192192 tstAsmStructSize_CXXFLAGS += $(VBOX_GCC_Wno-invalid-offsetof)
    193193endif
    194 tstAsmStructs_DEFS      = VBOX_IN_VMM IN_VMM_R3 IN_DIS $(VMM_COMMON_DEFS)
     194tstAsmStructs_DEFS      = VBOX_VMM_TARGET_AGNOSTIC VBOX_IN_VMM IN_VMM_R3 IN_DIS $(VMM_COMMON_DEFS)
    195195ifdef VBOX_WITH_RAW_MODE
    196196 tstAsmStructs_DEFS    += VBOX_WITH_RAW_MODE
    … …  
    207207ifdef VBOX_WITH_RAW_MODE
    208208 tstAsmStructsRC_TEMPLATE = VBoxRcExe
    209  tstAsmStructsRC_DEFS   = VBOX_IN_VMM IN_VMM_RC IN_DIS IN_RT_RC VBOX_WITH_RAW_MODE $(VMM_COMMON_DEFS)
     209 tstAsmStructsRC_DEFS   = VBOX_VMM_TARGET_AGNOSTIC VBOX_IN_VMM IN_VMM_RC IN_DIS IN_RT_RC VBOX_WITH_RAW_MODE $(VMM_COMMON_DEFS)
    210210 ifdef VBOX_WITH_R0_LOGGING
    211211  tstAsmStructsRC_DEFS += VBOX_WITH_R0_LOGGING
    … …  
    655655
    656656tstIEMAImpl_TEMPLATE  = VBoxR3TstExe
    657 tstIEMAImpl_DEFS      = $(VMM_COMMON_DEFS) IEM_WITHOUT_ASSEMBLY IEM_WITHOUT_INSTRUCTION_STATS
     657tstIEMAImpl_DEFS      = VBOX_VMM_TARGET_X86 $(VMM_COMMON_DEFS) IEM_WITHOUT_ASSEMBLY IEM_WITHOUT_INSTRUCTION_STATS
    658658tstIEMAImpl_SDKS      = VBoxSoftFloatR3Shared
    659659tstIEMAImpl_INCS      = ../include .
    … …  
    677677tstIEMAImplAsm_TEMPLATE      := VBoxR3TstExe
    678678tstIEMAImplAsm_SDKS          := VBoxSoftFloatR3Shared
    679 tstIEMAImplAsm_DEFS           = $(VMM_COMMON_DEFS) IEM_WITH_ASSEMBLY IEM_WITHOUT_INSTRUCTION_STATS TSTIEMAIMPL_WITH_GENERATOR
     679tstIEMAImplAsm_DEFS           = VBOX_VMM_TARGET_X86 $(VMM_COMMON_DEFS) IEM_WITH_ASSEMBLY IEM_WITHOUT_INSTRUCTION_STATS TSTIEMAIMPL_WITH_GENERATOR
    680680tstIEMAImplAsm_ASFLAGS.amd64 := -Werror
    681681tstIEMAImplAsm_ASFLAGS.x86   := -Werror
    … …  
    701701tstIEMCheckMc_TEMPLATE  = VBoxR3TstExe
    702702tstIEMCheckMc_SOURCES   = tstIEMCheckMc.cpp
    703 tstIEMCheckMc_DEFS      = $(VMM_COMMON_DEFS) IEM_WITHOUT_INSTRUCTION_STATS
     703tstIEMCheckMc_DEFS      = VBOX_VMM_TARGET_X86 $(VMM_COMMON_DEFS) IEM_WITHOUT_INSTRUCTION_STATS
    704704tstIEMCheckMc_LIBS      = $(LIB_RUNTIME)
    705705ifeq ($(KBUILD_TARGET),win)
    … …  
    713713#
    714714tstIEMN8veProfiling_TEMPLATE := VBoxR3Exe
    715 tstIEMN8veProfiling_DEFS      = $(VMM_COMMON_DEFS)
     715tstIEMN8veProfiling_DEFS      = VBOX_VMM_TARGET_AGNOSTIC $(VMM_COMMON_DEFS)
    716716tstIEMN8veProfiling_SOURCES  := tstIEMN8veProfiling.cpp
    717717tstIEMN8veProfiling_LIBS      = $(LIB_VMM) $(LIB_RUNTIME)
    … …  
    722722tstSSM_TEMPLATE         = VBoxR3TstExe
    723723tstSSM_INCS             = $(VBOX_PATH_VMM_SRC)/include
    724 tstSSM_DEFS             = $(VMM_COMMON_DEFS)
     724tstSSM_DEFS             = VBOX_VMM_TARGET_AGNOSTIC $(VMM_COMMON_DEFS)
    725725tstSSM_SOURCES          = tstSSM.cpp
    726726tstSSM_LIBS             = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
    … …  
    742742 tstCFGM_TEMPLATE        = VBoxR3SignedTstExe
    743743endif
    744 tstCFGM_DEFS             = $(VMM_COMMON_DEFS)
     744tstCFGM_DEFS             = VBOX_VMM_TARGET_AGNOSTIC $(VMM_COMMON_DEFS)
    745745tstCFGM_SOURCES          = tstCFGM.cpp
    746746tstCFGM_LIBS             = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
    … …  
    781781 tstVMREQ_TEMPLATE        = VBoxR3SignedExe
    782782endif
    783 tstVMREQ_DEFS             = $(VMM_COMMON_DEFS)
     783tstVMREQ_DEFS             = VBOX_VMM_TARGET_AGNOSTIC $(VMM_COMMON_DEFS)
    784784tstVMREQ_SOURCES          = tstVMREQ.cpp
    785785tstVMREQ_LIBS             = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
    … …  
    801801 tstAnimate_TEMPLATE        = VBoxR3SignedExe
    802802endif
    803 tstAnimate_DEFS             = $(VMM_COMMON_DEFS)
     803tstAnimate_DEFS             = VBOX_VMM_TARGET_X86 $(VMM_COMMON_DEFS)
    804804tstAnimate_SOURCES          = tstAnimate.cpp
    805805tstAnimate_LIBS             = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
    … …  
    918918#
    919919tstPDMQueue_TEMPLATE := VBoxR3Exe
    920 tstPDMQueue_DEFS     = $(VMM_COMMON_DEFS)
     920tstPDMQueue_DEFS      = VBOX_VMM_TARGET_AGNOSTIC $(VMM_COMMON_DEFS)
    921921tstPDMQueue_SOURCES  := tstPDMQueue.cpp
    922922tstPDMQueue_LIBS     := $(LIB_VMM) $(LIB_RUNTIME)
    … …  
    940940  tstPDMAsyncCompletion_TEMPLATE       = VBoxR3SignedExe
    941941 endif
    942  tstPDMAsyncCompletion_DEFS            = $(VMM_COMMON_DEFS)
     942 tstPDMAsyncCompletion_DEFS            = VBOX_VMM_TARGET_AGNOSTIC $(VMM_COMMON_DEFS)
    943943 tstPDMAsyncCompletion_INCS            = $(VBOX_PATH_VMM_SRC)/include
    944944 tstPDMAsyncCompletion_SOURCES         = tstPDMAsyncCompletion.cpp
    … …  
    961961  tstPDMAsyncCompletionStress_TEMPLATE = VBoxR3SignedExe
    962962 endif
    963  tstPDMAsyncCompletionStress_DEFS      = $(VMM_COMMON_DEFS)
     963 tstPDMAsyncCompletionStress_DEFS      = VBOX_VMM_TARGET_AGNOSTIC $(VMM_COMMON_DEFS)
    964964 tstPDMAsyncCompletionStress_INCS      = $(VBOX_PATH_VMM_SRC)/include
    965965 tstPDMAsyncCompletionStress_SOURCES   = tstPDMAsyncCompletionStress.cpp
    … …  
    970970 PROGRAMS += tstSSM-2
    971971 tstSSM-2_TEMPLATE      = VBoxR3TstExe
    972  tstSSM-2_DEFS          = IN_VMM_STATIC
     972 tstSSM-2_DEFS          = VBOX_VMM_TARGET_AGNOSTIC IN_VMM_STATIC
    973973 tstSSM-2_SOURCES       = tstSSM-2.cpp
    974974 tstSSM-2_LIBS          = $(PATH_STAGE_LIB)/SSMStandalone$(VBOX_SUFF_LIB)
    … …  
    983983  || defined(VBOX_WITH_DTRACE_RC))
    984984 tstVMStructDTrace_TEMPLATE = VBoxR3AutoTest
    985  tstVMStructDTrace_DEFS    = VBOX_IN_VMM IN_VMM_R3 IN_DIS $(VMM_COMMON_DEFS) IEM_WITHOUT_INSTRUCTION_STATS
     985 tstVMStructDTrace_DEFS    = VBOX_VMM_TARGET_AGNOSTIC VBOX_IN_VMM IN_VMM_R3 IN_DIS $(VMM_COMMON_DEFS) IEM_WITHOUT_INSTRUCTION_STATS
    986986 ifdef VBOX_WITH_RAW_MODE
    987987  tstVMStructDTrace_DEFS  += VBOX_WITH_RAW_MODE
    … …  
    10251025                $(DEFS.$(KBUILD_TARGET_ARCH)) \
    10261026                $(DEFS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)) \
    1027                 $(VMM_COMMON_DEFS) \
     1027                VBOX_VMM_TARGET_X86 $(VMM_COMMON_DEFS) \
    10281028                ) \
    10291029        -f $(if $(eq $(KBUILD_TARGET),darwin),macho,$(if $(eq $(KBUILD_TARGET),win),coff,elf)) \
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette