Merge google-perftools r109 (the current contents of third_party/tcmalloc/vendor)

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 31 matching lines @@
       'sources': [
         # Generated for our configuration from tcmalloc's build
         # and checked in.
         '<(tcmalloc_dir)/src/config.h',
         '<(tcmalloc_dir)/src/config_linux.h',
         '<(tcmalloc_dir)/src/config_win.h',
 
         # all tcmalloc native and forked files
         '<(tcmalloc_dir)/src/addressmap-inl.h',
         '<(tcmalloc_dir)/src/base/atomicops-internals-linuxppc.h',
+        '<(tcmalloc_dir)/src/base/arm_instruction_set_select.h',
+        '<(tcmalloc_dir)/src/base/atomicops-internals-arm-gcc.h',
+        '<(tcmalloc_dir)/src/base/atomicops-internals-arm-generic.h',
+        '<(tcmalloc_dir)/src/base/atomicops-internals-arm-v6plus.h',
         '<(tcmalloc_dir)/src/base/atomicops-internals-macosx.h',
-        '<(tcmalloc_dir)/src/base/atomicops-internals-x86-msvc.h',
+        '<(tcmalloc_dir)/src/base/atomicops-internals-windows.h',
         '<(tcmalloc_dir)/src/base/atomicops-internals-x86.cc',
         '<(tcmalloc_dir)/src/base/atomicops-internals-x86.h',
         '<(tcmalloc_dir)/src/base/atomicops.h',
         '<(tcmalloc_dir)/src/base/basictypes.h',
         '<(tcmalloc_dir)/src/base/commandlineflags.h',
         '<(tcmalloc_dir)/src/base/cycleclock.h',
         # We don't list dynamic_annotations.c since its copy is already
         # present in the dynamic_annotations target.
         '<(tcmalloc_dir)/src/base/dynamic_annotations.h',
         '<(tcmalloc_dir)/src/base/elfcore.h',
         '<(tcmalloc_dir)/src/base/googleinit.h',
         '<(tcmalloc_dir)/src/base/linux_syscall_support.h',
         '<(tcmalloc_dir)/src/base/linuxthreads.cc',
         '<(tcmalloc_dir)/src/base/linuxthreads.h',
         '<(tcmalloc_dir)/src/base/logging.cc',
         '<(tcmalloc_dir)/src/base/logging.h',
         '<(tcmalloc_dir)/src/base/low_level_alloc.cc',
         '<(tcmalloc_dir)/src/base/low_level_alloc.h',
         '<(tcmalloc_dir)/src/base/simple_mutex.h',
         '<(tcmalloc_dir)/src/base/spinlock.cc',
         '<(tcmalloc_dir)/src/base/spinlock.h',
+        '<(tcmalloc_dir)/src/base/spinlock_internal.cc',
+        '<(tcmalloc_dir)/src/base/spinlock_internal.h',
         '<(tcmalloc_dir)/src/base/spinlock_linux-inl.h',
         '<(tcmalloc_dir)/src/base/spinlock_posix-inl.h',
         '<(tcmalloc_dir)/src/base/spinlock_win32-inl.h',
         '<(tcmalloc_dir)/src/base/stl_allocator.h',
+        '<(tcmalloc_dir)/src/base/src/synchronization_profiling.h',
         '<(tcmalloc_dir)/src/base/sysinfo.cc',
         '<(tcmalloc_dir)/src/base/sysinfo.h',
         '<(tcmalloc_dir)/src/base/thread_annotations.h',
         '<(tcmalloc_dir)/src/base/thread_lister.c',
         '<(tcmalloc_dir)/src/base/thread_lister.h',
         '<(tcmalloc_dir)/src/base/vdso_support.cc',
         '<(tcmalloc_dir)/src/base/vdso_support.h',
         '<(tcmalloc_dir)/src/central_freelist.cc',
         '<(tcmalloc_dir)/src/central_freelist.h',
         '<(tcmalloc_dir)/src/common.cc',
@@ skipping 189 matching lines @@
             '<(tcmalloc_dir)/src/windows',
           ],
           'sources!': [
             '<(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',
 
             # 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',
@@ skipping 87 matching lines @@
         '../../testing/gtest.gyp:gtest',
       ],
       'include_dirs': [
         '.',
         '<(tcmalloc_dir)/src/base',
         '<(tcmalloc_dir)/src',
         '../..',
       ],
       'msvs_guid': 'E99DA267-BE90-4F45-1294-6919DB2C9999',
       'sources': [
-        'unittest_utils.cc',
         'allocator_unittests.cc',
       ],
     },
   ],
   'conditions': [
     ['OS=="win"', {
       'targets': [
         {
           'target_name': 'libcmt',
           'type': 'none',
@@ skipping 17 matching lines @@
       ],
     }],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: