From 44b8fd363e6562d7a8c17de60d78dd2e1586a338 Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Tue, 28 Oct 2014 23:15:16 +0000 Subject: [PATCH] Pass neon option to assembler but not the compiler. Step 1 of unifying the two libraries back into one. BUG=371 TESTED=local ios builds ignore the option, but still work. R=brucedawson@google.com, harryjin@google.com Review URL: https://webrtc-codereview.appspot.com/31719004 git-svn-id: http://libyuv.googlecode.com/svn/trunk@1145 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/version.h | 2 +- libyuv.gyp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.chromium b/README.chromium index cc5b60fa6..11542fdef 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1143 +Version: 1145 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 3852d2aec..7b4abbfb5 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 1143 +#define LIBYUV_VERSION 1145 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/libyuv.gyp b/libyuv.gyp index 3f06d4193..ac0bf842f 100644 --- a/libyuv.gyp +++ b/libyuv.gyp @@ -57,7 +57,7 @@ # arm64 does not need -mfpu=neon option as neon is not optional ['target_arch != "arm64"', { 'cflags': [ - '-mfpu=neon', + '-Wa,-mfpu=neon', ], }], ],