From 24b9fa6671b7a4d88b77a5cf8cb1f8cc1153cb30 Mon Sep 17 00:00:00 2001 From: Frank Barchard Date: Thu, 23 Jun 2016 20:14:22 -0700 Subject: [PATCH] use vectorsize on clangcl the ScaleFilterCols_SSSE3 function fails at runtime if vectorsize is not used. BUG=libyuv:610,libyuv:605 R=wangcheng@google.com Review URL: https://codereview.chromium.org/2080223007 . --- README.chromium | 2 +- include/libyuv/row.h | 4 ++-- include/libyuv/version.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.chromium b/README.chromium index ed421217a..a1c37a3c2 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1598 +Version: 1599 License: BSD License File: LICENSE diff --git a/include/libyuv/row.h b/include/libyuv/row.h index 3028513e5..b9ea5a842 100644 --- a/include/libyuv/row.h +++ b/include/libyuv/row.h @@ -372,7 +372,7 @@ extern "C" { #endif #endif -#if defined(_MSC_VER) && !defined(__CLR_VER) +#if defined(_MSC_VER) && !defined(__CLR_VER) && !defined(__clang__) #define SIMD_ALIGNED(var) __declspec(align(16)) var #define SIMD_ALIGNED32(var) __declspec(align(64)) var typedef __declspec(align(16)) int16 vec16[8]; @@ -387,7 +387,7 @@ typedef __declspec(align(32)) int8 lvec8[32]; typedef __declspec(align(32)) uint16 ulvec16[16]; typedef __declspec(align(32)) uint32 ulvec32[8]; typedef __declspec(align(32)) uint8 ulvec8[32]; -#elif defined(__GNUC__) && !defined(__pnacl__) +#elif !defined(__pnacl__) && (defined(__GNUC__) || defined(__clang__)) // Caveat GCC 4.2 to 4.7 have a known issue using vectors with const. #define SIMD_ALIGNED(var) var __attribute__((aligned(16))) #define SIMD_ALIGNED32(var) var __attribute__((aligned(64))) diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 803332185..8eb80e31a 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 1598 +#define LIBYUV_VERSION 1599 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT