VirtualBox

Changeset 44025 in vbox


Ignore:
Timestamp:
Dec 4, 2012 1:33:34 AM (12 years ago)
Author:
vboxsync
Message:

Put IN_RT_STATIC in the VBOXR3STATIC template so everyone have the right expectations regaring import/export declarations. Some := required in Runtime/Makefile.kmk to prevent define 'leaks' between targets during kBuild/footer.kmk.

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Config.kmk

    r43873 r44025  
    36713671TEMPLATE_VBOXR3STATIC                  = VBox Static Ring 3 EXE
    36723672TEMPLATE_VBOXR3STATIC_EXTENDS          = VBOXR3EXE
     3673TEMPLATE_VBOXR3STATIC_DEFS             = IN_RT_STATIC $(TEMPLATE_VBOXR3EXE_DEFS)
    36733674ifeq ($(KBUILD_TARGET),win)
    36743675 TEMPLATE_VBOXR3STATIC_CFLAGS          = $(filter-out -MD$(VBOX_VCC_CRT_TYPE), $(TEMPLATE_VBOXR3EXE_CFLAGS)) -MT$(VBOX_VCC_CRT_TYPE)

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

    r44024 r44025  
    11# $Id$
    22## @file
    3 # Sub-Makefile for the IPRT (IPRT).
     3# Sub-Makefile for the IPRT.
    44#
    55
    … …  
    215215RuntimeR3_SDKS          = VBOX_LIBXML2 VBOX_OPENSSL VBOX_BOOST ## @todo why is BOOST and XML2 here? r3/xml.cpp is not in this lib...
    216216RuntimeR3_SDKS.win      = $(VBOX_WINPSDK) $(VBOX_WINDDK)
    217 RuntimeR3_DEFS          = IN_RT_R3 IN_SUP_R3 IN_RT_STATIC LDR_WITH_NATIVE LDR_WITH_ELF32 LDR_WITH_PE RT_WITH_VBOX RT_NO_GIP
     217RuntimeR3_DEFS          = IN_RT_R3 IN_SUP_R3 LDR_WITH_NATIVE LDR_WITH_ELF32 LDR_WITH_PE RT_WITH_VBOX RT_NO_GIP
    218218#RuntimeR3_DEFS         += RTMEM_WRAP_TO_EF_APIS
    219219ifdef IPRT_WITH_KSTUFF
    … …  
    588588        win/RTErrConvertFromWin32.cpp
    589589
    590 RuntimeR3_SOURCES.win.amd64 = $(RuntimeWin64ASM_SOURCES)
    591 RuntimeR3_SOURCES.win.x86   = $(RuntimeWin32ASM_SOURCES)
     590RuntimeR3_SOURCES.win.amd64 := $(RuntimeWin64ASM_SOURCES)
     591RuntimeR3_SOURCES.win.x86   := $(RuntimeWin32ASM_SOURCES)
    592592
    593593RuntimeR3_SOURCES.linux = \
    … …  
    10991099## @todo change this to EXTEND the RuntimeR3 target.
    11001100RuntimeGuestR3_SDKS.win                 := $(RuntimeR3_SDKS.win)
    1101 RuntimeGuestR3_DEFS                     := $(filter-out IN_RT_STATIC RTCRITSECT_STRICT RT_NO_GIP, $(RuntimeR3_DEFS))
     1101RuntimeGuestR3_DEFS                     := $(filter-out RTCRITSECT_STRICT RT_NO_GIP, $(RuntimeR3_DEFS))
    11021102RuntimeGuestR3_DEFS.$(KBUILD_TARGET)    := $(RuntimeR3_DEFS.$(KBUILD_TARGET))
    1103 RuntimeGuestR3_DEFS.$(KBUILD_HOST)      := $(RuntimeR3_DEFS.$(KBUILD_HOST))
     1103RuntimeGuestR3_DEFS.$(KBUILD_HOST)      := $(RuntimeR3_DEFS.$(KBUILD_HOST))
    11041104RuntimeGuestR3_INCS                     := $(RuntimeR3_INCS)
    11051105RuntimeGuestR3_INCS.$(KBUILD_TARGET)    := $(RuntimeR3_INCS.$(KBUILD_TARGET))
    … …  
    11611161RuntimeGuestR3Mini_SDKS.win                 := $(RuntimeR3_SDKS.win)
    11621162RuntimeGuestR3Mini_DEFS                     := \
    1163         $(filter-out IN_RT_STATIC RTCRITSECT_STRICT RT_NO_GIP RT_WITH_ICONV_CACHE, $(RuntimeR3_DEFS)) \
     1163        $(filter-out RTCRITSECT_STRICT RT_NO_GIP RT_WITH_ICONV_CACHE, $(RuntimeR3_DEFS)) \
    11641164        RT_MINI IN_RT_STATIC RTMEM_NO_WRAP_TO_EF_APIS
    11651165RuntimeGuestR3Mini_DEFS.$(KBUILD_TARGET)    := $(RuntimeR3_DEFS.$(KBUILD_TARGET))
    … …  
    12901290# (Only used when building L4.)
    12911291#
    1292 RuntimeLnxHostR3_TEMPLATE      = VBOXLNXHOSTR3LIB
    1293 RuntimeLnxHostR3_DEFS          = IN_RT_R3 IN_SUP_R3 RT_WITH_VBOX RT_NO_GIP
    1294 RuntimeLnxHostR3_SOURCES       = \
     1292RuntimeLnxHostR3_TEMPLATE     := VBOXLNXHOSTR3LIB
     1293RuntimeLnxHostR3_DEFS         := IN_RT_R3 IN_SUP_R3 RT_WITH_VBOX RT_NO_GIP
     1294RuntimeLnxHostR3_SOURCES      := \
    12951295        $(RuntimeR3_SOURCES.linux.$(KBUILD_TARGET_ARCH)) \
    12961296        $(RuntimeR3_SOURCES.linux) \
    12971297        $(RuntimeR3_SOURCES)
    1298 RuntimeLnxHostR3_INCS          = \
     1298RuntimeLnxHostR3_INCS         := \
    12991299        $(RuntimeR3_INCS.linux.$(KBUILD_TARGET_ARCH)) \
    13001300        $(RuntimeR3_INCS.linux) \
    … …  
    13151315VBoxRT_INST                    = $(INST_DLL) $(INST_TESTCASE)
    13161316endif
    1317 VBoxRT_DEFS                    = $(filter-out RT_NO_GIP IN_RT_STATIC,$(RuntimeR3_DEFS)) IN_SUP_R3 IN_SUP_R3
     1317VBoxRT_DEFS                   := $(filter-out RT_NO_GIP,$(RuntimeR3_DEFS)) IN_SUP_R3 IN_SUP_R3
    13181318ifn1of ($(KBUILD_TARGET_ARCH), amd64 x86)
    13191319 VBoxRT_DEFS                  += RT_NO_GIP
    13201320endif
    1321 VBoxRT_DEFS.$(KBUILD_TYPE)     = $(RuntimeR3_DEFS.$(KBUILD_TYPE))
    1322 VBoxRT_SOURCES                 = \
     1321VBoxRT_DEFS.$(KBUILD_TYPE)    := $(RuntimeR3_DEFS.$(KBUILD_TYPE))
     1322VBoxRT_SOURCES                := \
    13231323        VBox/VBoxRTDeps.cpp \
    13241324        r3/xml.cpp \
    … …  
    13301330endif
    13311331VBoxRT_SOURCES.$(KBUILD_TARGET) = $(RuntimeR3_SOURCES.$(KBUILD_TARGET))
    1332 VBoxRT_SOURCES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) = $(RuntimeR3_SOURCES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))
    1333 VBoxRT_SOURCES.$(KBUILD_TARGET_ARCH) = $(RuntimeR3_SOURCES.$(KBUILD_TARGET_ARCH))
     1332VBoxRT_SOURCES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) := $(RuntimeR3_SOURCES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))
     1333VBoxRT_SOURCES.$(KBUILD_TARGET_ARCH) := $(RuntimeR3_SOURCES.$(KBUILD_TARGET_ARCH))
    13341334VBoxRT_SOURCES.win            += \
    13351335        r3/win/dllmain-win.cpp \
    … …  
    13441344VBoxRT_SOURCES.freebsd        += \
    13451345        r3/freebsd/fileaio-freebsd.cpp
    1346 VBoxRT_INCS                    = $(RuntimeR3_INCS)
    1347 VBoxRT_INCS.$(KBUILD_TARGET)   = $(RuntimeR3_INCS.$(KBUILD_TARGET))
    1348 VBoxRT_INCS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) = $(RuntimeR3_INCS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))
     1346VBoxRT_INCS                   := $(RuntimeR3_INCS)
     1347VBoxRT_INCS.$(KBUILD_TARGET)  := $(RuntimeR3_INCS.$(KBUILD_TARGET))
     1348VBoxRT_INCS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) := $(RuntimeR3_INCS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))
    13491349VBoxRT_LIBS                    = \
    13501350        $(PATH_STAGE_LIB)/VBox-liblzf$(VBOX_SUFF_LIB)
    … …  
    14631463 RuntimeR3NoCRTGCC_DEFS  += RT_NO_GIP
    14641464endif
    1465 RuntimeR3NoCRTGCC_INCS  = include
    1466 RuntimeR3NoCRTGCC_SOURCES  = \
     1465RuntimeR3NoCRTGCC_INCS     = include
     1466RuntimeR3NoCRTGCC_SOURCES := \
    14671467        common/misc/sanity-cpp.cpp \
    14681468        common/misc/sanity-c.c \
    … …  
    15411541endif
    15421542RuntimeR0_INCS          = include
    1543 RuntimeR0_SOURCES       = \
     1543RuntimeR0_SOURCES      := \
    15441544        common/log/logellipsis.cpp \
    15451545        common/log/logrelellipsis.cpp \
    … …  
    16221622#endif
    16231623
    1624 RuntimeR0_SOURCES.win.amd64 = $(RuntimeWin64ASM_SOURCES)
    1625 RuntimeR0_SOURCES.win.x86   = $(RuntimeWin32ASM_SOURCES)
     1624RuntimeR0_SOURCES.win.amd64 := $(RuntimeWin64ASM_SOURCES)
     1625RuntimeR0_SOURCES.win.x86   := $(RuntimeWin32ASM_SOURCES)
    16261626RuntimeR0_SOURCES.win = \
    16271627        nt/NtProcessStartup-stub.cpp
    … …  
    18181818        r0drv/nt/RTTimerGetSystemGranularity-r0drv-nt.cpp
    18191819
    1820 RuntimeR0Drv_SOURCES.win.amd64 = $(RuntimeWin64ASM_SOURCES)
    1821 RuntimeR0Drv_SOURCES.win.x86   = $(RuntimeWin32ASM_SOURCES)
     1820RuntimeR0Drv_SOURCES.win.amd64 := $(RuntimeWin64ASM_SOURCES)
     1821RuntimeR0Drv_SOURCES.win.x86   := $(RuntimeWin32ASM_SOURCES)
    18221822
    18231823RuntimeR0Drv_SOURCES.darwin = \
    … …  
    20462046 RuntimeRC_DEFS          = IN_RT_RC RT_WITH_VBOX
    20472047 RuntimeRC_INCS          = include
    2048  RuntimeRC_SOURCES       = \
     2048 RuntimeRC_SOURCES      := \
    20492049        common/checksum/crc32.cpp \
    20502050        common/checksum/crc64.cpp \
    … …  
    21482148# Static library for new & delete for the electric fence.
    21492149#
    2150 RuntimeEFCPP_TEMPLATE   = $(VBoxRT_TEMPLATE)
    2151 RuntimeEFCPP_SDKS       = $(RuntimeR3_SDKS)
    2152 RuntimeEFCPP_SDKS.$(KBUILD_TARGET) = $(RuntimeR3_SDKS.$(KBUILD_TARGET))
    2153 RuntimeEFCPP_DEFS       = $(RuntimeR3_DEFS)
    2154 RuntimeEFCPP_DEFS.$(KBUILD_TARGET) = $(RuntimeR3_DEFS.$(KBUILD_TARGET))
    2155 RuntimeEFCPP_INCS       = $(RuntimeR3_INCS)
    2156 RuntimeEFCPP_INCS.$(KBUILD_TARGET) = $(RuntimeR3_INCS.$(KBUILD_TARGET))
    2157 RuntimeEFCPP_SOURCES    = r3/alloc-ef-cpp.cpp
     2150RuntimeEFCPP_TEMPLATE  := $(VBoxRT_TEMPLATE)
     2151RuntimeEFCPP_SDKS      := $(RuntimeR3_SDKS)
     2152RuntimeEFCPP_SDKS.$(KBUILD_TARGET) := $(RuntimeR3_SDKS.$(KBUILD_TARGET))
     2153RuntimeEFCPP_DEFS      := $(RuntimeR3_DEFS)
     2154RuntimeEFCPP_DEFS.$(KBUILD_TARGET) := $(RuntimeR3_DEFS.$(KBUILD_TARGET))
     2155RuntimeEFCPP_INCS      := $(RuntimeR3_INCS)
     2156RuntimeEFCPP_INCS.$(KBUILD_TARGET) := $(RuntimeR3_INCS.$(KBUILD_TARGET))
     2157RuntimeEFCPP_SOURCES   := r3/alloc-ef-cpp.cpp
    21582158
    21592159

  • trunk/src/VBox/Runtime/r3/posix/thread-posix.cpp

    r44020 r44025  
    4848# include <mach/mach_host.h>
    4949#endif
    50 #ifdef IN_RT_STATIC
    51 /* The pthread_setname_np trickery below assumes a working dl env which is
    52  * not guaranteed in the context of a fully static executable. */
    53 # undef IPRT_MAY_HAVE_PTHREAD_SET_NAME_NP
    54 #else
    55 # if defined(RT_OS_DARWIN) /*|| defined(RT_OS_FREEBSD) - later */ || defined(RT_OS_LINUX) \
     50#if defined(RT_OS_DARWIN) /*|| defined(RT_OS_FREEBSD) - later */ \
     51 || (defined(RT_OS_LINUX) && !defined(IN_RT_STATIC) /* static + dlsym = trouble */) \
    5652 || defined(IPRT_MAY_HAVE_PTHREAD_SET_NAME_NP)
    57 #  define IPRT_MAY_HAVE_PTHREAD_SET_NAME_NP
    58 #  include <dlfcn.h>
    59 # endif
     53# define IPRT_MAY_HAVE_PTHREAD_SET_NAME_NP
     54# include <dlfcn.h>
    6055#endif
    6156#if defined(RT_OS_HAIKU)
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