VirtualBox

Changeset 95925 in vbox


Ignore:
Timestamp:
Jul 28, 2022 10:49:32 PM (3 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
152680
Message:

IPRT/Makefile.kmk: Restructured the VBOX_WITH_NOCRT_STATIC tricks so they are applied to RuntimeR3 and most of it's descendants. VBoxRT and VBoxBldProg does not want VBOX_WITH_NOCRT_STATIC and for them there is now a RuntimeBaseR3 target to inherit from instead. bugref:10261

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r95915 r95925  
    292292
    293293#
    294 # RuntimeR3 - Static Runtime for Ring-3 executables.
    295 #
    296 RuntimeR3_TEMPLATE      = VBoxR3Static
    297 RuntimeR3_SDKS          = VBOX_LIBXML2
    298 RuntimeR3_SDKS.win      = $(VBOX_WINPSDK) $(VBOX_WINDDK)
    299 RuntimeR3_DEFS          = \
     294# RuntimeBaseR3 - Commmon Base Runtime Target for Ring-3 executables.
     295#
     296# Note! This is not make itself, it's only used as a base target config to be
     297#       inherited from by RuntimeR3(.lib) and VBoxR3(.dll).
     298#
     299RuntimeBaseR3_TEMPLATE      = VBoxR3Static
     300RuntimeBaseR3_SDKS          = VBOX_LIBXML2
     301RuntimeBaseR3_SDKS.win      = $(VBOX_WINPSDK) $(VBOX_WINDDK)
     302RuntimeBaseR3_DEFS          = \
    300303        IN_RT_R3 \
    301304        LDR_WITH_NATIVE \
    … …  
    309312        NOFILEID
    310313if1of ($(KBUILD_TARGET_ARCH), amd64 x86)
    311  RuntimeR3_DEFS         += \
     314 RuntimeBaseR3_DEFS         += \
    312315        IN_SUP_R3
    313316endif
    314 #RuntimeR3_DEFS         += RTMEM_WRAP_TO_EF_APIS
     317#RuntimeBaseR3_DEFS         += RTMEM_WRAP_TO_EF_APIS
    315318ifdef IPRT_WITH_LZJB
    316  RuntimeR3_DEFS        += RTZIP_USE_LZJB
     319 RuntimeBaseR3_DEFS        += RTZIP_USE_LZJB
    317320endif
    318321ifdef IPRT_WITH_LZO
    319  RuntimeR3_DEFS        += RTZIP_USE_LZO
     322 RuntimeBaseR3_DEFS        += RTZIP_USE_LZO
    320323endif
    321324ifn1of ($(KBUILD_TARGET), win)
    322  RuntimeR3_DEFS        += RT_WITH_ICONV_CACHE
     325 RuntimeBaseR3_DEFS        += RT_WITH_ICONV_CACHE
    323326endif
    324327ifdef IPRT_WITH_FUTEX_BASED_SEMS
    325  RuntimeR3_DEFS.linux  += IPRT_WITH_FUTEX_BASED_SEMS
     328 RuntimeBaseR3_DEFS.linux  += IPRT_WITH_FUTEX_BASED_SEMS
    326329endif
    327330ifdef IPRT_HTTP_WITH_WEBDAV
    328  RuntimeR3_DEFS        += IPRT_HTTP_WITH_WEBDAV
     331 RuntimeBaseR3_DEFS        += IPRT_HTTP_WITH_WEBDAV
    329332endif
    330333ifdef IPRT_WITHOUT_PAM
    331  RuntimeR3_DEFS        += IPRT_WITHOUT_PAM
    332 endif
    333 RuntimeR3_INCS          = \
     334 RuntimeBaseR3_DEFS        += IPRT_WITHOUT_PAM
     335endif
     336RuntimeBaseR3_INCS          = \
    334337        include \
    335338        $(SDK_VBOX_ZLIB_INCS) \
    336339        $(SDK_VBOX_LZF_INCS)
    337340
    338 # RuntimeR3_INCS.solaris  = \
     341# RuntimeBaseR3_INCS.solaris  = \
    339342#    /usr/include
    340343
    341 RuntimeR3_SOURCES       = \
     344RuntimeBaseR3_SOURCES      := \
    342345        common/alloc/alloc.cpp \
    343346        common/alloc/heapsimple.cpp \
    … …  
    784787
    785788#if1of ($(KBUILD_TARGET_ARCH),amd64 x86)
    786 # RuntimeR3_SOURCES += common/time/timesupA.asm
     789# RuntimeBaseR3_SOURCES += common/time/timesupA.asm
    787790#else
    788  RuntimeR3_SOURCES += common/time/timesupref.cpp
     791 RuntimeBaseR3_SOURCES += common/time/timesupref.cpp
    789792#endif
    790793
    791 RuntimeR3_SOURCES.x86 += \
     794RuntimeBaseR3_SOURCES.x86 += \
    792795        generic/RTMpGetDescription-generic.cpp \
    793796        common/misc/zero.asm \
    794797        common/misc/RTSystemIsInsideVM-amd64-x86.cpp \
    795798        common/string/RTStrMemFind32.asm
    796 RuntimeR3_SOURCES.amd64 += \
     799RuntimeBaseR3_SOURCES.amd64 += \
    797800        generic/RTMpGetDescription-generic.cpp \
    798801        common/misc/zero.asm \
    799802        common/misc/RTSystemIsInsideVM-amd64-x86.cpp \
    800803        common/string/RTStrMemFind32.asm
    801 RuntimeR3_SOURCES.arm32 := \
     804RuntimeBaseR3_SOURCES.arm32 := \
    802805        common/asm/ASMBitFirstClear-generic.cpp \
    803806        common/asm/ASMBitNextClear-generic.cpp \
    … …  
    810813        common/asm/ASMMemFirstNonZero-generic.cpp \
    811814        common/misc/zero-alt.S
    812 RuntimeR3_SOURCES.arm64 := \
     815RuntimeBaseR3_SOURCES.arm64 := \
    813816        common/asm/ASMBitFirstClear-generic.cpp \
    814817        common/asm/ASMBitNextClear-generic.cpp \
    … …  
    821824        common/asm/ASMMemFirstNonZero-generic.cpp \
    822825        common/misc/zero-alt.S
    823 RuntimeR3_SOURCES.sparc32 += \
     826RuntimeBaseR3_SOURCES.sparc32 += \
    824827        generic/RTMpGetDescription-generic-stub.cpp \
    825828        generic/RTSystemIsInsideVM-generic.cpp \
    … …  
    836839        common/misc/zero-alt.S \
    837840        common/string/RTStrMemFind32.cpp
    838 RuntimeR3_SOURCES.sparc64 += \
     841RuntimeBaseR3_SOURCES.sparc64 += \
    839842        generic/RTMpGetDescription-generic-stub.cpp \
    840843        generic/RTSystemIsInsideVM-generic.cpp \
    … …  
    853856
    854857ifdef IPRT_WITH_LZJB
    855  RuntimeR3_SOURCES += common/misc/lzjb.c
     858 RuntimeBaseR3_SOURCES += common/misc/lzjb.c
    856859endif
    857860
    858861# AMD64 / x86 assembly code.
    859 RuntimeR3_SOURCES.x86 += \
     862RuntimeBaseR3_SOURCES.x86 += \
    860863        common/asm/ASMCpuIdExSlow.asm \
    861864        common/asm/ASMAtomicUoAndU64.asm \
    … …  
    882885        common/math/bignum-amd64-x86.asm \
    883886       common/string/RTStrEnd.asm
    884 RuntimeR3_SOURCES.amd64 += \
     887RuntimeBaseR3_SOURCES.amd64 += \
    885888        common/asm/ASMCpuIdExSlow.asm \
    886889        common/asm/ASMAtomicUoAndU64.asm \
    … …  
    911914
    912915# Some versions of GCC might require this.
    913 RuntimeR3_SOURCES.x86 += \
     916RuntimeBaseR3_SOURCES.x86 += \
    914917        common/asm/ASMAtomicXchgU64.asm \
    915918        common/asm/ASMAtomicCmpXchgU64.asm \
    … …  
    919922
    920923# Some non-assembly for non-AMD64 / non-x86 targets:
    921 RuntimeR3_SOURCES.arm32 += \
     924RuntimeBaseR3_SOURCES.arm32 += \
    922925        common/string/RTStrEnd.cpp \
    923926        common/asm/ASMMultU64ByU32DivByU32-generic.cpp
    924 RuntimeR3_SOURCES.arm64 += \
     927RuntimeBaseR3_SOURCES.arm64 += \
    925928        common/string/RTStrEnd.cpp \
    926929        common/asm/ASMMultU64ByU32DivByU32-generic.cpp
    927 RuntimeR3_SOURCES.sparc32 += \
     930RuntimeBaseR3_SOURCES.sparc32 += \
    928931        common/string/RTStrEnd.cpp \
    929932        common/asm/ASMMultU64ByU32DivByU32-generic.cpp
    930 RuntimeR3_SOURCES.sparc64 += \
     933RuntimeBaseR3_SOURCES.sparc64 += \
    931934        common/string/RTStrEnd.cpp \
    932935        common/asm/ASMMultU64ByU32DivByU32-generic.cpp
    933936
    934937# VBox specific stuff.
    935 RuntimeR3_SOURCES += \
     938RuntimeBaseR3_SOURCES += \
    936939        VBox/RTAssertShouldPanic-vbox.cpp \
    937940        VBox/log-vbox.cpp
    938941ifneq ($(KBUILD_TARGET),win)
    939 RuntimeR3_SOURCES += \
     942RuntimeBaseR3_SOURCES += \
    940943        common/err/errmsgxpcom.cpp
    941944endif
    942945if1of ($(KBUILD_TARGET),freebsd linux netbsd openbsd solaris)
    943 RuntimeR3_SOURCES += \
     946RuntimeBaseR3_SOURCES += \
    944947        $(if $(VBOX_WITH_DBUS),VBox/dbus.cpp,)
    945948endif
    946949
    947950VBOX_WITH_NT_DIRENUM = 1
    948 RuntimeR3_SOURCES.win = \
     951RuntimeBaseR3_SOURCES.win = \
    949952        common/dbg/dbgmoddbghelp.cpp \
    950953        common/ioqueue/ioqueue-aiofile-provider.cpp \
    … …  
    10441047        common/string/mempcpy.asm
    10451048
    1046 RuntimeR3_SOURCES.win.amd64 := \
     1049RuntimeBaseR3_SOURCES.win.amd64 := \
    10471050        $(RuntimeWin64ASM_SOURCES) \
    10481051        common/string/memrchr.asm
    1049 RuntimeR3_SOURCES.win.x86   := \
     1052RuntimeBaseR3_SOURCES.win.x86   := \
    10501053        $(RuntimeWin32ASM_SOURCES) \
    10511054        common/string/memrchr.asm
    10521055
    1053 RuntimeR3_SOURCES.linux = \
     1056RuntimeBaseR3_SOURCES.linux = \
    10541057        common/ioqueue/ioqueue-aiofile-provider.cpp \
    10551058        generic/cdrom-generic.cpp \
    … …  
    11371140        r3/posix/utf8-posix.cpp
    11381141ifdef IPRT_WITH_FUTEX_BASED_SEMS
    1139  RuntimeR3_SOURCES.linux += \
     1142 RuntimeBaseR3_SOURCES.linux += \
    11401143        r3/linux/semevent-linux.cpp \
    11411144        r3/linux/semeventmulti-linux.cpp \
    11421145        r3/linux/semmutex-linux.cpp
    11431146else
    1144  RuntimeR3_SOURCES.linux.x86 += \
     1147 RuntimeBaseR3_SOURCES.linux.x86 += \
    11451148        r3/posix/semevent-posix.cpp \
    11461149        r3/posix/semeventmulti-posix.cpp \
    11471150        r3/posix/semmutex-posix.cpp
    1148  RuntimeR3_SOURCES.linux.amd64 += \
     1151 RuntimeBaseR3_SOURCES.linux.amd64 += \
    11491152        r3/linux/semevent-linux.cpp \
    11501153        r3/linux/semeventmulti-linux.cpp
    11511154 ifdef RT_NEW_LINUX_MUTEX_CODE
    1152   RuntimeR3_SOURCES.linux.amd64 += \
     1155  RuntimeBaseR3_SOURCES.linux.amd64 += \
    11531156        r3/linux/semmutex-linux.cpp
    11541157 else
    1155   RuntimeR3_SOURCES.linux.amd64 += \
     1158  RuntimeBaseR3_SOURCES.linux.amd64 += \
    11561159        r3/posix/semmutex-posix.cpp
    11571160 endif
    11581161endif
    11591162
    1160 RuntimeR3_SOURCES.os2   = \
     1163RuntimeBaseR3_SOURCES.os2   = \
    11611164        common/string/memrchr.asm \
    11621165        generic/cdrom-generic.cpp \
    … …  
    12441247        r3/posix/utf8-posix.cpp
    12451248
    1246 RuntimeR3_SOURCES.darwin = \
     1249RuntimeBaseR3_SOURCES.darwin = \
    12471250        common/ioqueue/ioqueue-aiofile-provider.cpp \
    12481251        darwin/RTErrConvertFromDarwin.cpp \
    … …  
    13331336        r3/posix/tls-posix.cpp \
    13341337        r3/posix/utf8-posix.cpp
    1335 RuntimeR3_SOURCES.darwin.x86   += \
     1338RuntimeBaseR3_SOURCES.darwin.x86   += \
    13361339        common/string/mempcpy.asm \
    13371340        common/string/memrchr.asm
    1338 RuntimeR3_SOURCES.darwin.amd64 += \
     1341RuntimeBaseR3_SOURCES.darwin.amd64 += \
    13391342        common/string/mempcpy.asm \
    13401343        common/string/memrchr.asm
    1341 RuntimeR3_SOURCES.darwin.arm32 += \
     1344RuntimeBaseR3_SOURCES.darwin.arm32 += \
    13421345        common/string/mempcpy.cpp \
    13431346        common/string/memrchr.cpp \
    13441347        r3/darwin/RTMpGetDescription-generic.cpp
    1345 RuntimeR3_SOURCES.darwin.arm64 += \
     1348RuntimeBaseR3_SOURCES.darwin.arm64 += \
    13461349        common/string/mempcpy.cpp \
    13471350        common/string/memrchr.cpp \
    … …  
    13491352
    13501353## @todo Make BSD sched, implement RTMP*.
    1351 RuntimeR3_SOURCES.freebsd = \
     1354RuntimeBaseR3_SOURCES.freebsd = \
    13521355        common/ioqueue/ioqueue-aiofile-provider.cpp \
    13531356        generic/cdrom-generic.cpp \
    … …  
    14381441        r3/posix/utf8-posix.cpp
    14391442
    1440 RuntimeR3_SOURCES.netbsd = \
     1443RuntimeBaseR3_SOURCES.netbsd = \
    14411444        generic/cdrom-generic.cpp \
    14421445        generic/RTDirQueryInfo-generic.cpp \
    … …  
    15221525        r3/posix/utf8-posix.cpp
    15231526
    1524 RuntimeR3_SOURCES.solaris = \
     1527RuntimeBaseR3_SOURCES.solaris = \
    15251528        common/ioqueue/ioqueue-aiofile-provider.cpp \
    15261529        generic/cdrom-generic.cpp \
    … …  
    16051608        r3/solaris/RTSystemShutdown-solaris.cpp \
    16061609        r3/solaris/thread-affinity-solaris.cpp
    1607 RuntimeR3_SOURCES.solaris.amd64 = \
     1610RuntimeBaseR3_SOURCES.solaris.amd64 = \
    16081611        common/string/memrchr.asm \
    16091612        common/string/mempcpy.asm \
    16101613        r3/solaris/coredumper-solaris.cpp \
    16111614        r3/solaris/RTSystemQueryDmiString-solaris.cpp
    1612 RuntimeR3_SOURCES.solaris.x86 = \
     1615RuntimeBaseR3_SOURCES.solaris.x86 = \
    16131616        common/string/memrchr.asm \
    16141617        common/string/mempcpy.asm \
    16151618        r3/solaris/coredumper-solaris.cpp \
    16161619        r3/solaris/RTSystemQueryDmiString-solaris.cpp
    1617 RuntimeR3_SOURCES.solaris.sparc32 = \
     1620RuntimeBaseR3_SOURCES.solaris.sparc32 = \
    16181621        common/string/memrchr.cpp \
    16191622        common/string/mempcpy.cpp \
    16201623        generic/RTSystemQueryDmiString-generic.cpp
    1621 RuntimeR3_SOURCES.solaris.sparc64 = \
     1624RuntimeBaseR3_SOURCES.solaris.sparc64 = \
    16221625        common/string/memrchr.cpp \
    16231626        common/string/mempcpy.cpp \
    16241627        generic/RTSystemQueryDmiString-generic.cpp
    16251628
    1626 RuntimeR3_SOURCES.haiku = \
     1629RuntimeBaseR3_SOURCES.haiku = \
    16271630        generic/RTCrStoreCreateSnapshotById-generic.cpp \
    16281631        generic/RTDirQueryInfo-generic.cpp \
    … …  
    16981701        r3/posix/tls-posix.cpp \
    16991702        r3/posix/utf8-posix.cpp
    1700 RuntimeR3_SOURCES.haiku.x86   += common/string/memrchr.asm
    1701 RuntimeR3_SOURCES.haiku.amd64 += common/string/memrchr.asm
     1703RuntimeBaseR3_SOURCES.haiku.x86   += common/string/memrchr.asm
     1704RuntimeBaseR3_SOURCES.haiku.amd64 += common/string/memrchr.asm
    17021705
    17031706## PORTME: Porters add their selection of platform specific files for Ring-3 here.
    17041707
     1708
     1709#
     1710# RuntimeR3 - Static Runtime for Ring-3 executables.
     1711#
     1712RuntimeR3_TEMPLATE = VBoxR3Static
     1713RuntimeR3_EXTENDS  = RuntimeBaseR3
     1714ifdef VBOX_WITH_NOCRT_STATIC
     1715 if1of ($(KBUILD_TARGET), win)
     1716  RuntimeR3_SOURCES = $(filter-out \
     1717        r3/alloc.cpp \
     1718        r3/alloc-ef.cpp \
     1719        r3/xml.cpp \
     1720        common/zip/xarvfs.cpp \
     1721        common/misc/json.cpp \
     1722        generic/RTLogWriteStdErr-generic.cpp \
     1723        generic/RTLogWriteStdOut-generic.cpp \
     1724        ,$(RuntimeBaseR3_SOURCES))
     1725  RuntimeR3_SOURCES.x86 = $(RuntimeBaseR3_SOURCES.x86) \
     1726        common/misc/setjmp.asm \
     1727        common/string/memcpy.asm \
     1728        common/string/memchr.asm \
     1729        common/string/memcmp.asm \
     1730        common/string/memmove.asm \
     1731        common/string/memset.asm \
     1732        common/string/strlen.asm \
     1733        common/string/strchr.asm \
     1734        common/string/strcmp.asm \
     1735        common/string/strncmp.asm \
     1736        common/string/strcpy.asm \
     1737        common/string/strrchr.cpp \
     1738        common/string/strstr.cpp \
     1739        common/string/strcspn.cpp \
     1740        common/string/strpbrk.cpp
     1741  RuntimeR3_SOURCES.amd64 = $(RuntimeBaseR3_SOURCES.amd64) \
     1742        common/misc/setjmp.asm \
     1743        common/string/memcpy.asm \
     1744        common/string/memchr.asm \
     1745        common/string/memcmp.asm \
     1746        common/string/memmove.asm \
     1747        common/string/memset.asm \
     1748        common/string/strlen.asm \
     1749        common/string/strchr.asm \
     1750        common/string/strcmp.asm \
     1751        common/string/strncmp.asm \
     1752        common/string/strcpy.asm \
     1753        common/string/strrchr.cpp \
     1754        common/string/strstr.cpp \
     1755        common/string/strcspn.cpp \
     1756        common/string/strpbrk.cpp
     1757  RuntimeR3_SOURCES.win = $(filter-out \
     1758        r3/generic/RTLocaleQueryLocaleName-r3-generic.cpp \
     1759        ,$(RuntimeBaseR3_SOURCES.win)) \
     1760        \
     1761        common/compiler/vcc/atexit-vcc.cpp \
     1762        common/compiler/vcc/loadcfg-vcc.c \
     1763        common/compiler/vcc/tlsdir-vcc.c \
     1764        common/compiler/vcc/initializers-c-cpp-vcc.cpp \
     1765        common/compiler/vcc/stacksup-vcc.cpp \
     1766        common/compiler/vcc/fltused-vcc.cpp \
     1767        common/compiler/vcc/purecall-vcc.cpp \
     1768        r3/win/nocrt-startup-exe-win.cpp \
     1769        r3/win/nocrt-startup-dll-win.cpp \
     1770        r3/win/nocrt-startup-common-win.cpp \
     1771        r3/win/nocrt-alloc-win.cpp \
     1772        r3/win/nocrt-RTLogWriteStdErr-win.cpp \
     1773        r3/win/nocrt-RTLogWriteStdOut-win.cpp \
     1774        generic/new-delete-generic.cpp
     1775  RuntimeR3_SOURCES.win.amd64 = $(RuntimeBaseR3_SOURCES.win.amd64) \
     1776        r3/win/nocrt-atexit-win.asm \
     1777        r3/win/nocrt-mainCRTStartup-win.asm \
     1778        r3/win/nocrt-WinMainCRTStartup-win.asm \
     1779        common/compiler/vcc/guard-vcc.asm \
     1780        common/compiler/vcc/stack-vcc.asm
     1781  RuntimeR3_SOURCES.win.x86 = $(RuntimeBaseR3_SOURCES.win.x86) \
     1782        r3/win/nocrt-atexit-win.asm \
     1783        r3/win/nocrt-mainCRTStartup-win.asm \
     1784        r3/win/nocrt-WinMainCRTStartup-win.asm \
     1785        common/compiler/vcc/guard-vcc.asm \
     1786        common/compiler/vcc/stack-vcc.asm
     1787 endif
     1788endif
    17051789
    17061790#
    … …  
    17381822RuntimeR3-x86_EXTENDS         := RuntimeR3
    17391823RuntimeR3-x86_BLD_TRG_ARCH    := x86
    1740 RuntimeR3-x86_DEFS            := $(filter-out IN_SUP_R3 IN_SUP, $(RuntimeR3_DEFS)) IPRT_WITHOUT_LDR_VERIFY RT_NO_GIP
     1824RuntimeR3-x86_DEFS             = $(filter-out IN_SUP_R3 IN_SUP, $(RuntimeR3_DEFS)) IPRT_WITHOUT_LDR_VERIFY RT_NO_GIP
    17411825
    17421826
    … …  
    17481832#
    17491833RuntimeBldProg_TEMPLATE        := VBoxAdvBldProg
    1750 RuntimeBldProg_EXTENDS         := RuntimeR3
     1834RuntimeBldProg_EXTENDS         := RuntimeBaseR3
    17511835RuntimeBldProg_BLD_TRG         := $(KBUILD_HOST)
    17521836RuntimeBldProg_BLD_TRG_ARCH    := $(KBUILD_HOST_ARCH)
    17531837RuntimeBldProg_BLD_TRG_CPU     := $(KBUILD_HOST_CPU)
    1754 RuntimeBldProg_DEFS            := $(filter-out IN_SUP_R3 IN_SUP, $(RuntimeR3_DEFS)) IPRT_WITHOUT_LDR_VERIFY RT_NO_GIP
    1755 RuntimeBldProg_SOURCES         = \
     1838RuntimeBldProg_DEFS            := $(filter-out IN_SUP_R3 IN_SUP, $(RuntimeBaseR3_DEFS)) IPRT_WITHOUT_LDR_VERIFY RT_NO_GIP
     1839RuntimeBldProg_SOURCES          = \
    17561840        common/alloc/alloc.cpp \
    17571841        common/alloc/memcache.cpp \
    … …  
    20642148        r3/generic/RTLocaleQueryNormalizedBaseLocaleName-r3-generic.cpp \
    20652149        r3/generic/RTLocaleQueryUserCountryCode-r3-generic.cpp \
    2066        , $(RuntimeR3_SOURCES.darwin))
     2150       , $(RuntimeBaseR3_SOURCES.darwin))
    20672151
    20682152RuntimeBldProg_SOURCES.win = \
    … …  
    22132297#
    22142298RuntimeGuestR3_TEMPLATE                 := VBoxGuestR3Lib
    2215 ## @todo change this to EXTEND the RuntimeR3 target.
    2216 RuntimeGuestR3_SDKS.win                 := $(RuntimeR3_SDKS.win)
    2217 RuntimeGuestR3_DEFS                     := $(filter-out RTCRITSECT_STRICT RT_NO_GIP, $(RuntimeR3_DEFS))
    2218 RuntimeGuestR3_DEFS                     := $(filter-out IN_SUP_R3, $(RuntimeGuestR3_DEFS))
    2219 RuntimeGuestR3_DEFS.$(KBUILD_TARGET)    := $(RuntimeR3_DEFS.$(KBUILD_TARGET))
    2220 RuntimeGuestR3_DEFS.$(KBUILD_HOST)      := $(RuntimeR3_DEFS.$(KBUILD_HOST))
    2221 RuntimeGuestR3_INCS                     := $(RuntimeR3_INCS)
    2222 RuntimeGuestR3_INCS.$(KBUILD_TARGET)    := $(RuntimeR3_INCS.$(KBUILD_TARGET))
    2223 RuntimeGuestR3_INCS.$(KBUILD_HOST)      := $(RuntimeR3_INCS.$(KBUILD_HOST))
    2224 RuntimeGuestR3_SOURCES                  := $(filter-out \
     2299RuntimeGuestR3_EXTENDS                  := RuntimeR3
     2300RuntimeGuestR3_DEFS                      = $(filter-out RTCRITSECT_STRICT RT_NO_GIP IN_SUP_R3, $(RuntimeR3_DEFS))
     2301RuntimeGuestR3_SOURCES                   = $(filter-out \
    22252302        common/time/timesupref.cpp \
    22262303        common/time/timesupA.asm \
    22272304        common/time/timesup.cpp \
    2228         common/zip/xarvfs.cpp \
    22292305        generic/RTLogWriteUser-generic.cpp \
    2230         r3/xml.cpp \
    2231         , $(RuntimeR3_SOURCES))
    2232 RuntimeGuestR3_SOURCES              += \
     2306        , $(RuntimeR3_SOURCES)) \
     2307        \
    22332308        common/time/timesysalias.cpp \
    22342309        VBox/logbackdoor.cpp
    2235 RuntimeGuestR3_SOURCES.$(KBUILD_TARGET)      := $(RuntimeR3_SOURCES.$(KBUILD_TARGET))
    2236 RuntimeGuestR3_SOURCES.$(KBUILD_HOST)        := $(RuntimeR3_SOURCES.$(KBUILD_HOST))
    2237 RuntimeGuestR3_SOURCES.$(KBUILD_TARGET_ARCH) := $(RuntimeR3_SOURCES.$(KBUILD_TARGET_ARCH))
    2238 RuntimeGuestR3_SOURCES.x86                   := $(RuntimeR3_SOURCES.x86)
    2239 RuntimeGuestR3_SOURCES.amd64                 := $(RuntimeR3_SOURCES.amd64)
    2240 RuntimeGuestR3_SOURCES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) := $(RuntimeR3_SOURCES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))
    2241 RuntimeGuestR3_SOURCES.$(KBUILD_TARGET).x86  := $(RuntimeR3_SOURCES.$(KBUILD_TARGET).x86)
    2242 RuntimeGuestR3_SOURCES.$(KBUILD_TARGET).amd64:= $(RuntimeR3_SOURCES.$(KBUILD_TARGET).amd64)
    2243 RuntimeGuestR3_SOURCES.$(KBUILD_HOST).$(KBUILD_TARGET_ARCH)   := $(RuntimeR3_SOURCES.$(KBUILD_HOST).$(KBUILD_TARGET_ARCH))
    2244 RuntimeGuestR3_DEFS.win.x86                  += VCC_FAKES_TARGET_$(VBOX_VCC_TOOL_STEM) VCC_FAKES_TARGET=$(substr $(VBOX_VCC_TOOL_STEM),-3)
    2245 RuntimeGuestR3_SOURCES.win.x86               += \
     2310RuntimeGuestR3_DEFS.win.x86              = $(RuntimeR3_DEFS.win.x86) \
     2311        VCC_FAKES_TARGET_$(VBOX_VCC_TOOL_STEM) VCC_FAKES_TARGET=$(substr $(VBOX_VCC_TOOL_STEM),-3)
     2312RuntimeGuestR3_SOURCES.win.x86           = $(RuntimeR3_SOURCES.win.x86) \
    22462313        r3/win/vcc-fakes-kernel32.cpp \
    22472314        r3/win/vcc-fakes-kernel32-A.asm \
    … …  
    22532320        r3/win/vcc-fakes-shell32-A.asm \
    22542321
    2255 ifdef VBOX_WITH_NOCRT_STATIC
    2256  RuntimeGuestR3_SOURCES := $(filter-out \
    2257         r3/alloc.cpp \
    2258         r3/alloc-ef.cpp \
    2259         common/misc/json.cpp \
    2260         generic/RTLogWriteStdErr-generic.cpp \
    2261         generic/RTLogWriteStdOut-generic.cpp \
    2262         ,$(RuntimeGuestR3_SOURCES)) \
    2263         common/string/strrchr.cpp \
    2264         common/string/strstr.cpp \
    2265         common/string/strcspn.cpp \
    2266         common/string/strpbrk.cpp
    2267  RuntimeGuestR3_SOURCES.win := $(filter-out \
    2268         r3/generic/RTLocaleQueryLocaleName-r3-generic.cpp \
    2269         ,$(RuntimeGuestR3_SOURCES.win)) \
    2270         r3/win/nocrt-RTLogWriteStdErr-win.cpp \
    2271         r3/win/nocrt-RTLogWriteStdOut-win.cpp
    2272  RuntimeGuestR3_SOURCES.x86 += \
    2273         r3/win/nocrt-atexit-win.asm \
    2274         r3/win/nocrt-mainCRTStartup-win.asm \
    2275         r3/win/nocrt-WinMainCRTStartup-win.asm \
    2276         common/compiler/vcc/guard-vcc.asm \
    2277         common/compiler/vcc/stack-vcc.asm \
    2278         common/string/memcpy.asm \
    2279         common/string/memchr.asm \
    2280         common/string/memcmp.asm \
    2281         common/string/memmove.asm \
    2282         common/string/memset.asm \
    2283         common/string/strlen.asm \
    2284         common/string/strchr.asm \
    2285         common/string/strcmp.asm \
    2286         common/string/strncmp.asm \
    2287         common/string/strcpy.asm
    2288  RuntimeGuestR3_SOURCES.amd64 += \
    2289         r3/win/nocrt-atexit-win.asm \
    2290         r3/win/nocrt-mainCRTStartup-win.asm \
    2291         r3/win/nocrt-WinMainCRTStartup-win.asm \
    2292         common/compiler/vcc/guard-vcc.asm \
    2293         common/compiler/vcc/stack-vcc.asm \
    2294         common/string/memcpy.asm \
    2295         common/string/memchr.asm \
    2296         common/string/memcmp.asm \
    2297         common/string/memmove.asm \
    2298         common/string/memset.asm \
    2299         common/string/strlen.asm \
    2300         common/string/strchr.asm \
    2301         common/string/strcmp.asm \
    2302         common/string/strncmp.asm \
    2303         common/string/strcpy.asm
    2304  RuntimeGuestR3_SOURCES.win += \
    2305         common/compiler/vcc/atexit-vcc.cpp \
    2306         common/compiler/vcc/loadcfg-vcc.c \
    2307         common/compiler/vcc/tlsdir-vcc.c \
    2308         common/compiler/vcc/initializers-c-cpp-vcc.cpp \
    2309         common/compiler/vcc/stacksup-vcc.cpp \
    2310         common/compiler/vcc/fltused-vcc.cpp \
    2311         common/compiler/vcc/purecall-vcc.cpp \
    2312         r3/win/nocrt-startup-exe-win.cpp \
    2313         r3/win/nocrt-startup-dll-win.cpp \
    2314         r3/win/nocrt-startup-common-win.cpp \
    2315         r3/win/nocrt-alloc-win.cpp \
    2316        generic/new-delete-generic.cpp
    2317 endif
    2318 
    23192322
    23202323#
    … …  
    23552358VBoxRT_INST                    = $(INST_DLL) $(INST_TESTCASE)
    23562359endif
    2357 VBoxRT_DEFS                   := $(filter-out RT_NO_GIP, $(RuntimeR3_DEFS)) \
     2360VBoxRT_DEFS                   := $(filter-out RT_NO_GIP, $(RuntimeBaseR3_DEFS)) \
    23582361        IPRT_WITH_OPENSSL \
    23592362        IPRT_WITH_XAR \
    … …  
    23762379 endif
    23772380endif
    2378 VBoxRT_DEFS.$(KBUILD_TYPE)    := $(RuntimeR3_DEFS.$(KBUILD_TYPE))
    2379 VBoxRT_DEFS.$(KBUILD_TARGET)  := $(RuntimeR3_DEFS.$(KBUILD_TARGET))
     2381VBoxRT_DEFS.$(KBUILD_TYPE)    := $(RuntimeBaseR3_DEFS.$(KBUILD_TYPE))
     2382VBoxRT_DEFS.$(KBUILD_TARGET)  := $(RuntimeBaseR3_DEFS.$(KBUILD_TARGET))
    23802383VBoxRT_SOURCES                := \
    23812384        VBox/VBoxRTDeps.cpp \
    23822385        $(filter-out common/checksum/crc32.cpp, \
    2383                 $(if-expr defined(VBOX_WITH_ALT_HASH_CODE), $(RuntimeR3_SOURCES), \
    2384                 $(patsubst common/checksum/alt-%,common/checksum/openssl-%,$(RuntimeR3_SOURCES)) ) ) \
     2386                $(if-expr defined(VBOX_WITH_ALT_HASH_CODE), $(RuntimeBaseR3_SOURCES), \
     2387                $(patsubst common/checksum/alt-%,common/checksum/openssl-%,$(RuntimeBaseR3_SOURCES)) ) ) \
    23852388        common/checksum/crc32-zlib.cpp \
    23862389        common/dbg/dbgmodghidra.cpp \
    … …  
    24172420        iprt.d
    24182421endif
    2419 VBoxRT_SOURCES.$(KBUILD_TARGET) = $(RuntimeR3_SOURCES.$(KBUILD_TARGET))
    2420 VBoxRT_SOURCES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) := $(RuntimeR3_SOURCES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))
    2421 VBoxRT_SOURCES.$(KBUILD_TARGET).x86   := $(RuntimeR3_SOURCES.$(KBUILD_TARGET).x86)
    2422 VBoxRT_SOURCES.$(KBUILD_TARGET).amd64 := $(RuntimeR3_SOURCES.$(KBUILD_TARGET).amd64)
    2423 VBoxRT_SOURCES.$(KBUILD_TARGET_ARCH) := $(RuntimeR3_SOURCES.$(KBUILD_TARGET_ARCH))
    2424 VBoxRT_SOURCES.x86            := $(RuntimeR3_SOURCES.x86)
    2425 VBoxRT_SOURCES.amd64          := $(RuntimeR3_SOURCES.amd64)
     2422VBoxRT_SOURCES.$(KBUILD_TARGET) = $(RuntimeBaseR3_SOURCES.$(KBUILD_TARGET))
     2423VBoxRT_SOURCES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) := $(RuntimeBaseR3_SOURCES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))
     2424VBoxRT_SOURCES.$(KBUILD_TARGET).x86   := $(RuntimeBaseR3_SOURCES.$(KBUILD_TARGET).x86)
     2425VBoxRT_SOURCES.$(KBUILD_TARGET).amd64 := $(RuntimeBaseR3_SOURCES.$(KBUILD_TARGET).amd64)
     2426VBoxRT_SOURCES.$(KBUILD_TARGET_ARCH) := $(RuntimeBaseR3_SOURCES.$(KBUILD_TARGET_ARCH))
     2427VBoxRT_SOURCES.x86            := $(RuntimeBaseR3_SOURCES.x86)
     2428VBoxRT_SOURCES.amd64          := $(RuntimeBaseR3_SOURCES.amd64)
    24262429VBoxRT_SOURCES.win            += \
    24272430        r3/win/dllmain-win.cpp \
    … …  
    24292432VBoxRT_CLEAN.win              += \
    24302433        $(VBoxRT_0_OUTDIR)/VBoxRT.def
    2431 VBoxRT_INCS                   := $(RuntimeR3_INCS)
    2432 VBoxRT_INCS.$(KBUILD_TARGET)  := $(RuntimeR3_INCS.$(KBUILD_TARGET))
    2433 VBoxRT_INCS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) := $(RuntimeR3_INCS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))
     2434VBoxRT_INCS                   := $(RuntimeBaseR3_INCS)
     2435VBoxRT_INCS.$(KBUILD_TARGET)  := $(RuntimeBaseR3_INCS.$(KBUILD_TARGET))
     2436VBoxRT_INCS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) := $(RuntimeBaseR3_INCS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))
    24342437VBoxRT_LIBS                    = \
    24352438        $(SDK_VBOX_LZF_LIBS) \
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