Bug 962386 - media/libtheora/lib does not build on armv7l. r=glandium
authorOleg Romashin <romaxa@gmail.com>
Wed, 22 Jan 2014 23:50:30 -0800
changeset 180838 ab0c9b4faf03cf01a6e4a00b0aff4f59f5c4c875
parent 180795 a90eb14cad0b541b9ee7c762ab1d9a216b71ac9b
child 180839 973ac648107854930f11db79badc09fc7092a89c
push id3343
push userffxbld
push dateMon, 17 Mar 2014 21:55:32 +0000
treeherdermozilla-beta@2f7d3415f79f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs962386
milestone29.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 962386 - media/libtheora/lib does not build on armv7l. r=glandium
media/libtheora/lib/Makefile.in
media/libtheora/lib/moz.build
--- a/media/libtheora/lib/Makefile.in
+++ b/media/libtheora/lib/Makefile.in
@@ -1,15 +1,15 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
 ifdef GNU_AS
-ifeq ($(findstring arm,$(OS_TEST)), arm)
+ifeq ($(CPU_ARCH),arm)
 
 # These flags are a lie; they're just used to enable the requisite
 # opcodes; actual arch detection is done at runtime.
 ASFLAGS = -march=armv7-a -mfpu=neon
 
 armfrag-gnu.$(ASM_SUFFIX): armopts-gnu.S
 armidct-gnu.$(ASM_SUFFIX): armopts-gnu.S
 armloop-gnu.$(ASM_SUFFIX): armopts-gnu.S
--- a/media/libtheora/lib/moz.build
+++ b/media/libtheora/lib/moz.build
@@ -15,17 +15,17 @@ UNIFIED_SOURCES += [
     'huffdec.c',
     'idct.c',
     'info.c',
     'internal.c',
     'quant.c',
     'state.c',
 ]
 
-if CONFIG['OS_TEST'] == 'arm' and CONFIG['GNU_AS']:
+if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_AS']:
     GENERATED_SOURCES += [ '%s.%s' % (f, CONFIG['ASM_SUFFIX']) for f in [
         'armbits-gnu',
         'armfrag-gnu',
         'armidct-gnu',
         'armloop-gnu',
     ]]
 
 if '86' in CONFIG['OS_TEST']: