VirtualBox

Changeset 25946 in vbox for trunk/src/VBox/Runtime


Ignore:
Timestamp:
Jan 20, 2010 11:52:24 PM (15 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
56788
Message:

*: VBOX_WITH_RAW_MODE - Initial build changes (builds on mac os x).

Location:
trunk/src/VBox/Runtime
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Runtime/Makefile.kmk

    r25942 r25946  
    55
    66#
    7 # Copyright (C) 2006-2007 Sun Microsystems, Inc.
     7# Copyright (C) 2006-2010 Sun Microsystems, Inc.
    88#
    99# This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    5858
    5959 BLDPROGS += uniread
    60  LIBRARIES += RuntimeR3 RuntimeR0 RuntimeGC RuntimeEFCPP RuntimeR3NoCRTGCC
     60 LIBRARIES += RuntimeR3 RuntimeR0 RuntimeEFCPP RuntimeR3NoCRTGCC
     61 ifdef VBOX_WITH_RAW_MODE
     62  LIBRARIES += RuntimeGC
     63 endif
    6164 ifdef VBOX_WITH_VBOXDRV
    6265  LIBRARIES += RuntimeR0Drv
    … …  
    15351538
    15361539
    1537 #
    1538 # RuntimeGC - Guest context library.
    1539 #
    1540 RuntimeGC_TEMPLATE      = VBOXGC
    1541 RuntimeGC_DEFS          = IN_RT_GC RT_WITH_VBOX
    1542 RuntimeGC_INCS          = include
    1543 RuntimeGC_SOURCES       = \
    1544         common/log/log.cpp \
    1545         common/log/logellipsis.cpp \
    1546         common/log/logrel.cpp \
    1547         common/log/logrelellipsis.cpp \
    1548         common/log/logcom.cpp \
    1549         common/log/logformat.cpp \
    1550         common/misc/RTAssertMsg1Weak.cpp \
    1551         common/misc/RTAssertMsg2.cpp \
    1552         common/misc/RTAssertMsg2Add.cpp \
    1553         common/misc/RTAssertMsg2AddWeak.cpp \
    1554         common/misc/RTAssertMsg2AddWeakV.cpp \
    1555         common/misc/RTAssertMsg2Weak.cpp \
    1556         common/misc/RTAssertMsg2WeakV.cpp \
    1557         common/misc/assert.cpp \
    1558         common/misc/buildconfig.cpp \
    1559         common/misc/sanity-c.c \
    1560         common/misc/sanity-cpp.cpp \
    1561         common/string/strformat.cpp \
    1562         common/string/strformatrt.cpp \
    1563         common/string/strformattype.cpp \
    1564         common/string/strncmp.cpp \
    1565         common/string/strpbrk.cpp \
    1566         common/string/strprintf.cpp \
    1567         common/table/avllu32.cpp \
    1568         common/table/avlou32.cpp \
    1569         common/table/avlogcphys.cpp \
    1570         common/table/avlogcptr.cpp \
    1571         common/table/avlohcphys.cpp \
    1572         common/table/avloioport.cpp \
    1573         common/table/avlrogcphys.cpp \
    1574         common/table/avlrogcptr.cpp \
    1575         common/table/avlroioport.cpp \
    1576         common/table/avlroogcptr.cpp \
    1577         common/table/avlu32.cpp \
    1578         common/time/timeprog.cpp \
    1579         common/time/timesup.cpp \
    1580         gc/initterm-gc.cpp \
    1581         generic/RTAssertShouldPanic-generic.cpp \
    1582         VBox/strformat-vbox.cpp \
    1583         \
    1584         $(RuntimeNoCrt_SOURCES)
    1585 
    1586 #if1of ($(KBUILD_TARGET_ARCH),amd64 x86)
    1587 # RuntimeGC_SOURCES += common/time/timesupA.asm
    1588 #else
    1589  RuntimeGC_SOURCES += common/time/timesupref.cpp
    1590 #endif
    1591 
    1592 RuntimeGC_SOURCES.win.x86 = $(RuntimeWin32ASM_SOURCES)
    1593 
    1594 ifeq ($(VBOX_LDR_FMT32),lx)
    1595  RuntimeGC_SOURCES += os2/sys0.asm
    1596 endif
    1597 
    1598 if1of ($(KBUILD_TARGET), darwin solaris freebsd)
    1599 RuntimeGC_SOURCES += \
    1600         common/math/gcc/adddi3.c \
    1601         common/math/gcc/anddi3.c \
    1602         common/math/gcc/ashldi3.c \
    1603         common/math/gcc/ashrdi3.c \
    1604         common/math/gcc/cmpdi2.c \
    1605         common/math/gcc/divdi3.c \
    1606         common/math/gcc/iordi3.c \
    1607         common/math/gcc/lshldi3.c \
    1608         common/math/gcc/lshrdi3.c \
    1609         common/math/gcc/moddi3.c \
    1610         common/math/gcc/muldi3.c \
    1611         common/math/gcc/negdi2.c \
    1612         common/math/gcc/notdi2.c \
    1613         common/math/gcc/qdivrem.c \
    1614         common/math/gcc/subdi3.c \
    1615         common/math/gcc/ucmpdi2.c \
    1616         common/math/gcc/udivdi3.c \
    1617         common/math/gcc/umoddi3.c \
    1618         common/math/gcc/xordi3.c
    1619 endif
     1540ifdef VBOX_WITH_RAW_MODE
     1541 #
     1542 # RuntimeGC - Guest context library.
     1543 #
     1544 RuntimeGC_TEMPLATE      = VBOXGC
     1545 RuntimeGC_DEFS          = IN_RT_GC RT_WITH_VBOX
     1546 RuntimeGC_INCS          = include
     1547 RuntimeGC_SOURCES       = \
     1548        common/log/log.cpp \
     1549        common/log/logellipsis.cpp \
     1550        common/log/logrel.cpp \
     1551        common/log/logrelellipsis.cpp \
     1552        common/log/logcom.cpp \
     1553        common/log/logformat.cpp \
     1554        common/misc/RTAssertMsg1Weak.cpp \
     1555        common/misc/RTAssertMsg2.cpp \
     1556        common/misc/RTAssertMsg2Add.cpp \
     1557        common/misc/RTAssertMsg2AddWeak.cpp \
     1558        common/misc/RTAssertMsg2AddWeakV.cpp \
     1559        common/misc/RTAssertMsg2Weak.cpp \
     1560        common/misc/RTAssertMsg2WeakV.cpp \
     1561        common/misc/assert.cpp \
     1562        common/misc/buildconfig.cpp \
     1563        common/misc/sanity-c.c \
     1564        common/misc/sanity-cpp.cpp \
     1565        common/string/strformat.cpp \
     1566        common/string/strformatrt.cpp \
     1567        common/string/strformattype.cpp \
     1568        common/string/strncmp.cpp \
     1569        common/string/strpbrk.cpp \
     1570        common/string/strprintf.cpp \
     1571        common/table/avllu32.cpp \
     1572        common/table/avlou32.cpp \
     1573        common/table/avlogcphys.cpp \
     1574        common/table/avlogcptr.cpp \
     1575        common/table/avlohcphys.cpp \
     1576        common/table/avloioport.cpp \
     1577        common/table/avlrogcphys.cpp \
     1578        common/table/avlrogcptr.cpp \
     1579        common/table/avlroioport.cpp \
     1580        common/table/avlroogcptr.cpp \
     1581        common/table/avlu32.cpp \
     1582        common/time/timeprog.cpp \
     1583        common/time/timesup.cpp \
     1584        gc/initterm-gc.cpp \
     1585        generic/RTAssertShouldPanic-generic.cpp \
     1586        VBox/strformat-vbox.cpp \
     1587        \
     1588        $(RuntimeNoCrt_SOURCES)
     1589
     1590 #if1of ($(KBUILD_TARGET_ARCH),amd64 x86)
     1591 # RuntimeGC_SOURCES += common/time/timesupA.asm
     1592 #else
     1593  RuntimeGC_SOURCES += common/time/timesupref.cpp
     1594 #endif
     1595
     1596 RuntimeGC_SOURCES.win.x86 = $(RuntimeWin32ASM_SOURCES)
     1597
     1598 ifeq ($(VBOX_LDR_FMT32),lx)
     1599  RuntimeGC_SOURCES += os2/sys0.asm
     1600 endif
     1601
     1602 if1of ($(KBUILD_TARGET), darwin solaris freebsd)
     1603  RuntimeGC_SOURCES += \
     1604        common/math/gcc/adddi3.c \
     1605        common/math/gcc/anddi3.c \
     1606        common/math/gcc/ashldi3.c \
     1607        common/math/gcc/ashrdi3.c \
     1608        common/math/gcc/cmpdi2.c \
     1609        common/math/gcc/divdi3.c \
     1610        common/math/gcc/iordi3.c \
     1611        common/math/gcc/lshldi3.c \
     1612        common/math/gcc/lshrdi3.c \
     1613        common/math/gcc/moddi3.c \
     1614        common/math/gcc/muldi3.c \
     1615        common/math/gcc/negdi2.c \
     1616        common/math/gcc/notdi2.c \
     1617        common/math/gcc/qdivrem.c \
     1618        common/math/gcc/subdi3.c \
     1619        common/math/gcc/ucmpdi2.c \
     1620        common/math/gcc/udivdi3.c \
     1621        common/math/gcc/umoddi3.c \
     1622        common/math/gcc/xordi3.c
     1623 endif
     1624endif # VBOX_WITH_RAW_MODE
    16201625
    16211626

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

    r25924 r25946  
    132132        tstDarwinSched
    133133SYSMODS += \
    134         tstLdrObj \
    135134        tstLdrObjR0 \
    136135        tstRTR0MemUserKernel \
    137136        tstR0ThreadPreemption
     137ifdef VBOX_WITH_RAW_MODE
     138 SYSMODS += tstLdrObj
     139endif
    138140if1of ($(VBOX_LDR_FMT)), lx pe)
    139141LIBRARIES += \
    … …  
    226228        $(PATH_LIB)/DisasmR3$(VBOX_SUFF_LIB)
    227229
    228 tstLdrObj_TEMPLATE = VBOXGC
    229 tstLdrObj_INST = $(INST_TESTCASE)
    230 tstLdrObj_SYSSUFF = .gc
    231 tstLdrObj_SOURCES = tstLdrObj.cpp
    232 tstLdrObj_DEFS = IN_DIS IN_RT_GC IN_RT_RC DIS_CORE_ONLY
    233 ifeq ($(VBOX_LDR_FMT32),elf)
    234 tstLdrObj_DEFS += VBOX_SOME_IMPORT_FUNCTION
    235 endif
    236 tstLdrObj_LIBS = \
    237         $(PATH_LIB)/DisasmGC$(VBOX_SUFF_LIB) \
    238         $(PATH_LIB)/RuntimeGC$(VBOX_SUFF_LIB)
    239 ifeq ($(VBOX_LDR_FMT32),pe)
    240 tstLdrObj_LDFLAGS = -Entry:Entrypoint
    241 tstLdrObj_LIBS += \
    242         $(PATH_LIB)/VMMGCBuiltin$(VBOX_SUFF_LIB)
    243 endif # PE
    244 ifeq ($(VBOX_LDR_FMT32),elf)
    245 tstLdrObj_LDFLAGS = -e Entrypoint
    246 endif
    247 ifeq ($(VBOX_LDR_FMT32),lx)
    248 tstLdrObj_LIBS += \
    249         $(PATH_LIB)/VMMGCBuiltin$(VBOX_SUFF_LIB)
    250 endif
     230ifdef VBOX_WITH_RAW_MODE
     231 tstLdrObj_TEMPLATE = VBOXGC
     232 tstLdrObj_INST = $(INST_TESTCASE)
     233 tstLdrObj_SYSSUFF = .gc
     234 tstLdrObj_SOURCES = tstLdrObj.cpp
     235 tstLdrObj_DEFS = IN_DIS IN_RT_GC IN_RT_RC DIS_CORE_ONLY
     236 ifeq ($(VBOX_LDR_FMT32),elf)
     237 tstLdrObj_DEFS += VBOX_SOME_IMPORT_FUNCTION
     238 endif
     239 tstLdrObj_LIBS = \
     240        $(PATH_LIB)/DisasmGC$(VBOX_SUFF_LIB) \
     241        $(PATH_LIB)/RuntimeGC$(VBOX_SUFF_LIB)
     242 ifeq ($(VBOX_LDR_FMT32),pe)
     243 tstLdrObj_LDFLAGS = -Entry:Entrypoint
     244 tstLdrObj_LIBS += \
     245        $(PATH_LIB)/VMMGCBuiltin$(VBOX_SUFF_LIB)
     246 endif # PE
     247 ifeq ($(VBOX_LDR_FMT32),elf)
     248 tstLdrObj_LDFLAGS = -e Entrypoint
     249 endif
     250 ifeq ($(VBOX_LDR_FMT32),lx)
     251 tstLdrObj_LIBS += \
     252        $(PATH_LIB)/VMMGCBuiltin$(VBOX_SUFF_LIB)
     253 endif
     254endif # VBOX_WITH_RAW_MODE
    251255
    252256tstLdr-3_SOURCES = tstLdr-3.cpp
Note: See TracChangeset for help on using the changeset viewer.

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