diff options
| -rw-r--r-- | build/common.gypi | 3 | ||||
| -rw-r--r-- | media/media.gyp | 14 | ||||
| -rw-r--r-- | skia/skia.gyp | 28 |
3 files changed, 3 insertions, 42 deletions
diff --git a/build/common.gypi b/build/common.gypi index 2f6316b..fcf7857 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -2548,6 +2548,9 @@ ['_toolset=="target"', { 'cflags': [ '-finstrument-functions', + # Allow mmx intrinsics to inline, so that the + # compiler can expand the intrinsics. + '-finstrument-functions-exclude-file-list=mmintrin.h', ], }], ], diff --git a/media/media.gyp b/media/media.gyp index e7ca958..51a8f17 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -810,13 +810,6 @@ '..', ], 'conditions': [ - ['order_profiling != 0', { - 'target_conditions' : [ - ['_toolset=="target"', { - 'cflags!': [ '-finstrument-functions' ], - }], - ], - }], [ 'target_arch == "ia32" or target_arch == "x64"', { 'dependencies': [ 'yuv_convert_simd_x86', @@ -864,13 +857,6 @@ 'base/simd/yuv_to_rgb_table.h', ], 'conditions': [ - ['order_profiling != 0', { - 'target_conditions' : [ - ['_toolset=="target"', { - 'cflags!': [ '-finstrument-functions' ], - }], - ], - }], [ 'target_arch == "x64"', { # Source files optimized for X64 systems. 'sources': [ diff --git a/skia/skia.gyp b/skia/skia.gyp index 9af8e01..58eb437 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -283,13 +283,6 @@ ], }, }], - ['order_profiling != 0', { - 'target_conditions' : [ - ['_toolset=="target"', { - 'cflags!': [ '-finstrument-functions' ], - }], - ], - }], #Settings for text blitting, chosen to approximate the system browser. [ 'OS == "linux"', { 'defines': [ @@ -665,13 +658,6 @@ '../third_party/skia/src/core', ], 'conditions': [ - ['order_profiling != 0', { - 'target_conditions' : [ - ['_toolset=="target"', { - 'cflags!': [ '-finstrument-functions' ], - }], - ], - }], [ 'os_posix == 1 and OS != "mac" and OS != "android" and target_arch != "arm"', { 'cflags': [ '-msse2', @@ -700,13 +686,6 @@ }, { # arm 'conditions': [ - ['order_profiling != 0', { - 'target_conditions' : [ - ['_toolset=="target"', { - 'cflags!': [ '-finstrument-functions' ], - }], - ], - }], [ 'armv7 == 1', { 'defines': [ '__ARM_ARCH__=7', @@ -791,13 +770,6 @@ '-mssse3', ], }], - ['order_profiling != 0', { - 'target_conditions' : [ - ['_toolset=="target"', { - 'cflags!': [ '-finstrument-functions' ], - }], - ], - }], [ 'OS == "mac"', { 'xcode_settings': { 'GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS': 'YES', |