Bug 1284803 part 11 - Fix build failure of Android 4.2 x86 opt r=jrmuizel
authorSotaro Ikeda <sotaro.ikeda.g@gmail.com>
Tue, 12 Jul 2016 23:04:33 -0700
changeset 387135 08d2e46308fd99649a387648ea3d4e1e96979ce4
parent 387134 6bacfaadbc29469d8cf18cfcadb9470be613e603
child 387136 80468414501ef098dcf913b1e25361f4c52e82c7
push id22898
push userCallek@gmail.com
push dateWed, 13 Jul 2016 13:20:13 +0000
reviewersjrmuizel
bugs1284803
milestone50.0a1
Bug 1284803 part 11 - Fix build failure of Android 4.2 x86 opt r=jrmuizel
media/libyuv/include/libyuv/row.h
--- a/media/libyuv/include/libyuv/row.h
+++ b/media/libyuv/include/libyuv/row.h
@@ -175,17 +175,17 @@ extern "C" {
 #define HAS_SOBELROW_SSE2
 #define HAS_SOBELTOPLANEROW_SSE2
 #define HAS_SOBELXROW_SSE2
 #define HAS_SOBELXYROW_SSE2
 #define HAS_SOBELYROW_SSE2
 
 // The following functions fail on gcc/clang 32 bit with fpic and framepointer.
 // caveat: clangcl uses row_win.cc which works.
-#if defined(NDEBUG) || !(defined(_DEBUG) && defined(__i386__)) || \
+#if !((defined(_DEBUG) || defined(MOZ_PROFILING)) && defined(__i386__)) || \
     !defined(__i386__) || defined(_MSC_VER)
 // TODO(fbarchard): fix build error on x86 debug
 // https://code.google.com/p/libyuv/issues/detail?id=524
 #define HAS_I411TOARGBROW_SSSE3
 // TODO(fbarchard): fix build error on android_full_debug=1
 // https://code.google.com/p/libyuv/issues/detail?id=517
 #define HAS_I422ALPHATOARGBROW_SSSE3
 #endif
@@ -204,17 +204,17 @@ extern "C" {
 #define HAS_ARGBTORGB565DITHERROW_AVX2
 #define HAS_ARGBTOUVJROW_AVX2
 #define HAS_ARGBTOUVROW_AVX2
 #define HAS_ARGBTOYJROW_AVX2
 #define HAS_ARGBTOYROW_AVX2
 #define HAS_COPYROW_AVX
 #define HAS_H422TOARGBROW_AVX2
 #define HAS_I400TOARGBROW_AVX2
-#if !(defined(_DEBUG) && defined(__i386__))
+#if !((defined(_DEBUG) || defined(MOZ_PROFILING)) && defined(__i386__))
 // TODO(fbarchard): fix build error on android_full_debug=1
 // https://code.google.com/p/libyuv/issues/detail?id=517
 #define HAS_I422ALPHATOARGBROW_AVX2
 #endif
 #define HAS_I411TOARGBROW_AVX2
 #define HAS_I422TOARGB1555ROW_AVX2
 #define HAS_I422TOARGB4444ROW_AVX2
 #define HAS_I422TOARGBROW_AVX2