diff options
| author | andrew@webrtc.org <andrew@webrtc.org> | 2014-12-02 21:06:44 +0000 |
|---|---|---|
| committer | andrew@webrtc.org <andrew@webrtc.org> | 2014-12-02 21:06:44 +0000 |
| commit | 41e4e4d99e60cbf3a08c22234118840b60eb4378 (patch) | |
| tree | ba7f7d1660f630d94b0f8b40bc65b10d3f679a15 | |
| parent | 26a0c4c9568f9e616e9e9fa8652911ddd1f1f70a (diff) | |
| download | webrtc-41e4e4d99e60cbf3a08c22234118840b60eb4378.tar.gz | |
Merge 7580 "Build fix for MIPS32R6."
> 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 <lpapuga@mips.com>.
TBR=lpapuga@mips.com
BUG=chromium:438351
Review URL: https://webrtc-codereview.appspot.com/31079004
git-svn-id: http://webrtc.googlecode.com/svn/branches/39/webrtc@7784 4adac7df-926f-26a2-2b94-8c16560cd09d
| -rw-r--r-- | build/common.gypi | 2 | ||||
| -rw-r--r-- | common_audio/common_audio.gyp | 2 | ||||
| -rw-r--r-- | modules/audio_coding/codecs/isac/fix/source/isacfix.gypi | 2 | ||||
| -rw-r--r-- | modules/audio_processing/audio_processing.gypi | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/build/common.gypi b/build/common.gypi index fdf1abe1..226cbcee 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -252,7 +252,7 @@ }], ], }], - ['target_arch=="mipsel"', { + ['target_arch=="mipsel" and mips_arch_variant!="r6"', { 'defines': [ 'MIPS32_LE', ], diff --git a/common_audio/common_audio.gyp b/common_audio/common_audio.gyp index e9abf822..5506b3aa 100644 --- a/common_audio/common_audio.gyp +++ b/common_audio/common_audio.gyp @@ -122,7 +122,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/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi b/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi index 7bef170d..2a36309f 100644 --- a/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi +++ b/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/modules/audio_processing/audio_processing.gypi b/modules/audio_processing/audio_processing.gypi index ce65f643..2ddcffc9 100644 --- a/modules/audio_processing/audio_processing.gypi +++ b/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', ], |