VirtualBox

Changeset 46043 in vbox


Ignore:
Timestamp:
May 13, 2013 7:59:49 PM (12 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
85712
Message:

src/libs/xpcom18a4: remove L4.

Location:
trunk/src/libs/xpcom18a4
Files:
6 deleted
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/libs/xpcom18a4/Config.kmk

    r44528 r46043  
    4747TEMPLATE_XPCOM_CXXFLAGS.darwin     = -fpascal-strings -fshort-wchar -fno-common -fno-rtti $(VBOX_DARWIN_DEF_SDK_CXXFLAGS)
    4848TEMPLATE_XPCOM_CXXFLAGS.freebsd    = -pthread
    49 TEMPLATE_XPCOM_CXXFLAGS.l4         = -fno-exceptions -nostdinc
    5049TEMPLATE_XPCOM_CXXFLAGS.linux      = -pthread
    5150TEMPLATE_XPCOM_CXXFLAGS.solaris    = -fno-omit-frame-pointer # for now anyway.
    … …  
    5756TEMPLATE_XPCOM_CFLAGS.profile      = -O
    5857TEMPLATE_XPCOM_CFLAGS.freebsd      = -pthread
    59 TEMPLATE_XPCOM_CFLAGS.l4           = -nostdinc
    6058TEMPLATE_XPCOM_CFLAGS.linux        = -pthread -ansi
    6159TEMPLATE_XPCOM_CFLAGS.solaris      = -fno-omit-frame-pointer # for now anyway.
    … …  
    7775TEMPLATE_XPCOM_DEFS.freebsd        = OSTYPE=\"FreeBSD5+\"   OSARCH=\"FreeBSD\" XP_UNIX=1 FREEBSD=1 HAVE_VISIBILITY_ATTRIBUTE=1
    7876TEMPLATE_XPCOM_DEFS.linux          = OSTYPE=\"Linux2.6\"    OSARCH=\"Linux\"  XP_UNIX=1 _GNU_SOURCE HAVE_VISIBILITY_ATTRIBUTE=1 ## @todo LINUX=1
    79 TEMPLATE_XPCOM_DEFS.l4             = OSTYPE=\"L4ENV\"       OSARCH=\"L4\"     XP_UNIX=1 L4ENV HAVE_VISIBILITY_ATTRIBUTE=1
    8077# Don't define BSD_SELECT because bsdselect() from kLIBC <= 0.6.3 has problems on SMP
    8178TEMPLATE_XPCOM_DEFS.os2            = OSTYPE=\"OS/2_4.5\"    OSARCH=\"OS/2\"   XP_OS2 XP_PC OS2=4
    … …  
    126123                                     .
    127124TEMPLATE_XPCOM_INCS.darwin         = $(VBOX_PATH_MACOSX_SDK)/Developer/Headers/FlatCarbon
    128 TEMPLATE_XPCOM_INCS.l4             = $(L4_INCDIR) $(VBOX_L4_GCC3_INCS)
    129 TEMPLATE_XPCOM_LDFLAGS.l4          = $(L4_DIR)/lib/x86_586/crt0.o \
    130                                      -T$(L4_DIR)/lib/x86_586/main_rel.ld -nostdlib \
    131                                      # -Wl,--whole-archive,--no-allow-shlib-undefined
    132 TEMPLATE_XPCOM_LIBS.l4             = $(VBOX_GCC_LIBGCC)
    133125TEMPLATE_XPCOM_LIBS.solaris        = sendfile
    134126TEMPLATE_XPCOM_ORDERDEPS           = $(foreach hdrinst, $(filter %-HEADERS, $(INSTALLS)), $($(hdrinst)_1_TARGET)) \
    … …  
    168160TEMPLATE_XPCOMEXE_LIBS.freebsd     = $(LIB_PTHREAD)
    169161TEMPLATE_XPCOMEXE_LIBS.linux       = dl $(LIB_PTHREAD)
    170 TEMPLATE_XPCOMEXE_LIBS.l4          = $(LIB_RUNTIME) $(VBOX_GCC_LIBGCC)
    171162TEMPLATE_XPCOMEXE_LDFLAGS.darwin   = -bind_at_load $(filter-out -current_version -compatibility_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD),$(TEMPLATE_XPCOM_LDFLAGS.darwin))
    172 TEMPLATE_XPCOMEXE_LDFLAGS.l4       = $(L4_DIR)/lib/x86_586/crt0.o \
    173     -T$(L4_DIR)/lib/x86_586/main_dyn.ld -nostdlib -lgcc \
    174     -Wl,--export-dynamic,--dynamic-linker=libld-l4.s.so \
    175     -Wl,--rpath-link,$(L4_LIBDIR) \
    176     # -Wl,--whole-archive,--no-allow-shlib-undefined
    177 #    -Wno-format
    178163
    179164

  • trunk/src/libs/xpcom18a4/Makefile.kmk

    r41477 r46043  
    201201        nsprpub/pr/include/md/_darwin.h \
    202202        nsprpub/pr/include/md/_freebsd.h \
    203         nsprpub/pr/include/md/_l4v2.h \
    204203        nsprpub/pr/include/md/_linux.h \
    205204        nsprpub/pr/include/md/_macos.h \
    … …  
    223222        nsprpub/pr/include/md/_solaris32.cfg \
    224223        nsprpub/pr/include/md/_solaris64.cfg \
    225         nsprpub/pr/include/md/_l4v2.cfg
    226224
    227225NSPRPUB-OBS-HEADERS_INST = $(INST_SDK)bindings/xpcom/include/nsprpub/obsolete/
    … …  
    529527        _PR_PTHREADS
    530528# _BSD_SOURCE is here to keep the Glibc header files happy and make them include the right things
    531 # FIXME: L4 should be defined by _linux.cfg
    532 VBox-xpcom-nspr_DEFS.l4 = \
    533         L4=1 \
    534         _REENTRANT=1 \
    535         _LARGEFILE64_SOURCE=1 \
    536         _POSIX_SOURCE=1 \
    537         _BSD_SOURCE=1 \
    538         HAVE_FCNTL_FILE_LOCKING=1 \
    539         HAVE_CVAR_BUILT_ON_SEM
    540529VBox-xpcom-nspr_DEFS.netbsd = \
    541530        _PR_PTHREADS
    … …  
    631620VBox-xpcom-nspr_SOURCES.freebsd = nsprpub/pr/src/md/unix/freebsd.c
    632621
    633 VBox-xpcom-nspr_SOURCES.l4 = \
    634         nsprpub/pr/src/io/prfile.c /* why not for Linux? */ \
    635         nsprpub/pr/src/io/prio.c   /*  ""   ""  ""   ""  */ \
    636         nsprpub/pr/src/io/prsocket.c \
    637         nsprpub/pr/src/md/unix/unix.c \
    638         nsprpub/pr/src/md/unix/unix_errors.c \
    639         nsprpub/pr/src/md/unix/uxpoll.c \
    640         nsprpub/pr/src/md/unix/uxproces.c \
    641         nsprpub/pr/src/md/unix/uxrng.c \
    642         nsprpub/pr/src/md/unix/uxshm.c \
    643         nsprpub/pr/src/md/unix/uxwrap.c \
    644         nsprpub/pr/src/md/unix/l4env.c \
    645         nsprpub/pr/src/threads/prcthr.c \
    646         nsprpub/pr/src/threads/prmon.c \
    647         nsprpub/pr/src/threads/combined/prucpu.c \
    648         nsprpub/pr/src/threads/combined/prucv.c \
    649         nsprpub/pr/src/threads/combined/prulock.c \
    650         nsprpub/pr/src/threads/combined/prustack.c \
    651         nsprpub/pr/src/threads/combined/pruthr.c
    652 #   nsprpub/pr/src/md/l4env/prnetdb.c \
    653 #   nsprpub/pr/src/md/l4env/threads.c
    654 VBox-xpcom-nspr_SOURCES.l4.x86 = nsprpub/pr/src/md/unix/os_Linux_x86.s
    655 VBox-xpcom-nspr_SOURCES.l4.amd64 = nsprpub/pr/src/md/unix/os_Linux_x86_64.s
    656 
    657622VBox-xpcom-nspr_SOURCES.linux = nsprpub/pr/src/md/unix/linux.c
    658623VBox-xpcom-nspr_SOURCES.linux.x86 = nsprpub/pr/src/md/unix/os_Linux_x86.s
    … …  
    819784        xpcom/MoreFiles/FSCopyObject.c \
    820785        xpcom/MoreFiles/MoreFilesX.c
    821 VBox-xpcom-io_SOURCES.l4 = \
    822         xpcom/io/nsLocalFileL4.cpp
    823786if1of ($(KBUILD_TARGET) $(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), freebsd linux netbsd openbsd solaris darwin.amd64)
    824787VBox-xpcom-io_SOURCES += \
    … …  
    873836VBox-xpcom-xptcall_DEFS                = _IMPL_NS_COM _IMPL_NS_BASE EXPORT_XPTC_API
    874837VBox-xpcom-xptcall_DEFS.darwin         = KEEP_STACK_16_BYTE_ALIGNED
    875 VBox-xpcom-xptcall_DEFS.l4             = L4
    876838VBox-xpcom-xptcall_DEFS.os2            = MOZ_NEED_LEADING_UNDERSCORE
    877839VBox-xpcom-xptcall_INCS.os2            = xpcom/reflect/xptcall/src/md/unix
    … …  
    1002964        pthread dl
    1003965
    1004 ifeq ($(filter-out freebsd l4 linux netbsd openbsd,$(KBUILD_TARGET)),) # gnu ld.
     966ifeq ($(filter-out freebsd linux netbsd openbsd,$(KBUILD_TARGET)),) # gnu ld.
    1005967VBoxXPCOM_LDFLAGS = -Wl,--whole-archive \
    1006968        $(VBox-xpcom-typelib_1_TARGET) \
    … …  
    1034996        -Wl,-z,defaultextract
    1035997
    1036 #VBoxXPCOM_LIBS.l4 = $(L4_LIBDIR)/libxpcomstubs.a $(L4_LIBDIR)/../libuc_c++.a \
    1037 #    $(VBOX_PATH_L4_GCC3_INSTALL)/libsupc++.a $(VBOX_PATH_L4_GCC3_INSTALL)/libgcc_eh.a
    1038998# EF heap
    1039999#VBoxXPCOM_LIBS += $(LIB_RUNTIME_EF)

  • trunk/src/libs/xpcom18a4/ipc/ipcd/shared/src/ipcLog.cpp

    r38636 r46043  
    6666#if defined(XP_UNIX) || defined(XP_OS2) || defined(XP_BEOS)
    6767
    68   #if defined(L4ENV)
    69 #include <l4/sys/types.h>
    70 #include <l4/sys/syscalls.h>
    71 
    72 static inline PRUint32
    73 WritePrefix(char *buf, PRUint32 bufLen)
    74 {
    75     l4_threadid_t my_id = l4_myself();
    76     return PR_snprintf(buf, bufLen, "[%u.%u] %s ",
    77                        static_cast<unsigned>(my_id.id.task),
    78                        static_cast<unsigned>(my_id.id.lthread),
    79                        ipcLogPrefix);
    80 }
    81 
    82   #else /* Not L4ENV */
    8368#include <sys/types.h>
    8469#include <unistd.h>
    … …  
    9277                       ipcLogPrefix);
    9378}
    94   #endif /* Not L4ENV */
    9579#endif
    9680

  • trunk/src/libs/xpcom18a4/nsprpub/pr/include/md/_unixos.h

    r32971 r46043  
    4747 * not be redefined.
    4848 */
    49 #if !defined(LINUX) && !defined(DARWIN) && !defined(NEXTSTEP) && !defined(L4ENV)
     49#if !defined(LINUX) && !defined(DARWIN) && !defined(NEXTSTEP)
    5050#ifndef FD_SETSIZE
    5151#define FD_SETSIZE  4096

  • trunk/src/libs/xpcom18a4/nsprpub/pr/include/md/prosdep.h

    r1 r46043  
    139139#include "md/_nto.h"
    140140
    141 #elif defined(L4ENV)
    142 #include "md/_l4v2.h"
    143 
    144141#else
    145142#error unknown Unix flavor

  • trunk/src/libs/xpcom18a4/nsprpub/pr/src/md/unix/unix.c

    r1 r46043  
    6666 */
    6767#if defined(HAVE_SOCKLEN_T) \
    68     || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) \
    69     || defined(L4ENV)
     68    || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
    7069#define _PRSockLen_t socklen_t
    7170#elif defined(IRIX) || defined(HPUX) || defined(OSF1) || defined(SOLARIS) \

  • trunk/src/libs/xpcom18a4/nsprpub/pr/src/md/unix/uxrng.c

    r1 r46043  
    310310}
    311311#elif defined(SCO) || defined(UNIXWARE) || defined(BSDI) || defined(NTO) \
    312     || defined(QNX) || defined(DARWIN)  || defined(L4ENV)
     312    || defined(QNX) || defined(DARWIN)
    313313#include <sys/times.h>
    314314

  • trunk/src/libs/xpcom18a4/nsprpub/pr/src/misc/prnetdb.c

    r1 r46043  
    109109#endif
    110110
    111 #if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || defined(L4ENV)
     111#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
    112112#define _PR_HAVE_GETPROTO_R
    113113#define _PR_HAVE_5_ARG_GETPROTO_R

  • trunk/src/libs/xpcom18a4/xpcom-private.h

    r1 r46043  
    1212
    1313/* Define if iconv() is available */
    14 #ifndef L4ENV
    1514#define HAVE_ICONV 1
    16 #endif
    1715
    1816/* Define if iconv() supports const input */
    … …  
    2018
    2119/* Define if mbrtowc() is available */
    22 #ifndef L4ENV
    2320#define HAVE_MBRTOWC 1
    24 #endif
    2521
    2622/* Define if <sys/mount.h> is present */
    … …  
    3127
    3228/* Define if wcrtomb() is available */
    33 #ifndef L4ENV
    3429#define HAVE_WCRTOMB 1
    35 #endif
    3630
    3731#endif /* _XPCOM_PRIVATE_H_ */

  • trunk/src/libs/xpcom18a4/xpcom/io/nsAppFileLocationProvider.cpp

    r16402 r46043  
    379379    }
    380380    if (NS_FAILED(rv)) return rv;
    381 #elif defined(L4ENV)
    382   /* Major hack attack, should sort out the environment stuff!!! */
    383     rv = NS_NewNativeLocalFile(nsDependentCString("."), PR_TRUE, getter_AddRefs(localDir));
    384     if (NS_FAILED(rv)) return rv;
    385381#elif defined(XP_UNIX)
    386382    rv = NS_NewNativeLocalFile(nsDependentCString(PR_GetEnv("HOME")), PR_TRUE, getter_AddRefs(localDir));

  • trunk/src/libs/xpcom18a4/xpcom/io/nsLocalFile.h

    r16402 r46043  
    7575#elif defined(XP_MAC)
    7676#include "nsLocalFileMac.h"
    77 #elif defined(L4ENV)
    78   /* Major hack attack!!! */
    79 #include "nsLocalFileL4.h"
    8077#elif defined(XP_UNIX) || defined(XP_BEOS)
    8178#include "nsLocalFileUnix.h"

  • trunk/src/libs/xpcom18a4/xpcom/io/nsNativeCharsetUtils.cpp

    r1 r46043  
    643643    unsigned int w = 0;
    644644
    645 #ifndef L4ENV
    646645    int res = mbtowc((wchar_t *) &w, &a, 1);
    647646
    648647    gWCharIsUnicode = (res != -1 && w == 'a');
    649 #else
    650     gWCharIsUnicode = 0;
    651 #endif
    652648
    653649#ifdef DEBUG
    … …  
    664660{
    665661    if (gWCharIsUnicode) {
    666 #ifndef L4ENV
    667   /* We don't have any wchar support built into uclibc just now */
    668662        int incr;
    669663
    … …  
    690684            (*outputLeft)--;
    691685        }
    692 #endif /* not defined L4ENV */
    693686    }
    694687    else {
    … …  
    708701{
    709702    if (gWCharIsUnicode) {
    710 #ifndef L4ENV
    711   /* We don't have any wchar support built into uclibc just now */
    712703        int incr;
    713704
    … …  
    731722            (*inputLeft)--;
    732723        }
    733 #endif /* not defined L4ENV */
    734724    }
    735725    else {

  • trunk/src/libs/xpcom18a4/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h

    r1 r46043  
    6868*/
    6969
    70 #if defined(LINUX) || defined(L4)
    71 /* I am assuming that since we are using the Linux compiler for L4, the same will hold true... */
     70#if defined(LINUX)
    7271
    7372#if (__GNUC__ == 2) && (__GNUC_MINOR__ <= 7)
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