diff options
| author | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-18 13:47:44 +0000 |
|---|---|---|
| committer | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-18 13:47:44 +0000 |
| commit | 19d81be80dec350f85e6beb21845203179eb34f2 (patch) | |
| tree | c91367b1714362f0125c4c37c299e7eca3d9fb41 /base/allocator | |
| parent | 68e2c8bd1effcbd87ddd166b6053706479a49c5e (diff) | |
| download | chromium_src-19d81be80dec350f85e6beb21845203179eb34f2.zip chromium_src-19d81be80dec350f85e6beb21845203179eb34f2.tar.gz chromium_src-19d81be80dec350f85e6beb21845203179eb34f2.tar.bz2 | |
Merged third_party/tcmalloc/vendor/src(google-perftools r87) into
third_party/tcmalloc/chromium/src.
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=41938
Review URL: http://codereview.chromium.org/576001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41950 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/allocator')
| -rw-r--r-- | base/allocator/allocator.gyp | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp index e4307cc..0734d2e 100644 --- a/base/allocator/allocator.gyp +++ b/base/allocator/allocator.gyp @@ -145,12 +145,10 @@ '<(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', @@ -186,10 +184,6 @@ # 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. @@ -291,9 +285,8 @@ '<(tcmalloc_dir)/src/system-alloc.cc', '<(tcmalloc_dir)/src/system-alloc.h', - # don't use linux forked version - '<(tcmalloc_dir)/src/tcmalloc_linux.cc', - '<(tcmalloc_dir)/src/symbolize_linux.cc', + # included by allocator_shim.cc + '<(tcmalloc_dir)/src/tcmalloc.cc', # heap-profiler/checker/cpuprofiler '<(tcmalloc_dir)/src/base/thread_lister.c', @@ -327,17 +320,6 @@ '<(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', |