VirtualBox

Changeset 6677 in vbox


Ignore:
Timestamp:
Jan 31, 2008 7:27:56 PM (17 years ago)
Author:
vboxsync
Message:

forward port from 1.5: build vditool for Linux if BUILD_TYPE=l4

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Config.kmk

    r6669 r6677  
    26312631TEMPLATE_VBOXLNX32GUESTR3LIB_INST              = $(INST_ADDITION_LIB)
    26322632
     2633#
     2634# Template for building Linux host tools (only for BUILD_TARGET=l4)
     2635#
     2636TEMPLATE_VBOXLNXHOSTR3EXE                   = Template for building linux host programs.
     2637TEMPLATE_VBOXLNXHOSTR3EXE_INST              = $(INST_BIN)
     2638TEMPLATE_VBOXLNXHOSTR3EXE_BLD_TRG           = linux
     2639TEMPLATE_VBOXLNXHOSTR3EXE_TOOL              = $(VBOX_GCC_TOOL)
     2640TEMPLATE_VBOXLNXHOSTR3EXE_ASTOOL            = YASM
     2641TEMPLATE_VBOXLNXHOSTR3EXE_DLLSUFF           = .so
     2642TEMPLATE_VBOXLNXHOSTR3EXE_ASFLAGS           = $(VBOX_ASFLAGS)
     2643TEMPLATE_VBOXLNXHOSTR3EXE_DEFS              = IN_RING3 $(ARCH_BITS_DEFS)
     2644TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS          = -g -Wall -pedantic -Wno-long-long -Wno-trigraphs -pipe $(VBOX_GCC_fno-stack-protector)
     2645TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS.debug    = -fno-inline
     2646TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS.release  = -O2 -fno-omit-frame-pointer -fno-strict-aliasing
     2647TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS.profile  = $(TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS.release)
     2648TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS.kprofile = $(TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS.release)
     2649TEMPLATE_VBOXLNXHOSTR3EXE_CFLAGS.release    = $(TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS.release)
     2650TEMPLATE_VBOXLNXHOSTR3EXE_CFLAGS.debug      = $(TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS.debug)
     2651TEMPLATE_VBOXLNXHOSTR3EXE_CFLAGS.profile    = $(TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS.profile)
     2652TEMPLATE_VBOXLNXHOSTR3EXE_CFLAGS.kprofile   = $(TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS.kprofile)
     2653TEMPLATE_VBOXLNXHOSTR3EXE_CFLAGS            = -g -Wall -pedantic -Wno-long-long -Wno-trigraphs -pipe -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations $(VBOX_GCC_fno-stack-protector)
     2654TEMPLATE_VBOXLNXHOSTR3EXE_LIBS              = pthread m rt dl
     2655
     2656TEMPLATE_VBOXLNXHOSTR3LIB                   = Template for linux host libraries.
     2657TEMPLATE_VBOXLNXHOSTR3LIB_EXTENDS           = VBOXLNXHOSTR3EXE
     2658TEMPLATE_VBOXLNXHOSTR3LIB_INST              = $(INST_LIB)
     2659
    26332660
    26342661#

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

    r6597 r6677  
    9696VBoxDDU_LDFLAGS.l4       = -Wl,--no-undefined
    9797
     98#
     99# VBoxDDULnxHostR3 (Only needed for l4, currently for executing vditool on L4Linux.)
     100#
     101ifeq ($(BUILD_TARGET),l4)
     102 LIBRARIES                += VBoxDDULnxHostR3
     103 VBoxDDULnxHostR3_TEMPLATE = VBOXLNXHOSTR3LIB
     104 VBoxDDULnxHostR3_DEFS     = IN_VBOXDDU
     105 VBoxDDULnxHostR3_SOURCES  = $(VBoxDDU_SOURCES)
     106endif
    98107
    99108#

  • trunk/src/VBox/Devices/Storage/testcase/Makefile.kmk

    r6468 r6677  
    2424#
    2525PROGRAMS += vditool
    26 vditool_TEMPLATE = VBOXR3EXE
     26ifeq ($(BUILD_TARGET),l4)
     27 vditool_TEMPLATE = VBOXLNXHOSTR3EXE
     28 vditool_LIBS     = \
     29        $(PATH_LIB)/VBoxDDULnxHostR3.a \
     30        $(PATH_LIB)/RuntimeLnxHostR3.a
     31else
     32 vditool_TEMPLATE = VBOXR3EXE
     33 vditool_LIBS     = $(LIB_DDU) $(LIB_RUNTIME)
     34endif
    2735vditool_SOURCES  = vditool.cpp
    28 vditool_LIBS     = $(LIB_DDU) $(LIB_RUNTIME)
    2936
    3037

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

    r6657 r6677  
    7676  endif
    7777 endif # VBOX_WITH_ADDITIONS
    78  LIBRARIES.l4 = RuntimeR3L4
     78 LIBRARIES.l4 = RuntimeR3L4 RuntimeLnxHostR3
    7979 DLLS = VBoxRT
    8080 OTHER_CLEAN = \
    … …  
    589589RuntimeLnx32GuestR3_INCS       = $(RuntimeR3_INCS.linux)    $(RuntimeR3_INCS)
    590590
     591#
     592# RuntimeLnxHostR3 Linux host program runtime
     593#
     594RuntimeLnxHostR3_TEMPLATE      = VBOXLNXHOSTR3LIB
     595RuntimeLnxHostR3_DEFS          = IN_RT_R3 IN_SUP_R3 RT_WITH_VBOX RT_NO_GIP
     596RuntimeLnxHostR3_SOURCES       = $(RuntimeR3_SOURCES.linux) $(RuntimeR3_SOURCES)
     597RuntimeLnxHostR3_INCS          = $(RuntimeR3_INCS.linux)    $(RuntimeR3_INCS)
     598
    591599
    592600#

  • trunk/src/VBox/Runtime/common/time/timesup.cpp

    r5999 r6677  
    4545*   Internal Functions                                                         *
    4646*******************************************************************************/
    47 #ifndef IN_GUEST
     47#if !defined(IN_GUEST) && !defined(RT_NO_GIP)
    4848static DECLCALLBACK(void)     rtTimeNanoTSInternalBitch(PRTTIMENANOTSDATA pData, uint64_t u64NanoTS, uint64_t u64DeltaPrev, uint64_t u64PrevNanoTS);
    4949static DECLCALLBACK(uint64_t) rtTimeNanoTSInternalFallback(PRTTIMENANOTSDATA pData);
    … …  
    5555*   Global Variables                                                           *
    5656*******************************************************************************/
    57 #ifndef IN_GUEST
     57#if !defined(IN_GUEST) && !defined(RT_NO_GIP)
    5858/** The previous timestamp value returned by RTTimeNanoTS. */
    5959static uint64_t         g_TimeNanoTSPrev = 0;
    … …  
    162162}
    163163
    164 #endif /* !IN_GUEST */
     164#endif /* !IN_GUEST && !RT_NO_GIP */
    165165
    166166
    … …  
    170170DECLINLINE(uint64_t) rtTimeNanoTSInternal(void)
    171171{
    172 #ifndef IN_GUEST
     172#if !defined(IN_GUEST) && !defined(RT_NO_GIP)
    173173    return g_apfnWorkers[g_iWorker](&g_TimeNanoTSData);
    174174#else
    … …  
    200200
    201201
    202 #ifndef IN_GUEST
     202#if !defined(IN_GUEST) && !defined(RT_NO_GIP)
    203203/**
    204204 * Debugging the time api.
    … …  
    243243    return g_TimeNanoTSData.cUpdateRaces;
    244244}
    245 #endif
     245#endif /* !IN_GUEST && !RT_NO_GIP */

  • trunk/src/VBox/Runtime/r3/init.cpp

    r5999 r6677  
    4545#include <iprt/string.h>
    4646#include <iprt/param.h>
    47 #ifndef IN_GUEST
     47#if !defined(IN_GUEST) && !defined(RT_NO_GIP)
    4848# include <iprt/file.h>
    4949# include <VBox/sup.h>
    … …  
    111111    /* no entry log flow, because prefixes and thread may freak out. */
    112112
    113 #ifndef IN_GUEST
     113#if !defined(IN_GUEST) && !defined(RT_NO_GIP)
    114114# ifdef VBOX
    115115    /*
    … …  
    127127    }
    128128# endif  /* VBOX */
    129 #endif /* !IN_GUEST */
     129#endif /* !IN_GUEST && !RT_NO_GIP */
    130130
    131131    /*
    … …  
    141141    }
    142142
    143 #ifndef IN_GUEST
     143#if !defined(IN_GUEST) && !defined(RT_NO_GIP)
    144144    if (fInitSUPLib)
    145145    {
    … …  
    159159    g_u64ProgramStartMilliTS = g_u64ProgramStartNanoTS / 1000000;
    160160
    161 #ifndef IN_GUEST
     161#if !defined(IN_GUEST) && !defined(RT_NO_GIP)
    162162    /*
    163163     * The threading is initialized we can safely sleep a bit if GIP
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