From 508c91683c5f1a40b452be3abd217f0cb0d10fbe Mon Sep 17 00:00:00 2001 From: "andrew@webrtc.org" Date: Fri, 31 Oct 2014 16:26:17 +0000 Subject: [PATCH] Build fix for MIPS32R6. Exclude MIPS optimizations for MIPS32R6 build since some of the instructions are not supported. This is temporary fix, until the MIPS32R6 code is added. R=andrew@webrtc.org Review URL: https://webrtc-codereview.appspot.com/25989004 Patch from Ljubomir Papuga . git-svn-id: http://webrtc.googlecode.com/svn/trunk@7580 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/build/common.gypi | 2 +- webrtc/common_audio/common_audio.gyp | 2 +- .../modules/audio_coding/codecs/isac/fix/source/isacfix.gypi | 2 +- webrtc/modules/audio_processing/audio_processing.gypi | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi index 33dbace9b0..e89f2f2179 100644 --- a/webrtc/build/common.gypi +++ b/webrtc/build/common.gypi @@ -272,7 +272,7 @@ }], ], }], - ['target_arch=="mipsel"', { + ['target_arch=="mipsel" and mips_arch_variant!="r6"', { 'defines': [ 'MIPS32_LE', ], diff --git a/webrtc/common_audio/common_audio.gyp b/webrtc/common_audio/common_audio.gyp index 70d6909c55..0eb238f8fa 100644 --- a/webrtc/common_audio/common_audio.gyp +++ b/webrtc/common_audio/common_audio.gyp @@ -140,7 +140,7 @@ }], ], # conditions }], - ['target_arch=="mipsel"', { + ['target_arch=="mipsel" and mips_arch_variant!="r6"', { 'sources': [ 'signal_processing/include/spl_inl_mips.h', 'signal_processing/complex_bit_reverse_mips.c', diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi b/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi index 7bef170d48..2a36309fd6 100644 --- a/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi +++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi @@ -87,7 +87,7 @@ 'pitch_filter_c.c', ], }], - ['target_arch=="mipsel"', { + ['target_arch=="mipsel" and mips_arch_variant!="r6"', { 'sources': [ 'entropy_coding_mips.c', 'filters_mips.c', diff --git a/webrtc/modules/audio_processing/audio_processing.gypi b/webrtc/modules/audio_processing/audio_processing.gypi index ce65f64328..2ddcffc99b 100644 --- a/webrtc/modules/audio_processing/audio_processing.gypi +++ b/webrtc/modules/audio_processing/audio_processing.gypi @@ -112,7 +112,7 @@ 'ns/nsx_defines.h', ], 'conditions': [ - ['target_arch=="mipsel"', { + ['target_arch=="mipsel" and mips_arch_variant!="r6"', { 'sources': [ 'ns/nsx_core_mips.c', ], @@ -139,7 +139,7 @@ ['(target_arch=="arm" and arm_version==7) or target_arch=="armv7"', { 'dependencies': ['audio_processing_neon',], }], - ['target_arch=="mipsel"', { + ['target_arch=="mipsel" and mips_arch_variant!="r6"', { 'sources': [ 'aecm/aecm_core_mips.c', ],