diff options
| author | Frank Barchard <fbarchard@google.com> | 2018-01-09 16:39:24 -0800 |
|---|---|---|
| committer | Frank Barchard <fbarchard@chromium.org> | 2018-01-10 01:27:22 +0000 |
| commit | a2142148e9875eb35871789b8d52bbeffc4b30a8 (patch) | |
| tree | c8ea19ed4645dc6b7bb2e450dcf3fc639ea478d4 /include/libyuv/scale_row.h | |
| parent | 00d526d4eae1ee4d2a6cd9c5dcbc9a56ebf3e91c (diff) | |
| download | libyuv-a2142148e9875eb35871789b8d52bbeffc4b30a8.tar.gz | |
Remove x64 native_client macros.
Bug: libyuv:702
Test: try bots pass
Change-Id: I76d74b5f02fe9843418108b84742e2f714d1ab0a
Reviewed-on: https://chromium-review.googlesource.com/855656
Reviewed-by: Frank Barchard <fbarchard@chromium.org>
Diffstat (limited to 'include/libyuv/scale_row.h')
| -rw-r--r-- | include/libyuv/scale_row.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/libyuv/scale_row.h b/include/libyuv/scale_row.h index 3db46d39..7a10376e 100644 --- a/include/libyuv/scale_row.h +++ b/include/libyuv/scale_row.h @@ -19,17 +19,20 @@ namespace libyuv { extern "C" { #endif -#if defined(__pnacl__) || defined(__CLR_VER) || \ +#if defined(__pnacl__) || defined(__CLR_VER) || \ + (defined(__native_client__) && defined(__x86_64__)) || \ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) #define LIBYUV_DISABLE_X86 #endif +#if defined(__native_client__) +#define LIBYUV_DISABLE_NEON +#endif // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 #if defined(__has_feature) #if __has_feature(memory_sanitizer) #define LIBYUV_DISABLE_X86 #endif #endif - // GCC >= 4.7.0 required for AVX2. #if defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__)) #if (__GNUC__ > 4) || (__GNUC__ == 4 && (__GNUC_MINOR__ >= 7)) @@ -81,7 +84,7 @@ extern "C" { #endif // The following are available on Neon platforms: -#if !defined(LIBYUV_DISABLE_NEON) && !defined(__native_client__) && \ +#if !defined(LIBYUV_DISABLE_NEON) && \ (defined(__ARM_NEON__) || defined(LIBYUV_NEON) || defined(__aarch64__)) #define HAS_SCALEARGBCOLS_NEON #define HAS_SCALEARGBROWDOWN2_NEON |