Revert 47897 - Linux: Add libunwind as a dependency of tcmalloc in 64 bit mod...

base/allocator/allocator.gyp

-# Copyright (c) 2010 The Chromium Authors. All rights reserved.
+# 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 159 matching lines @@
 
         # jemalloc files
         '<(jemalloc_dir)/jemalloc.c',
         '<(jemalloc_dir)/jemalloc.h',
         '<(jemalloc_dir)/ql.h',
         '<(jemalloc_dir)/qr.h',
         '<(jemalloc_dir)/rb.h',
 
         'allocator_shim.cc',
         'generic_allocators.cc',
-        'win_allocator.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',
 
         # 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',
@@ skipping 25 matching lines @@
         '<(tcmalloc_dir)/src/google/stacktrace.h',
         '<(tcmalloc_dir)/src/memfs_malloc.cc',
         '<(tcmalloc_dir)/src/packed-cache-inl.h',
         '<(tcmalloc_dir)/src/page_heap_allocator.h',
         '<(tcmalloc_dir)/src/pagemap.h',
         '<(tcmalloc_dir)/src/stacktrace_config.h',
         '<(tcmalloc_dir)/src/stacktrace_generic-inl.h',
         '<(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/tcmalloc_guard.h',
         '<(tcmalloc_dir)/src/windows/config.h',
         '<(tcmalloc_dir)/src/windows/google/tcmalloc.h',
         '<(tcmalloc_dir)/src/windows/get_mangled_names.cc',
         '<(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',
@@ skipping 39 matching lines @@
           'include_dirs': [
             '<(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/stacktrace_with_context.cc',
             '<(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',
@@ skipping 35 matching lines @@
           ],
           '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.
               '-Wl,-u_Z21InitialMallocHook_NewPKvj,-u_Z22InitialMallocHook_MMapPKvS0_jiiix,-u_Z22InitialMallocHook_SbrkPKvi',
               '-Wl,-u_Z21InitialMallocHook_NewPKvm,-u_Z22InitialMallocHook_MMapPKvS0_miiil,-u_Z22InitialMallocHook_SbrkPKvl',
           ]},
-          'conditions': [
-            # In 64 bit mode, use libunwind to get stacktraces in TCMalloc if we
-            # don't have the frame pointer.
-            # gcc will disable the frame pointer for O2 optimized 64 bit build.
-            [ 'target_arch=="x64"', {
-              'configurations': {
-                'Release_Base': {
-                  'defines': [
-                    'NO_FRAME_POINTER',
-                    'HAVE_LIBUNWIND_H=1',
-                  ],
-                },
-              },
-              'dependencies': [
-                '../../third_party/libunwind/libunwind.gyp:libunwind',
-              ],
-            }],
-          ],
         }],
         [ 'linux_use_debugallocation==1', {
           'sources!': [
             # debugallocation.cc #includes tcmalloc.cc,
             # so only one of them should be used.
             '<(tcmalloc_dir)/src/tcmalloc.cc',
           ],
           'cflags': [
             '-DTCMALLOC_FOR_DEBUGALLOCATION',
           ],
@@ skipping 61 matching lines @@
       ],
     }],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: