Branch new tcmalloc_linux.cc into new chromium\src branch. Update new...

base/allocator/allocator.gyp

Index: base/allocator/allocator.gyp
===================================================================
--- base/allocator/allocator.gyp	(revision 33043)
+++ base/allocator/allocator.gyp	(working copy)
@@ -103,6 +103,7 @@
         '<(tcmalloc_dir)/src/system-alloc.cc',
         '<(tcmalloc_dir)/src/system-alloc.h',
         '<(tcmalloc_dir)/src/tcmalloc.cc',
+        '<(tcmalloc_dir)/src/tcmalloc_linux.cc',
 
         # heap-profiler/checker/cpuprofiler
         '<(tcmalloc_dir)/src/base/thread_lister.c',
@@ -181,6 +182,9 @@
             '<(tcmalloc_dir)/src/system-alloc.cc',
             '<(tcmalloc_dir)/src/system-alloc.h',
 
+            # don't use linux forked version
+            '<(tcmalloc_dir)/src/tcmalloc_linux.cc',
+
             # heap-profiler/checker/cpuprofiler
             '<(tcmalloc_dir)/src/base/thread_lister.c',
             '<(tcmalloc_dir)/src/base/thread_lister.h',
Property changes on: base\allocator\allocator.gyp
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/base/allocator/allocator.gyp:r69-2775
   Merged /trunk/src/third_party/tcmalloc/tcmalloc.gyp:r33010