From 824d9071d7577c649d9e30fa9b2fe71a8becbe4a Mon Sep 17 00:00:00 2001 From: "ashok.bhat@gmail.com" Date: Mon, 29 Sep 2014 09:40:37 +0000 Subject: [PATCH] Remove __ARM_NEON__ define check for AArch64 BUG=319 TESTED=local build R=fbarchard@google.com Review URL: https://webrtc-codereview.appspot.com/28569005 git-svn-id: http://libyuv.googlecode.com/svn/trunk@1095 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/version.h | 2 +- source/rotate_neon64.cc | 3 +-- source/row_neon64.cc | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/README.chromium b/README.chromium index 00d9c84ac..528babe92 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1093 +Version: 1095 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 72b9f46bb..8ad492485 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 1093 +#define LIBYUV_VERSION 1095 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/rotate_neon64.cc b/source/rotate_neon64.cc index 0b336b811..d54378ec8 100644 --- a/source/rotate_neon64.cc +++ b/source/rotate_neon64.cc @@ -18,8 +18,7 @@ extern "C" { #endif // This module is for GCC Neon armv8 64 bit. -#if !defined(LIBYUV_DISABLE_NEON) && \ - defined(__ARM_NEON__) && defined(__aarch64__) +#if !defined(LIBYUV_DISABLE_NEON) && defined(__aarch64__) static uvec8 kVTbl4x4Transpose = { 0, 4, 8, 12, 1, 5, 9, 13, 2, 6, 10, 14, 3, 7, 11, 15 }; diff --git a/source/row_neon64.cc b/source/row_neon64.cc index 7a153e18c..cbb234412 100644 --- a/source/row_neon64.cc +++ b/source/row_neon64.cc @@ -16,8 +16,7 @@ extern "C" { #endif // This module is for GCC Neon armv8 64 bit. -#if !defined(LIBYUV_DISABLE_NEON) && \ - defined(__ARM_NEON__) && defined(__aarch64__) +#if !defined(LIBYUV_DISABLE_NEON) && defined(__aarch64__) // Read 8 Y, 4 U and 4 V from 422 #define READYUV422 \