From 44373d8fbb25692e29883cda2f9c6d40e5a9da3b Mon Sep 17 00:00:00 2001 From: Frank Barchard Date: Thu, 10 Dec 2015 15:42:46 -0800 Subject: [PATCH] Add check for DEBUG to functions disabled on 386 Some functions run out of registers when compiled for debug, fpic, with stack frames on 32 bit x86 with clang. Previously they were enabled based on _DEBUG but that macro is not set in some build systems. This CL adds DEBUG macro as well to cover those environments. R=harryjin@google.com BUG=libyuv:532 Review URL: https://codereview.chromium.org/1517693005 . --- README.chromium | 2 +- include/libyuv/row.h | 6 +++--- include/libyuv/version.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.chromium b/README.chromium index e76949316..12ca04735 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1551 +Version: 1552 License: BSD License File: LICENSE diff --git a/include/libyuv/row.h b/include/libyuv/row.h index cf96c0516..31de3e089 100644 --- a/include/libyuv/row.h +++ b/include/libyuv/row.h @@ -105,12 +105,12 @@ extern "C" { #define HAS_COPYROW_SSE2 #define HAS_H422TOARGBROW_SSSE3 #define HAS_I400TOARGBROW_SSE2 -#if !defined(__i386__) +// The following functions fail on gcc/clang 32 bit. +// caveat: clangcl uses row_win.cc which works. +#if !defined(__i386__) || !defined(DEBUG) || defined(_MSC_VER) // TODO(fbarchard): fix build error on x86 debug // https://code.google.com/p/libyuv/issues/detail?id=524 #define HAS_I411TOARGBROW_SSSE3 -#endif -#if !(defined(_DEBUG) && defined(__i386__)) // TODO(fbarchard): fix build error on android_full_debug=1 // https://code.google.com/p/libyuv/issues/detail?id=517 #define HAS_I422ALPHATOARGBROW_SSSE3 diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 93cbb7868..075c6ca32 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 1551 +#define LIBYUV_VERSION 1552 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT