1# HG changeset patch 2# User Randell Jesup <rjesup@jesup.org> 3# Parent 260ab5c93e30a3d90f10ac30a15edf36fb0f03e9 4 5diff --git a/media/libyuv/libyuv/include/libyuv/row.h b/media/libyuv/libyuv/include/libyuv/row.h 6--- a/media/libyuv/libyuv/include/libyuv/row.h 7+++ b/media/libyuv/libyuv/include/libyuv/row.h 8@@ -154,18 +154,19 @@ extern "C" { 9 #define HAS_SOBELROW_SSE2 10 #define HAS_SOBELTOPLANEROW_SSE2 11 #define HAS_SOBELXROW_SSE2 12 #define HAS_SOBELXYROW_SSE2 13 #define HAS_SOBELYROW_SSE2 14 15 // The following functions fail on gcc/clang 32 bit with fpic and framepointer. 16 // caveat: clangcl uses row_win.cc which works. 17-#if defined(__x86_64__) || !defined(__pic__) || defined(__clang__) || \ 18- defined(_MSC_VER) 19+#if !defined(MOZ_PROFILING) && \ 20+ (defined(__x86_64__) || !defined(__pic__) || defined(__clang__) || \ 21+ defined(_MSC_VER)) 22 // TODO(fbarchard): fix build error on android_full_debug=1 23 // https://code.google.com/p/libyuv/issues/detail?id=517 24 #define HAS_I422ALPHATOARGBROW_SSSE3 25 #endif 26 #endif 27 28 // The following are available on all x86 platforms, but 29 // require VS2012, clang 3.4 or gcc 4.7. 30@@ -215,18 +216,19 @@ extern "C" { 31 // Effects: 32 #define HAS_ARGBADDROW_AVX2 33 #define HAS_ARGBATTENUATEROW_AVX2 34 #define HAS_ARGBMULTIPLYROW_AVX2 35 #define HAS_ARGBSUBTRACTROW_AVX2 36 #define HAS_ARGBUNATTENUATEROW_AVX2 37 #define HAS_BLENDPLANEROW_AVX2 38 39-#if defined(__x86_64__) || !defined(__pic__) || defined(__clang__) || \ 40- defined(_MSC_VER) 41+#if !defined(MOZ_PROFILING) && \ 42+ (defined(__x86_64__) || !defined(__pic__) || defined(__clang__) || \ 43+ defined(_MSC_VER)) 44 // TODO(fbarchard): fix build error on android_full_debug=1 45 // https://code.google.com/p/libyuv/issues/detail?id=517 46 #define HAS_I422ALPHATOARGBROW_AVX2 47 #endif 48 #endif 49 50 // The following are available for AVX2 Visual C and clangcl 32 bit: 51 // TODO(fbarchard): Port to gcc. 52