Commit cd52054c authored by fbarchard@google.com's avatar fbarchard@google.com

Disable assembly for x64 nacl.

BUG=253
TESTED=untested
R=mflodman@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/1857004

git-svn-id: http://libyuv.googlecode.com/svn/trunk@738 16f28f9a-4ce2-e073-06de-1de4eb20be90
parent c004bda5
Name: libyuv
URL: http://code.google.com/p/libyuv/
Version: 737
Version: 738
License: BSD
License File: LICENSE
......
......@@ -27,7 +27,8 @@ extern "C" {
#define IS_ALIGNED(p, a) (!((uintptr_t)(p) & ((a) - 1)))
#if defined(__CLR_VER) || defined(COVERAGE_ENABLED) || \
defined(TARGET_IPHONE_SIMULATOR)
defined(TARGET_IPHONE_SIMULATOR) || \
defined(__native_client__) && defined(__x86_64__)
#define LIBYUV_DISABLE_X86
#endif
// True if compiling for SSSE3 as a requirement.
......
......@@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
#define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 737
#define LIBYUV_VERSION 738
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment