Patch r1067 into m39 branch which is based on r1038.
BUG=355
TESTED=untested
R=harryjin@google.com
Review URL: https://webrtc-codereview.appspot.com/31769004
git-svn-id: http://libyuv.googlecode.com/svn/branches/m39@1129 16f28f9a-4ce2-e073-06de-1de4eb20be90
diff --git a/README.chromium b/README.chromium
index e58eb6f..2f9a041 100644
--- a/README.chromium
+++ b/README.chromium
@@ -7,3 +7,6 @@
Description:
libyuv is an open source project that includes
YUV conversion and scaling functionality.
+
+Changes:
+Patch r1067 into r1038 to disable mips dsp2 code on iso r6.
diff --git a/include/libyuv/row.h b/include/libyuv/row.h
index cdf6cec..99728cf 100644
--- a/include/libyuv/row.h
+++ b/include/libyuv/row.h
@@ -346,7 +346,7 @@
// 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/source/row_mips.cc b/source/row_mips.cc
index ae9370c..da7183b 100644
--- a/source/row_mips.cc
+++ b/source/row_mips.cc
@@ -378,7 +378,7 @@
// 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) {
