mozilla-central: changeset 93312:7ac8857d0c8368bbcdd9197be2f8f12b622c57a6

author	Timothy B. Terriberry <tterribe@vt.edu>
	Sun, 06 May 2012 05:41:01 -0700
changeset 93312	7ac8857d0c8368bbcdd9197be2f8f12b622c57a6
parent 93311	4ba9cc4ee09509a236ce73829cb81b78e4cbf2f2
child 93313	4960479d3694c07a8dbbcf3b2ee26adc7c5aa3c7
push id	22625
push user	ryanvm@gmail.com
push date	Mon, 07 May 2012 00:31:41 +0000
treeherder	mozilla-central@448f554f6acb [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	glandium
bugs	752139
milestone	15.0a1
first release with	nightly linux32 448f554f6acb / 15.0a1 / 20120507030511 / files nightly linux64 448f554f6acb / 15.0a1 / 20120507030511 / files nightly mac 448f554f6acb / 15.0a1 / 20120507030511 / files nightly win32 448f554f6acb / 15.0a1 / 20120507030511 / files nightly win64 448f554f6acb / 15.0a1 / 20120507030511 / files
last release without	nightly linux32 94ce5f33a9ea / 15.0a1 / 20120506030520 / files nightly linux64 94ce5f33a9ea / 15.0a1 / 20120506030520 / files nightly mac 94ce5f33a9ea / 15.0a1 / 20120506030520 / files nightly win32 94ce5f33a9ea / 15.0a1 / 20120506030520 / files nightly win64 94ce5f33a9ea / 15.0a1 / 20120506030520 / files

--- a/media/libtheora/lib/Makefile.in
+++ b/media/libtheora/lib/Makefile.in
@@ -128,17 +128,16 @@ ifeq ($(OS_TARGET),Android)
 DEFINES += -D__linux__
 endif
 
 THEORA_ASFILES  = \
   armbits.s \
   armfrag.s \
   armidct.s \
   armloop.s \
-  armopts.s \
   $(NULL)
 
 ASFILES = $(patsubst %.s,%-gnu.$(ASM_SUFFIX),$(THEORA_ASFILES))
 
 # 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