diff options
| author | qsr@chromium.org <qsr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-27 14:02:48 +0000 |
|---|---|---|
| committer | qsr@chromium.org <qsr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-27 14:02:48 +0000 |
| commit | c45dbc5945a981ffbd0d456828a9821084864474 (patch) | |
| tree | 0cee4a9c65858dc76d05473055fb4b477f28fa9b | |
| parent | 06bfeb157934377f724162b439406c642b81c08a (diff) | |
| download | chromium_src-c45dbc5945a981ffbd0d456828a9821084864474.zip chromium_src-c45dbc5945a981ffbd0d456828a9821084864474.tar.gz chromium_src-c45dbc5945a981ffbd0d456828a9821084864474.tar.bz2 | |
Never instrument the crazy linker.
We are not interested in computing an order file for the crazy linker. This CL ensures that we never try to instrument it.
R=mariakhomenko@chromium.org, pliard@chromium.org, thakis@chromium.org
Review URL: https://codereview.chromium.org/292123008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272967 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | base/base.gyp | 4 | ||||
| -rw-r--r-- | build/common.gypi | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/base/base.gyp b/base/base.gyp index b0d27be..df8c21b 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -1415,6 +1415,10 @@ 'sources': [ 'android/linker/linker_jni.cc', ], + # The crazy linker is never instrumented. + 'cflags!': [ + '-finstrument-functions', + ], 'dependencies': [ '<(android_ndk_root)/crazy_linker.gyp:crazy_linker', ], diff --git a/build/common.gypi b/build/common.gypi index 06c6016..95f1cbb 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -3918,7 +3918,9 @@ }], ['order_profiling!=0 and (chromeos==1 or OS=="linux" or OS=="android")', { 'target_conditions' : [ - ['_toolset=="target"', { + # crazy_linker has an upstream gyp file we can't edit, and we + # don't want to instrument it. + ['_toolset=="target" and _target_name!="crazy_linker"', { 'cflags': [ '-finstrument-functions', # Allow mmx intrinsics to inline, so that the |