VirtualBox

Changeset 46035 in vbox


Ignore:
Timestamp:
May 13, 2013 4:47:40 PM (12 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
85702
Message:

Remove L4 support from main tree.

Location:
trunk
Files:
3 deleted
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/Makefile.kmk

    r46030 r46035  
    349349# compile things.
    350350#
    351 ifn1of ($(KBUILD_TARGET), l4 linux win)
     351ifn1of ($(KBUILD_TARGET), linux win)
    352352 VBOX_PATH_STAGED ?= .
    353353
    … …  
    481481        src/VBox/HostDrivers/Support/darwin \
    482482        src/VBox/HostDrivers/Support/freebsd \
    483         src/VBox/HostDrivers/Support/l4 \
    484483        src/VBox/HostDrivers/Support/linux \
    485484        src/VBox/HostDrivers/Support/os2 \

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

    r44824 r46035  
    9797        $(PATH_SDK_$(VBOX_WINDDK)_LIB)/Newdev.lib
    9898 endif
    99  ifeq ($(KBUILD_TARGET),l4)
    100   VBoxDDU_LIBS           += \
    101         $(L4_LIBDIR)/libl4sys.p.a
    102  endif
    10399 VBoxDDU_LDFLAGS.darwin   = -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxDDU.dylib
    104100 ifdef VBOX_WITH_USB
    … …  
    109105
    110106 VBoxDDU_LDFLAGS.linux    = -Wl,--no-undefined
    111  VBoxDDU_LDFLAGS.l4       = -Wl,--no-undefined
    112 
    113  #
    114  # VBoxDDULnxHostR3 (Only needed for l4, currently for executing vditool on L4Linux.)
    115  #
    116  ifeq ($(KBUILD_TARGET),l4)
    117   LIBRARIES                += VBoxDDULnxHostR3
    118   VBoxDDULnxHostR3_TEMPLATE = VBOXLNXHOSTR3LIB
    119   VBoxDDULnxHostR3_DEFS     = IN_VBOXDDU
    120   VBoxDDULnxHostR3_SOURCES  = $(VBoxDDU_SOURCES)
    121  endif
    122107
    123108 #
    … …  
    212197        -framework DiskArbitration
    213198 VBoxDD_LDFLAGS.linux    = -Wl,--no-undefined
    214  VBoxDD_LDFLAGS.l4       = -Wl,--no-undefined
    215199
    216200 # --- Tracing bits. ---
    … …  
    287271        $(if $(VBOX_USB_WITH_SYSFS),VBOX_USB_WITH_SYSFS,)
    288272  VBoxDD_SOURCES.linux  += \
    289         USB/USBProxyDevice.cpp \
    290         USB/linux/USBProxyDevice-linux.cpp
    291 
    292   VBoxDD_DEFS.l4        += VUSB_HAVE_USBPROXY_DEVICE
    293   VBoxDD_SOURCES.l4     += \
    294273        USB/USBProxyDevice.cpp \
    295274        USB/linux/USBProxyDevice-linux.cpp
    … …  
    599578 endif # freebsd
    600579
    601  ifeq ($(KBUILD_TARGET),l4)
    602   $(error L4 is busted. Fix when needed.)
    603   #VBoxDD_SOURCES      = filter needed
    604   VBoxDD_SOURCES.l4    += \
    605         Audio/ossaudio.c
    606  endif # l4
    607 
    608580 VBoxDD_SOURCES.linux  += \
    609581        Network/DrvTAP.cpp \
    … …  
    659631        $(VBoxDDU_1_STAGE_TARGET) \
    660632        $(VBoxDD2_1_STAGE_TARGET)
    661  endif
    662  ifeq ($(KBUILD_TARGET),l4)
    663   VBoxDD_LIBS           += \
    664         $(L4_LIBDIR)/libl4sys.p.a
    665633 endif
    666634
    … …  
    883851        $(LIB_VMM) \
    884852        $(LIB_RUNTIME)
    885  ifeq ($(KBUILD_TARGET),l4)
    886  VBoxDD2_LIBS           += \
    887         $(L4_LIBDIR)/libl4sys.p.a
    888  endif
    889853 VBoxDD2_LIBS.darwin    += $(LIB_REM)
    890854 VBoxDD2_LDFLAGS.darwin  = -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxDD2.dylib
    891855 VBoxDD2_LDFLAGS.linux   = -Wl,--no-undefined
    892  VBoxDD2_LDFLAGS.l4      = -Wl,--no-undefined
    893856
    894857 ifdef VBOX_WITH_PXE_ROM

  • trunk/src/VBox/Devices/Network/DrvTAP.cpp

    r45061 r46035  
    6363#include <errno.h>
    6464#include <unistd.h>
    65 
    66 #ifdef RT_OS_L4
    67 # include <l4/vboxserver/file.h>
    68 #endif
    6965
    7066#include "VBoxDD.h"

  • trunk/src/VBox/Devices/Storage/DrvHostDVD.cpp

    r45061 r46035  
    3434# include <mach/mach_error.h>
    3535# define USE_MEDIA_POLLING
    36 
    37 #elif defined(RT_OS_L4)
    38 /* nothing (yet). */
    3936
    4037#elif defined RT_OS_LINUX
    … …  
    438435        rc = VERR_DEV_IO_ERROR;
    439436
    440 #elif defined(RT_OS_L4)
    441     /* Not really ported to L4 yet. */
    442     rc = VERR_INTERNAL_ERROR;
    443 
    444437#elif defined(RT_OS_LINUX)
    445438    int direction;
    … …  
    778771#endif
    779772
    780 #ifndef RT_OS_L4 /* Passthrough is not supported on L4 yet */
    781773            bool fPassthrough;
    782774            rc = CFGMR3QueryBool(pCfg, "Passthrough", &fPassthrough);
    … …  
    786778                /* Passthrough requires opening the device in R/W mode. */
    787779                pThis->fReadOnlyConfig = false;
    788 # ifdef VBOX_WITH_SUID_WRAPPER  /* Solaris setuid for Passthrough mode. */
     780#ifdef VBOX_WITH_SUID_WRAPPER  /* Solaris setuid for Passthrough mode. */
    789781                rc = solarisCheckUserAuth();
    790782                if (RT_FAILURE(rc))
    … …  
    793785                    return rc;
    794786                }
    795 # endif /* VBOX_WITH_SUID_WRAPPER */
     787#endif /* VBOX_WITH_SUID_WRAPPER */
    796788            }
    797 #endif /* !RT_OS_L4 */
    798789
    799790            pThis->IMount.pfnUnmount = drvHostDvdUnmount;

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

    r45994 r46035  
    9595 endif # VBOX_WITH_ADDITIONS
    9696 LIBRARIES.win.x86 += RuntimeR3VccTricks
    97  LIBRARIES.l4 += RuntimeR3L4 RuntimeLnxHostR3
    9897 DLLS += VBoxRT
    9998endif
    … …  
    245244        $(PATH_ROOT)/src/libs/kStuff/kStuff/include
    246245endif
    247 RuntimeR3_INCS.l4       = \
    248         $(L4_INCDIR)
    249246
    250247# RuntimeR3_INCS.solaris  = \
    … …  
    10231020
    10241021#
    1025 # L4 RuntimeR3 subtarget since L4 headers won't work with VBOXR3.
    1026 #
    1027 RuntimeR3L4_TEMPLATE      = VBOXR3NP
    1028 RuntimeR3L4_DEFS          = IN_RT_R3 IN_SUP_R3 LDR_WITH_NATIVE LDR_WITH_ELF LDR_WITH_PE
    1029 ifneq ($(KBUILD_TARGET_ARCH),amd64)
    1030 RuntimeR3L4_DEFS         += __PIC__
    1031 endif
    1032 RuntimeR3L4_INCS          = \
    1033         include \
    1034         $(L4_INCDIR)
    1035 
    1036 RuntimeR3L4_SOURCES = \
    1037         generic/cdrom-generic.cpp \
    1038         generic/errvars-generic.cpp \
    1039         generic/fs-stubs-generic.cpp \
    1040         generic/pathhost-generic.cpp \
    1041         generic/RTDirQueryInfo-generic.cpp \
    1042         generic/RTDirSetTimes-generic.cpp \
    1043         generic/RTFileMove-generic.cpp \
    1044         generic/RTLogWriteDebugger-generic.cpp \
    1045         generic/RTProcDaemonize-generic.cpp \
    1046         generic/RTSystemQueryOSInfo-generic.cpp \
    1047         generic/RTSystemQueryDmiString-generic.cpp \
    1048         generic/RTSystemShutdown-generic.cpp \
    1049         generic/RTThreadGetAffinity-stub-generic.cpp \
    1050         generic/RTThreadSetAffinity-stub-generic.cpp \
    1051         generic/RTThreadSetAffinityToCpu-generic.cpp \
    1052         generic/RTTimeLocalNow-generic.cpp \
    1053         generic/RTUuidCreate-generic.cpp \
    1054         generic/mppresent-generic.cpp \
    1055         generic/sched-generic.cpp \
    1056         generic/RTSemEventWait-generic.cpp \
    1057         generic/RTSemEventMultiWait-generic.cpp \
    1058         generic/RTSemMutexRequest-generic.cpp \
    1059         generic/RTSemMutexRequestDebug-generic.cpp \
    1060         generic/semrw-$(if-expr defined(VBOX_WITH_LOCKLESS_SEMRW),lockless-,)generic.cpp \
    1061         generic/utf16locale-generic.cpp \
    1062         generic/uuid-generic.cpp \
    1063         generic/RTProcIsRunningByName-generic.cpp \
    1064         generic/RTThreadGetNativeState-generic.cpp \
    1065         l4/l4-errno.cpp \
    1066         l4/rtProcInitExePath-l4.cpp \
    1067         l4/process-l4env.cpp \
    1068         l4/sems-l4env.cpp \
    1069         l4/thread-l4env.cpp \
    1070         l4/timer-l4env.cpp \
    1071         l4/utf8-l4env.cpp \
    1072         r3/posix/RTFileQueryFsSizes-posix.cpp \
    1073         r3/posix/RTMemProtect-posix.cpp \
    1074         r3/posix/rtmempage-exec-mmap-heap-posix.cpp \
    1075         r3/posix/RTPathUserHome-posix.cpp \
    1076         r3/posix/RTTimeNow-posix.cpp \
    1077         r3/posix/RTTimeSet-posix.cpp \
    1078         r3/posix/dir-posix.cpp \
    1079         r3/posix/env-posix.cpp \
    1080         r3/posix/fileio-posix.cpp \
    1081         r3/posix/fileio2-posix.cpp \
    1082         r3/posix/filelock-posix.cpp \
    1083         r3/posix/ldrNative-posix.cpp \
    1084         r3/posix/path-posix.cpp \
    1085         r3/posix/path2-posix.cpp \
    1086         r3/posix/RTPathUserDocuments-posix.cpp \
    1087         r3/posix/rand-posix.cpp \
    1088         r3/posix/time-posix.cpp \
    1089         r3/posix/timelocal-posix.cpp
    1090 
    1091 
    1092 #
    10931022# RuntimeBldProg - Static Runtime for build programs.
    10941023#
    … …  
    11051034#
    11061035# RuntimeGuestR3 - Guest Additions Runtime (static/exe).
    1107 # (The KBUILD_HOST inheritance here is for l4 cross building the linux
     1036# (The KBUILD_HOST inheritance here is for cross building the linux
    11081037# additions, while .x86 is for cross building x86 while targeting amd64.)
    11091038#
    … …  
    13001229
    13011230#
    1302 # RuntimeLnxHostR3 Linux host program runtime
    1303 # (Only used when building L4.)
    1304 #
    1305 RuntimeLnxHostR3_TEMPLATE     := VBOXLNXHOSTR3LIB
    1306 RuntimeLnxHostR3_DEFS         := IN_RT_R3 IN_SUP_R3 RT_WITH_VBOX RT_NO_GIP
    1307 RuntimeLnxHostR3_SOURCES      := \
    1308         $(RuntimeR3_SOURCES.linux.$(KBUILD_TARGET_ARCH)) \
    1309         $(RuntimeR3_SOURCES.linux) \
    1310         $(RuntimeR3_SOURCES)
    1311 RuntimeLnxHostR3_INCS         := \
    1312         $(RuntimeR3_INCS.linux.$(KBUILD_TARGET_ARCH)) \
    1313         $(RuntimeR3_INCS.linux) \
    1314         $(RuntimeR3_INCS)
    1315 
    1316 
    1317 #
    13181231# VBoxRT - Shared Object / DLL version.
    13191232#
    … …  
    14061319VBoxRT_LDFLAGS.darwin          = -framework IOKit -framework CoreFoundation -framework CoreServices -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxRT.dylib
    14071320VBoxRT_LDFLAGS.win             = /MANIFEST
    1408 VBoxRT_LDFLAGS.l4              = \
    1409         -Wl,-whole-archive \
    1410         $(PATH_STAGE_LIB)/RuntimeR3L4$(VBOX_SUFF_LIB) \
    1411         -Wl,-no-whole-archive
    1412 ifeq ($(KBUILD_TARGET),l4)
    1413 VBoxRT_LIBS                   += \
    1414         $(L4_LIBDIR)/libl4sys.a \
    1415         $(L4_LIBDIR)/libl4sys.p.a
    1416 endif
    1417 VBoxRT_LIBS.l4                 = \
    1418         $(PATH_STAGE_LIB)/RuntimeR3L4$(VBOX_SUFF_LIB)
    14191321
    14201322if1of ($(DLLS), VBoxRT)
    … …  
    22212123 $(lib)_common/err/errmsgxpcom.cpp_DEPS = $(IPRT_OUT_DIR)/errmsgvboxcomdata.h
    22222124endef
    2223 $(foreach lib,RuntimeR3 RuntimeBldProg VBoxRT RuntimeLnxHostR3,$(eval $(def_errmsgwin_deps)))
     2125$(foreach lib,RuntimeR3 RuntimeBldProg VBoxRT,$(eval $(def_errmsgwin_deps)))
    22242126
    22252127
    … …  
    23342236                $(dir)/darwin \
    23352237                $(dir)/haiku \
    2336                 $(dir)/l4 \
    23372238                $(dir)/linux \
    23382239                $(dir)/nt \

  • trunk/src/VBox/Runtime/VBox/log-vbox.cpp

    r45356 r46035  
    145145#  include <sys/procfs.h>
    146146#  include <unistd.h>
    147 # elif defined(RT_OS_L4)
    148 #  include <l4/vboxserver/vboxserver.h>
    149147# elif defined(RT_OS_OS2)
    150148#  include <stdlib.h>
    … …  
    413411        }
    414412
    415 #  elif defined(RT_OS_L4) || defined(RT_OS_OS2) || defined(RT_OS_DARWIN)
     413#  elif defined(RT_OS_OS2) || defined(RT_OS_DARWIN)
    416414        /* commandline? */
    417415#  else

  • trunk/src/VBox/Runtime/generic/env-generic.cpp

    r44528 r46035  
    102102#ifdef RT_OS_DARWIN
    103103    return *(_NSGetEnviron());
    104 #elif defined(RT_OS_L4)
    105     /* So far, our L4 libraries do not include environment support. */
    106     return NULL;
    107104#else
    108105    return environ;

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

    r43363 r46035  
    4747# include <io.h>
    4848#endif
    49 #ifdef RT_OS_L4
    50 /* This is currently ifdef'ed out in the relevant L4 header file */
    51 /* Same as `utimes', but takes an open file descriptor instead of a name.  */
    52 extern int futimes(int __fd, __const struct timeval __tvp[2]) __THROW;
    53 #endif
    5449
    5550#ifdef RT_OS_SOLARIS

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

    r44528 r46035  
    4949#include "internal/process.h"
    5050#include "internal/fs.h"
    51 
    52 #ifdef RT_OS_L4
    53 # include <l4/vboxserver/vboxserver.h>
    54 #endif
    55 
    5651
    5752

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

    r34230 r46035  
    4949#include "internal/fs.h"
    5050
    51 #ifdef RT_OS_L4
    52 # include <l4/vboxserver/vboxserver.h>
    53 #endif
    54 
    5551
    5652RTR3DECL(int) RTPathQueryInfo(const char *pszPath, PRTFSOBJINFO pObjInfo, RTFSOBJATTRADD enmAdditionalAttribs)

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

    r45512 r46035  
    150150PROGRAMS.solaris += \
    151151        tstRTCoreDump
    152 PROGRAMS.l4 += \
    153         tstIoCtl
    154152PROGRAMS.darwin += \
    155153        tstDarwinSched \
    … …  
    296294tstRTHeapSimple_SOURCES = tstRTHeapSimple.cpp
    297295
    298 tstIoCtl_TEMPLATE = VBOXR3TSTEXE
    299 tstIoCtl_SOURCES = tstIoCtl.cpp
    300 
    301296tstRTInlineAsm_TEMPLATE = VBOXR3TSTEXE
    302297tstRTInlineAsm_SOURCES = tstRTInlineAsm.cpp

  • trunk/src/VBox/Runtime/testcase/tstTime-3.cpp

    r44528 r46035  
    3131# include <Windows.h>
    3232
    33 #elif defined RT_OS_L4
    34 
    3533#else /* posix */
    3634# include <sys/time.h>
    … …  
    5149    GetSystemTimeAsFileTime((LPFILETIME)&u64);
    5250    return u64 * 100;
    53 
    54 #elif defined RT_OS_L4
    55     /** @todo fix a different timesource on l4. */
    56     return RTTimeNanoTS();
    5751
    5852#else /* posix */
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