Backed out changeset 24ebb285aff3 (bug 1284803)

iaxat · Jul 26, 2016 · b889b2f · b889b2f
1 parent fdcdf41
commit b889b2f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/media/libyuv/include/libyuv/row.h b/media/libyuv/include/libyuv/row.h
@@ -194,8 +194,8 @@ extern "C" {
 // The following are available on all x86 platforms, but
 // require VS2012, clang 3.4 or gcc 4.7.
 // The code supports NaCL but requires a new compiler and validator.
-#if !defined(LIBYUV_DISABLE_AVX2) && !defined(LIBYUV_DISABLE_X86) &&    \
-    (defined(VISUALC_HAS_AVX2) || defined(CLANG_HAS_AVX2) || defined(GCC_HAS_AVX2))
+#if !defined(LIBYUV_DISABLE_X86) && (defined(VISUALC_HAS_AVX2) || \
+    defined(CLANG_HAS_AVX2) || defined(GCC_HAS_AVX2))
 #define HAS_ARGBCOPYALPHAROW_AVX2
 #define HAS_ARGBCOPYYTOALPHAROW_AVX2
 #define HAS_ARGBMIRRORROW_AVX2

diff --git a/media/libyuv/libyuv.gyp b/media/libyuv/libyuv.gyp
@@ -26,7 +26,6 @@
     # Link-Time Optimizations.
     'use_lto%': 0,
     'yuv_disable_asm%': 0,
-    'yuv_disable_avx2%': 0,
     'build_neon': 0,
     'conditions': [
        ['(target_arch == "armv7" or target_arch == "armv7s" or \
@@ -90,11 +89,6 @@
             'LIBYUV_DISABLE_MIPS',
           ],
         }],
-        [ 'yuv_disable_avx2 == 1', {
-          'defines': [
-            'LIBYUV_DISABLE_AVX2',
-          ]
-        }],
         ['build_with_mozilla == 1', {
           'defines': [
             'HAVE_JPEG'
@@ -133,8 +127,6 @@
         # 'LIBYUV_DISABLE_X86',
         # 'LIBYUV_DISABLE_NEON',
         # 'LIBYUV_DISABLE_MIPS',
-        # This disables AVX2 (Haswell) support, overriding compiler checks
-        # 'LIBYUV_DISABLE_AVX2',
         # Enable the following macro to build libyuv as a shared library (dll).
         # 'LIBYUV_USING_SHARED_LIBRARY',
         # TODO(fbarchard): Make these into gyp defines.