diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-21 18:03:42 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-21 18:03:42 +0000 |
| commit | 772602e4b632cb947b616c4bf48265dd8790ee2e (patch) | |
| tree | a28a108b09d5f5b305b272a152248859ec093d3e | |
| parent | d95a570dba12fe3e7b10bc8c877111b10180ea30 (diff) | |
| download | chromium_src-772602e4b632cb947b616c4bf48265dd8790ee2e.zip chromium_src-772602e4b632cb947b616c4bf48265dd8790ee2e.tar.gz chromium_src-772602e4b632cb947b616c4bf48265dd8790ee2e.tar.bz2 | |
Revert 47897 - Linux: Add libunwind as a dependency of tcmalloc in 64 bit mode.
Based on willchan's patch here: http://codereview.chromium.org/2109009/show
BUG=40149
TEST=none
TBR=willchan
Review URL: http://codereview.chromium.org/2137010
TBR=thestig@chromium.org
Review URL: http://codereview.chromium.org/2107016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47933 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 3 | ||||
| -rw-r--r-- | base/allocator/allocator.gyp | 24 | ||||
| -rw-r--r-- | build/all.gyp | 9 |
3 files changed, 4 insertions, 32 deletions
@@ -230,9 +230,6 @@ deps_os = { "src/third_party/swig/linux": "/trunk/deps/third_party/swig/linux@" + Var("swig_revision"), - - "src/third_party/libunwind": - "/trunk/deps/third_party/libunwind@47716", }, } diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp index 20e96d7..d3ab4a9 100644 --- a/base/allocator/allocator.gyp +++ b/base/allocator/allocator.gyp @@ -1,4 +1,4 @@ -# 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. @@ -178,7 +178,7 @@ 'allocator_shim.cc', 'generic_allocators.cc', - 'win_allocator.cc', + 'win_allocator.cc', ], # sources! means that these are not compiled directly. 'sources!': [ @@ -224,6 +224,7 @@ '<(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', @@ -283,7 +284,6 @@ '<(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', @@ -339,24 +339,6 @@ '-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!': [ diff --git a/build/all.gyp b/build/all.gyp index a77e2c0..8e7c5de 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -1,4 +1,4 @@ -# 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. @@ -83,13 +83,6 @@ '../tools/xdisplaycheck/xdisplaycheck.gyp:*', '../net/third_party/nss/nss.gyp:*', ], - 'conditions': [ - ['target_arch=="x64"', { - 'dependencies': [ - '../third_party/libunwind/libunwind.gyp:*', - ], - }], - ], }], ['OS=="win"', { 'conditions': [ |