Bug 1194905 - Build libvpx neon code without -mthumb and -mfloat-abi=softfp. r=mshal
authorMike Hommey <mh+mozilla@glandium.org>
Sat, 15 Aug 2015 08:53:54 +0900
changeset 290716 2db4b0ef03a75b055358c0a8c505fb1ff12f919b
parent 290715 931ac2c4036fae56265485f519885a5c82fa82be
child 290717 4a8f9dc938e02f6b922766fb5572d67a9c4c6554
push id5245
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 11:30:51 +0000
treeherdermozilla-beta@dac831dc1bd0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1194905
milestone43.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1194905 - Build libvpx neon code without -mthumb and -mfloat-abi=softfp. r=mshal -mfloat-abi=softfp is hardcoding an ABI that may not match everything else in Gecko, which is bound to fail. It's also unrelated to building NEON code. -mthumb is also unrelated to building NEON code, and should be left as it is for everything else. Now, interestingly, we also have a VPX_ASFLAGS variable that just contains the right things instead of hardcoding them in the moz.build, so just use that instead.
media/libvpx/moz.build
--- a/media/libvpx/moz.build
+++ b/media/libvpx/moz.build
@@ -40,17 +40,17 @@ if CONFIG['VPX_ARM_ASM']:
             if f.endswith('.asm') else f
             for f in sorted(arm_asm_files)
         ])
     else:
         SOURCES += sorted(arm_asm_files)
 
     for f in SOURCES:
         if f.endswith('.c') and 'neon' in f:
-            SOURCES[f].flags += ['-march=armv7-a', '-mthumb', '-mfloat-abi=softfp', '-mfpu=neon']
+            SOURCES[f].flags += CONFIG['VPX_ASFLAGS']
 
 # boolhuff_armv5te.asm defines the same functions as boolhuff.c instead of
 # using RTCD, so we have to make sure we only add one of the two.
 if 'vp8/encoder/arm/armv5te/boolhuff_armv5te.asm' not in arm_asm_files:
     SOURCES += [
         'vp8/encoder/boolhuff.c',
     ]