Bug 645284 - Disable ARM detokenizer in libvpx, r=khuey
authorTimothy B. Terriberry <tterribe@vt.edu>
Tue, 12 Jul 2011 11:17:54 -0700
changeset 72682 93d400457dc041f2f888967751a2e348e4fa747f
parent 72681 cda02ba7d48c9e675e5852b719008d900772ce46
child 72683 7451352e27c3fc8d60a758609a8f595ac3758366
push id510
push usertterriberry@mozilla.com
push dateTue, 12 Jul 2011 18:20:02 +0000
treeherdermozilla-inbound@93d400457dc0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey
bugs645284
milestone8.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 645284 - Disable ARM detokenizer in libvpx, r=khuey
media/libvpx/Makefile.in
media/libvpx/vpx_config_arm-linux-gcc.h
--- a/media/libvpx/Makefile.in
+++ b/media/libvpx/Makefile.in
@@ -231,17 +231,16 @@ CSRCS += \
   arm_dsystemdependent.c \
   dequantize_arm.c \
   idct_blk_v6.c \
   idct_blk_neon.c \
   recon_neon.c \
   $(NULL)
 
 VPX_ASFILES = \
-  detokenize.asm \
   bilinearfilter_v6.asm \
   copymem8x4_v6.asm \
   copymem8x8_v6.asm \
   copymem16x16_v6.asm \
   dc_only_idct_add_v6.asm \
   iwalsh_v6.asm \
   filter_v6.asm \
   idct_v6.asm \
@@ -299,26 +298,22 @@ ASFILES += $(VPX_CONVERTED_ASFILES)
 GARBAGE += $(VPX_CONVERTED_ASFILES)
 
 %.asm.$(ASM_SUFFIX): %.asm
 	$(VPX_AS_CONVERSION) < $< > $@
 
 vpx_asm_offsets.asm: vpx_asm_offsets.$(OBJ_SUFFIX) $(HOST_PROGRAM)
 	./$(HOST_PROGRAM) rvds $< | $(VPX_AS_CONVERSION) > $@
 
-detokenize.asm.$(OBJ_SUFFIX): vpx_asm_offsets.asm
-
 else
 ASFILES += $(VPX_ASFILES)
 
 vpx_asm_offsets.asm: vpx_asm_offsets.$(OBJ_SUFFIX) $(HOST_PROGRAM)
 	./$(HOST_PROGRAM) rvds $< > $@
 
-detokenize.$(OBJ_SUFFIX): vpx_asm_offsets.asm
-
 endif
 
 GARBAGE += vpx_asm_offsets.$(OBJ_SUFFIX) vpx_asm_offsets.asm
 
 endif
 
 include $(topsrcdir)/config/rules.mk
 
--- a/media/libvpx/vpx_config_arm-linux-gcc.h
+++ b/media/libvpx/vpx_config_arm-linux-gcc.h
@@ -54,9 +54,9 @@
 #define CONFIG_VP8 1
 #define CONFIG_ENCODERS 0
 #define CONFIG_DECODERS 1
 #define CONFIG_STATIC_MSVCRT 0
 #define CONFIG_SPATIAL_RESAMPLING 1
 #define CONFIG_REALTIME_ONLY 0
 #define CONFIG_SHARED 0
 #define CONFIG_SMALL 0
-#define CONFIG_ARM_ASM_DETOK 1
+#define CONFIG_ARM_ASM_DETOK 0