third_party/jemalloc/chromium/crtsp1.diff

# The Microsoft C Runtime source code to which this document refers is available
# directly from Microsoft Corporation, under a separate license.
# Please ensure that if you are using that source code, you have appropriate
# rights to use it.  By providing you access to this file, Mozilla Corporation
# and its affiliates do not purport to grant any rights in that source code. 
# Binaries are available under separate licenses at 
# http://www.microsoft.com/downloads/details.aspx?familyid=200b2fd9-ae1a-4a14-984d-389c36f85647&displaylang=en
diff -re crt/src/crt0.c crt-sp1/src/crt0.c
273c
	/*
	 * this used to happen in _mtinit, but we need it before malloc
	 */
	_init_pointers();       /* initialize global function pointers */

        if ( malloc_init_hard() )           /* initialize heap */
.
101a
extern BOOL malloc_init_hard(void);
.
diff -re crt/src/_sample_.rc crt-sp1/src/_sample_.rc
41c
            VALUE "ProductName", "Mozilla Custom C Runtime"
.
39c
            VALUE "OriginalFilename", "MOZCRT19.DLL"
.
37c
            VALUE "OriginalFilename", "MOZCRT19D.DLL"
.
33c
            VALUE "InternalName", "MOZCRT19.DLL"
.
31c
            VALUE "InternalName", "MOZCRT19D.DLL"
.
27c
            VALUE "CompanyName", "Mozilla Foundation"
.

diff -re crt/src/crt0dat.c crt-sp1/src/crt0dat.c
789d
778d
diff -re crt/src/crtexe.c crt-sp1/src/crtexe.c
333,335d
diff -re crt/src/crtheap.c crt-sp1/src/crtheap.c
61c
    pv = calloc(count, size);
.
58,59d
diff -re crt/src/crtlib.c crt-sp1/src/crtlib.c
779,786d
416d
400a
		malloc_shutdown();

.
359d
340d
310,311d
300d
287c
            /*
             * this used to happen in _mtinit, but we need it before malloc
             */
            _init_pointers();       /* initialize global function pointers */

            if ( malloc_init_hard() )   /* initialize heap */
.
43a
extern BOOL malloc_init_hard(void);
extern void malloc_shutdown(void);

.
diff -re crt/src/dllcrt0.c crt-sp1/src/dllcrt0.c
236,237d
183d
173d
158d
153,155d
diff -re crt/src/intel/_sample_.def crt-sp1/src/intel/_sample_.def
1208d
723,724d
669a
    posix_memalign
.
643a
    memalign
.
500a
    malloc_usable_size
.
336,341d
324d
313,314d
81d
9c
LIBRARY MOZCRT19
.
diff -re crt/src/internal.h crt-sp1/src/internal.h
407a
#endif
.
403a
#if 0
.
diff -re crt/src/makefile crt-sp1/src/makefile
1745a
$(DEFFILE_DIR)\$(RETAIL_LIB_NAME).def : $(DEFFILE_DIR)\_sample_.def
	copy $** $@
.
1228,1230d
754c
dll_ :: $(OBJROOT) $(OBJCPUDIR) $(OBJDIR_DLL) $(OBJDIR_DLL)\$(PURE_OBJ_DIR) \
   	$(OBJDIR_DLL)\$(CPP_OBJ_DIR) \
   	$(RELDIR_CPU) $(PDBDIR_CPU_DLL) $(MAKE_DIRS_DLL)
.
334c
CC_OPTS_BASE=-c -nologo -Zlp8 -W3 -GFy -DWIND32
.
307,309c
LINKER=link
LINKLIB=link -lib
LINKIMPLIB=link -lib
.
302,304c
LINKER=link -nologo
LINKLIB=link -lib -nologo
LINKIMPLIB=link -lib -nologo
.
209d
21,22c
RETAIL_DLL_NAME=MOZCRT19
RETAIL_LIB_NAME=mozcrt19
.
diff -re crt/src/makefile.inc crt-sp1/src/makefile.inc
1623a

$(OBJDIR)\unhandld.obj: $(PREOBJDIR)\unhandld.obj
        copy $(PREOBJDIR)\unhandld.obj $@
.
618d
402d
342,353c
        $(OBJDIR)\jemalloc.obj \
.
334,335d
329,330d
327d
323d
320d
diff -re crt/src/makefile.sub crt-sp1/src/makefile.sub
103c
LIB=link -lib -nologo
.
69c
CFLAGS=$(CFLAGS) -O2 -DMOZ_MEMORY=1 -DMOZ_MEMORY_WINDOWS=1
.
diff -re crt/src/malloc.h crt-sp1/src/malloc.h
189a
#endif
.
177a

#if 0
.
161d
83a
#endif
.
70a
#if 0
.
diff -re crt/src/mlock.c crt-sp1/src/mlock.c
274c
#endif
.
262a
#if 0
.
diff -re crt/src/new.cpp crt-sp1/src/new.cpp
60d
52,55d
37,38c
        break;
.
diff -re crt/src/nothrownew.cpp crt-sp1/src/nothrownew.cpp
37a
#endif
.
31a
#if 1
        break;
#else

.
diff -re crt/src/tidtable.c crt-sp1/src/tidtable.c
393,394d