From 5da918b48dd42281da74ca0c84a962c89d4d1430 Mon Sep 17 00:00:00 2001 From: Frank Barchard Date: Fri, 16 Sep 2016 16:46:46 -0700 Subject: [PATCH] Enable NEON for unittests on ios 64 bit. TBR=kjellander@chromium.org BUG=libyuv:637, chromium:646279 Review URL: https://codereview.chromium.org/2340933005 . --- BUILD.gn | 7 ------- README.chromium | 2 +- include/libyuv/version.h | 2 +- libyuv_test.gyp | 11 ----------- 4 files changed, 2 insertions(+), 20 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index e309e803d..e2deffafa 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -182,9 +182,6 @@ if (libyuv_include_tests) { if (is_linux) { cflags = [ "-fexceptions" ] } - if (is_ios && target_cpu=="arm64") { - defines += [ "LIBYUV_DISABLE_NEON" ] - } if (is_ios) { configs -= [ "//build/config/compiler:default_symbols" ] configs += [ "//build/config/compiler:symbols" ] @@ -246,10 +243,6 @@ if (libyuv_include_tests) { ] deps = [ ":libyuv" ] - if (is_ios && target_cpu=="arm64") { - # TODO(fbarchard): Enable Neon. See https://crbug.com/646279 - defines = [ "LIBYUV_DISABLE_NEON" ] - } if (!is_ios && !libyuv_disable_jpeg) { defines = [ "HAVE_JPEG" ] } diff --git a/README.chromium b/README.chromium index 09d3466da..4444121db 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1618 +Version: 1619 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 265ac6e46..cee982737 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -11,6 +11,6 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #define INCLUDE_LIBYUV_VERSION_H_ -#define LIBYUV_VERSION 1618 +#define LIBYUV_VERSION 1619 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/libyuv_test.gyp b/libyuv_test.gyp index 6994b6e6f..b8ceca1f2 100644 --- a/libyuv_test.gyp +++ b/libyuv_test.gyp @@ -52,11 +52,6 @@ '-fexceptions', ], }], - [ 'OS == "ios" and target_subarch == 64', { - 'defines': [ - 'LIBYUV_DISABLE_NEON' - ], - }], [ 'OS == "ios"', { 'xcode_settings': { 'DEBUGGING_SYMBOLS': 'YES', @@ -151,12 +146,6 @@ 'libyuv.gyp:libyuv', ], 'conditions': [ - [ 'OS == "ios" and target_subarch == 64', { - 'defines': [ - 'LIBYUV_DISABLE_NEON' - ], - }], - [ 'OS != "ios" and libyuv_disable_jpeg != 1', { 'defines': [ 'HAVE_JPEG',