~chromium-team/chromium-browser/artful-beta

« back to all changes in this revision

Viewing changes to debian/patches/arm-neon.patch

  • Committer: Chad Miller
  • Date: 2014-04-14 01:52:57 UTC
  • Revision ID: chad.miller@canonical.com-20140414015257-nhwce523ca761jg9
Kill patch in arm-neon.patch that prevnts neon compilation.

Show diffs side-by-side

added added

removed removed

Lines of Context:
4
4
Bug-Chromium: 154107
5
5
Bug-Ubuntu: 1084852
6
6
 
7
 
--- a/third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi
8
 
+++ b/third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi
9
 
@@ -74,7 +74,7 @@
10
 
             'WEBRTC_LINUX',
11
 
           ],
12
 
         }],
13
 
-        ['(target_arch=="arm" and arm_version==7) or target_arch=="armv7"', {
14
 
+        ['(target_arch=="arm" and arm_version==7 and arm_neon==1) or target_arch=="armv7"', {
15
 
           'dependencies': [ 'isac_neon', ],
16
 
           'sources': [
17
 
             'lattice_armv7.S',
18
7
--- a/third_party/webrtc/system_wrappers/source/cpu_features.cc
19
8
+++ b/third_party/webrtc/system_wrappers/source/cpu_features.cc
20
9
@@ -18,6 +18,47 @@