diff options
| author | Gordana.Cmiljanovic@imgtec.com <Gordana.Cmiljanovic@imgtec.com> | 2014-10-28 09:22:50 +0000 |
|---|---|---|
| committer | Gordana.Cmiljanovic@imgtec.com <Gordana.Cmiljanovic@imgtec.com> | 2014-10-28 09:22:50 +0000 |
| commit | 6446144c7f083552f21cc4e6768e891bcb767574 (patch) | |
| tree | 2707e62a69de7310a4787a79eb9eed3db546c3f5 | |
| parent | 98284c8600c73812ff4716a6ea157d1e11d417dc (diff) | |
| download | libsrtp-6446144c7f083552f21cc4e6768e891bcb767574.tar.gz | |
[MIPS] Define 'CPU_CISC' for mips as aes calculation is incorrect for 'CPU_RISC'
Review URL: https://codereview.chromium.org/639123008
git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libsrtp@292694 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
| -rw-r--r-- | libsrtp.gyp | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/libsrtp.gyp b/libsrtp.gyp index a3956eb..735810f 100644 --- a/libsrtp.gyp +++ b/libsrtp.gyp @@ -46,21 +46,17 @@ 'CPU_CISC', ], }], - ['target_arch=="arm" or target_arch=="armv7" or target_arch=="arm64"', { + ['target_arch=="arm" or target_arch=="armv7" or target_arch=="arm64" \ + or target_arch=="mipsel" or target_arch=="mips64el"', { 'defines': [ - # TODO(leozwang): CPU_RISC doesn't work properly on android/arm - # platform for unknown reasons, need to investigate the root cause - # of it. CPU_RISC is used for optimization only, and CPU_CISC should - # just work just fine, it has been tested on android/arm with srtp - # test applications and libjingle. + # TODO(leozwang): CPU_RISC doesn't work properly on android/arm and + # mips platforms for unknown reasons, need to investigate the root + # cause of it. CPU_RISC is used for optimization only, and CPU_CISC + # should just work just fine, it has been tested on android/arm with + # srtp test applications and libjingle. 'CPU_CISC', ], }], - ['target_arch=="mipsel" or target_arch=="mips64el"', { - 'defines': [ - 'CPU_RISC', - ], - }], ['target_arch=="mipsel" or target_arch=="arm" or target_arch=="armv7" or target_arch=="ia32"', { 'defines': [ # Define FORCE_64BIT_ALIGN to avoid alignment-related-crashes like @@ -108,11 +104,6 @@ 'CPU_CISC', ], }], - ['target_arch=="mipsel" or target_arch=="mips64el"', { - 'defines': [ - 'CPU_RISC', - ], - }], ], }, }, |