From 3389f8efa4207b40972b83e251bb0c43adba7125 Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Wed, 27 Aug 2014 18:14:58 +0000 Subject: [PATCH] disable mips assembly for __mips_isa_rev 6 BUG=355 TESTED=untested R=tpsiaki@google.com Review URL: https://webrtc-codereview.appspot.com/22229004 git-svn-id: http://libyuv.googlecode.com/svn/trunk@1067 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/row.h | 2 +- include/libyuv/version.h | 2 +- source/row_mips.cc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.chromium b/README.chromium index 308a5231f..ce303a717 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1065 +Version: 1067 License: BSD License File: LICENSE diff --git a/include/libyuv/row.h b/include/libyuv/row.h index 85d01f2a5..44e63a904 100644 --- a/include/libyuv/row.h +++ b/include/libyuv/row.h @@ -438,7 +438,7 @@ extern "C" { // The following are available on Mips platforms: #if !defined(LIBYUV_DISABLE_MIPS) && defined(__mips__) && \ - (_MIPS_SIM == _MIPS_SIM_ABI32) + (_MIPS_SIM == _MIPS_SIM_ABI32) && (__mips_isa_rev < 6) #define HAS_COPYROW_MIPS #if defined(__mips_dsp) && (__mips_dsp_rev >= 2) #define HAS_I422TOABGRROW_MIPS_DSPR2 diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 4e63a7521..b176ec145 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 1065 +#define LIBYUV_VERSION 1067 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/row_mips.cc b/source/row_mips.cc index ae9370c1b..da7183bc1 100644 --- a/source/row_mips.cc +++ b/source/row_mips.cc @@ -378,7 +378,7 @@ void CopyRow_MIPS(const uint8* src, uint8* dst, int count) { // MIPS DSPR2 functions #if !defined(LIBYUV_DISABLE_MIPS) && defined(__mips_dsp) && \ (__mips_dsp_rev >= 2) && \ - (_MIPS_SIM == _MIPS_SIM_ABI32) + (_MIPS_SIM == _MIPS_SIM_ABI32) && (__mips_isa_rev < 6) void SplitUVRow_MIPS_DSPR2(const uint8* src_uv, uint8* dst_u, uint8* dst_v, int width) {