Revert 41938 - Merged third_party/tcmalloc/vendor/src(googleperftools r87) in...

base/allocator/allocator.gyp

 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'jemalloc_dir': '../../third_party/jemalloc/chromium',
     'tcmalloc_dir': '../../third_party/tcmalloc/chromium',
   },
   'targets': [
@@ skipping 127 matching lines @@
         '<(tcmalloc_dir)/src/stacktrace_libunwind-inl.h',
         '<(tcmalloc_dir)/src/stacktrace_powerpc-inl.h',
         '<(tcmalloc_dir)/src/stacktrace_win32-inl.h',
         '<(tcmalloc_dir)/src/stacktrace_with_context.cc',
         '<(tcmalloc_dir)/src/stacktrace_x86-inl.h',
         '<(tcmalloc_dir)/src/stacktrace_x86_64-inl.h',
         '<(tcmalloc_dir)/src/static_vars.cc',
         '<(tcmalloc_dir)/src/static_vars.h',
         '<(tcmalloc_dir)/src/symbolize.cc',
         '<(tcmalloc_dir)/src/symbolize.h',
+        '<(tcmalloc_dir)/src/symbolize_linux.cc',
         '<(tcmalloc_dir)/src/system-alloc.cc',
         '<(tcmalloc_dir)/src/system-alloc.h',
         '<(tcmalloc_dir)/src/tcmalloc.cc',
         '<(tcmalloc_dir)/src/tcmalloc_guard.h',
+        '<(tcmalloc_dir)/src/tcmalloc_linux.cc',
         '<(tcmalloc_dir)/src/thread_cache.cc',
         '<(tcmalloc_dir)/src/thread_cache.h',
         '<(tcmalloc_dir)/src/windows/config.h',
         '<(tcmalloc_dir)/src/windows/get_mangled_names.cc',
         '<(tcmalloc_dir)/src/windows/google/tcmalloc.h',
         '<(tcmalloc_dir)/src/windows/ia32_modrm_map.cc',
         '<(tcmalloc_dir)/src/windows/ia32_opcode_map.cc',
         '<(tcmalloc_dir)/src/windows/mingw.h',
         '<(tcmalloc_dir)/src/windows/mini_disassembler.cc',
         '<(tcmalloc_dir)/src/windows/mini_disassembler.h',
@@ skipping 15 matching lines @@
 
         'allocator_shim.cc',
         'generic_allocators.cc',
         'win_allocator.cc',        
       ],
       # sources! means that these are not compiled directly.
       'sources!': [
         # Included by allocator_shim.cc for maximal inlining.
         'generic_allocators.cc',
         'win_allocator.cc',
+        '<(tcmalloc_dir)/src/tcmalloc.cc',
+
+        # Unneeded on Windows, symbolize_linux.cc used there instead.
+        '<(tcmalloc_dir)/src/symbolize.cc',
 
         # We simply don't use these, but list them above so that IDE
         # users can view the full available source for reference, etc.
         '<(tcmalloc_dir)/src/addressmap-inl.h',
         '<(tcmalloc_dir)/src/base/atomicops-internals-linuxppc.h',
         '<(tcmalloc_dir)/src/base/atomicops-internals-macosx.h',
         '<(tcmalloc_dir)/src/base/atomicops-internals-x86-msvc.h',
         '<(tcmalloc_dir)/src/base/atomicops-internals-x86.cc',
         '<(tcmalloc_dir)/src/base/atomicops-internals-x86.h',
         '<(tcmalloc_dir)/src/base/atomicops.h',
@@ skipping 81 matching lines @@
             '<(tcmalloc_dir)/src/base/linuxthreads.cc',
             '<(tcmalloc_dir)/src/base/linuxthreads.h',
             '<(tcmalloc_dir)/src/base/vdso_support.cc',
             '<(tcmalloc_dir)/src/base/vdso_support.h',
             '<(tcmalloc_dir)/src/maybe_threads.cc',
             '<(tcmalloc_dir)/src/maybe_threads.h',
             '<(tcmalloc_dir)/src/symbolize.h',
             '<(tcmalloc_dir)/src/system-alloc.cc',
             '<(tcmalloc_dir)/src/system-alloc.h',
 
-            # included by allocator_shim.cc
-            '<(tcmalloc_dir)/src/tcmalloc.cc',
+            # don't use linux forked version
+            '<(tcmalloc_dir)/src/tcmalloc_linux.cc',
+            '<(tcmalloc_dir)/src/symbolize_linux.cc',
 
             # heap-profiler/checker/cpuprofiler
             '<(tcmalloc_dir)/src/base/thread_lister.c',
             '<(tcmalloc_dir)/src/base/thread_lister.h',
             '<(tcmalloc_dir)/src/heap-checker-bcad.cc',
             '<(tcmalloc_dir)/src/heap-checker.cc',
             '<(tcmalloc_dir)/src/heap-profiler.cc',
             '<(tcmalloc_dir)/src/memory_region_map.cc',
             '<(tcmalloc_dir)/src/memory_region_map.h',
             '<(tcmalloc_dir)/src/profiledata.cc',
@@ skipping 13 matching lines @@
             'allocator_shim.cc',
 
             # TODO(willchan): support jemalloc on other platforms
             # jemalloc files
             '<(jemalloc_dir)/jemalloc.c',
             '<(jemalloc_dir)/jemalloc.h',
             '<(jemalloc_dir)/ql.h',
             '<(jemalloc_dir)/qr.h',
             '<(jemalloc_dir)/rb.h',
 
+            # TODO(willchan):  Return to using this when page_heap_linux.cc
+            # becomes unnecessary.
+            '<(tcmalloc_dir)/src/page_heap.cc',
+          ],
+          # TODO(willchan):  This is actually just a branched copy of the
+          # vanilla upstream page_heap.cc.  The current forked copy of
+          # page_heap.cc has Windows-specific code in it so Linux can't
+          # use it.  These need to be refactored so we can track changes
+          # to the upstream page_heap.cc without duplication.
+          'sources': [
+            '<(tcmalloc_dir)/src/page_heap_linux.cc',
           ],
           'cflags!': [
             '-fvisibility=hidden',
           ],
           'link_settings': {
             'ldflags': [
               # Don't let linker rip this symbol out, otherwise the heap&cpu
               # profilers will not initialize properly on startup.
               '-Wl,-uIsHeapProfilerRunning,-uProfilerStart',
               # Do the same for heap leak checker.
@@ skipping 50 matching lines @@
       ],
     }],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: