Permalink
Browse files

Bug 645284 - Disable ARM detokenizer in libvpx, r=khuey

  • Loading branch information...
1 parent bdbe203 commit 36d3bb6c65822f10a2682281b57e519739ace1e6 Timothy B. Terriberry committed Jul 12, 2011
Showing with 1 addition and 6 deletions.
  1. +0 −5 media/libvpx/Makefile.in
  2. +1 −1 media/libvpx/vpx_config_arm-linux-gcc.h
View
@@ -236,7 +236,6 @@ CSRCS += \
$(NULL)
VPX_ASFILES = \
- detokenize.asm \
bilinearfilter_v6.asm \
copymem8x4_v6.asm \
copymem8x8_v6.asm \
@@ -304,16 +303,12 @@ GARBAGE += $(VPX_CONVERTED_ASFILES)
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
@@ -59,4 +59,4 @@
#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

0 comments on commit 36d3bb6

Please sign in to comment.