diff -urN mozilla-release-9/media/libtheora//lib/Makefile.in mozilla-release-10.0/media/libtheora//lib/Makefile.in
--- mozilla-release-9/media/libtheora//lib/Makefile.in	2011-12-20 23:28:32.000000000 +0000
+++ mozilla-release-10.0/media/libtheora//lib/Makefile.in	2012-01-29 10:24:47.000000000 +0000
@@ -50,6 +50,7 @@
 ifeq ($(findstring 86,$(OS_TEST)), 86)
 ifneq ($(OS_ARCH),SunOS)
 ifneq ($(OS_ARCH)$(OS_TEST),WINNTx86_64)
+ifndef MOZ_NO_THEORA_ASM
 DEFINES += -DOC_X86_ASM
 ifeq (64,$(findstring 64,$(OS_TEST)))
 DEFINES += -DOC_X86_64_ASM
@@ -57,6 +58,7 @@
 endif
 endif
 endif
+endif
 
 VPATH := $(srcdir)
 
@@ -90,7 +92,7 @@
   $(NULL)
 endif
 else
-ifndef HAVE_OLD_CLANG
+ifndef MOZ_NO_THEORA_ASM
 VPATH += $(srcdir)/x86
 
 CSRCS += \