memory/jemalloc/crtsp1.diff

   1 # The Microsoft C Runtime source code to which this document refers is available
   2 # directly from Microsoft Corporation, under a separate license.
   3 # Please ensure that if you are using that source code, you have appropriate
   4 # rights to use it.  By providing you access to this file, Mozilla Corporation
   5 # and its affiliates do not purport to grant any rights in that source code.
   6 # Binaries are available under separate licenses at
   7 # http://www.microsoft.com/downloads/details.aspx?familyid=200b2fd9-ae1a-4a14-984d-389c36f85647&displaylang=en
   8 diff -re crt/src/crt0.c crt-sp1/src/crt0.c
   9 273c
  10         /*
  11          * this used to happen in _mtinit, but we need it before malloc
  12          */
  13         _init_pointers();       /* initialize global function pointers */
  14
  15         if ( malloc_init_hard() )           /* initialize heap */
  16 .
  17 101a
  18 extern BOOL malloc_init_hard(void);
  19 .
  20 diff -re crt/src/_sample_.rc crt-sp1/src/_sample_.rc
  21 41c
  22             VALUE "ProductName", "Mozilla Custom C Runtime"
  23 .
  24 39c
  25             VALUE "OriginalFilename", "MOZCRT19.DLL"
  26 .
  27 37c
  28             VALUE "OriginalFilename", "MOZCRT19D.DLL"
  29 .
  30 33c
  31             VALUE "InternalName", "MOZCRT19.DLL"
  32 .
  33 31c
  34             VALUE "InternalName", "MOZCRT19D.DLL"
  35 .
  36 27c
  37             VALUE "CompanyName", "Mozilla Foundation"
  38 .
  39
  40 diff -re crt/src/crt0dat.c crt-sp1/src/crt0dat.c
  41 789d
  42 778d
  43 diff -re crt/src/crtexe.c crt-sp1/src/crtexe.c
  44 333,335d
  45 diff -re crt/src/crtheap.c crt-sp1/src/crtheap.c
  46 61c
  47     pv = calloc(count, size);
  48 .
  49 58,59d
  50 diff -re crt/src/crtlib.c crt-sp1/src/crtlib.c
  51 779,786d
  52 416d
  53 400a
  54                 malloc_shutdown();
  55
  56 .
  57 359d
  58 340d
  59 310,311d
  60 300d
  61 287c
  62             /*
  63              * this used to happen in _mtinit, but we need it before malloc
  64              */
  65             _init_pointers();       /* initialize global function pointers */
  66
  67             if ( malloc_init_hard() )   /* initialize heap */
  68 .
  69 43a
  70 extern BOOL malloc_init_hard(void);
  71 extern void malloc_shutdown(void);
  72
  73 .
  74 diff -re crt/src/dllcrt0.c crt-sp1/src/dllcrt0.c
  75 236,237d
  76 183d
  77 173d
  78 158d
  79 153,155d
  80 diff -re crt/src/intel/_sample_.def crt-sp1/src/intel/_sample_.def
  81 1208d
  82 723,724d
  83 669a
  84     posix_memalign
  85 .
  86 643a
  87     memalign
  88 .
  89 500a
  90     malloc_usable_size
  91 .
  92 336,341d
  93 324d
  94 313,314d
  95 81d
  96 9c
  97 LIBRARY MOZCRT19
  98 .
  99 diff -re crt/src/internal.h crt-sp1/src/internal.h
 100 407a
 101 #endif
 102 .
 103 403a
 104 #if 0
 105 .
 106 diff -re crt/src/makefile crt-sp1/src/makefile
 107 1745a
 108 $(DEFFILE_DIR)\$(RETAIL_LIB_NAME).def : $(DEFFILE_DIR)\_sample_.def
 109         copy $** $@
 110 .
 111 1228,1230d
 112 754c
 113 dll_ :: $(OBJROOT) $(OBJCPUDIR) $(OBJDIR_DLL) $(OBJDIR_DLL)\$(PURE_OBJ_DIR) \
 114         $(OBJDIR_DLL)\$(CPP_OBJ_DIR) \
 115         $(RELDIR_CPU) $(PDBDIR_CPU_DLL) $(MAKE_DIRS_DLL)
 116 .
 117 334c
 118 CC_OPTS_BASE=-c -nologo -Zlp8 -W3 -GFy -DWIND32
 119 .
 120 307,309c
 121 LINKER=link
 122 LINKLIB=link -lib
 123 LINKIMPLIB=link -lib
 124 .
 125 302,304c
 126 LINKER=link -nologo
 127 LINKLIB=link -lib -nologo
 128 LINKIMPLIB=link -lib -nologo
 129 .
 130 209d
 131 21,22c
 132 RETAIL_DLL_NAME=MOZCRT19
 133 RETAIL_LIB_NAME=msvcrt
 134 .
 135 diff -re crt/src/makefile.inc crt-sp1/src/makefile.inc
 136 1623a
 137
 138 $(OBJDIR)\unhandld.obj: $(PREOBJDIR)\unhandld.obj
 139         copy $(PREOBJDIR)\unhandld.obj $@
 140 .
 141 618d
 142 402d
 143 342,353c
 144         $(OBJDIR)\jemalloc.obj \
 145 .
 146 334,335d
 147 329,330d
 148 327d
 149 323d
 150 320d
 151 diff -re crt/src/makefile.sub crt-sp1/src/makefile.sub
 152 103c
 153 LIB=link -lib -nologo
 154 .
 155 69c
 156 CFLAGS=$(CFLAGS) -O2 -DMOZ_MEMORY=1 -DMOZ_MEMORY_WINDOWS=1
 157 .
 158 diff -re crt/src/malloc.h crt-sp1/src/malloc.h
 159 189a
 160 #endif
 161 .
 162 177a
 163
 164 #if 0
 165 .
 166 161d
 167 83a
 168 #endif
 169 .
 170 70a
 171 #if 0
 172 .
 173 diff -re crt/src/mlock.c crt-sp1/src/mlock.c
 174 274c
 175 #endif
 176 .
 177 262a
 178 #if 0
 179 .
 180 diff -re crt/src/new.cpp crt-sp1/src/new.cpp
 181 60d
 182 52,55d
 183 37,38c
 184         break;
 185 .
 186 diff -re crt/src/nothrownew.cpp crt-sp1/src/nothrownew.cpp
 187 37a
 188 #endif
 189 .
 190 31a
 191 #if 1
 192         break;
 193 #else
 194
 195 .
 196 diff -re crt/src/tidtable.c crt-sp1/src/tidtable.c
 197 393,394d