Bug 712870 - Skia works on non-tier1 cpu. r=mattwoodrow
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Tue, 27 Dec 2011 18:01:12 +0900
changeset 84610 1ea94dacda6845923be7fe9f6aa584319ca287c8
parent 84609 1b2730e56e6febbac1ba64efb9771806d9a8bd29
child 84611 ad5b4312fc7d024e0b7637c475a2274a28b25cb0
push id805
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 18:17:35 +0000
treeherdermozilla-aurora@6fb3bf232436 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmattwoodrow
bugs712870
milestone12.0a1
Bug 712870 - Skia works on non-tier1 cpu. r=mattwoodrow
gfx/skia/Makefile.in
--- a/gfx/skia/Makefile.in
+++ b/gfx/skia/Makefile.in
@@ -297,53 +297,66 @@ CPPSRCS = \
 	$(NULL)
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 EXPORTS_skia += \
 	include/ports/SkTypeface_mac.h \
 	$(NULL)
 CPPSRCS += \
 	SkFontHost_mac_coretext.cpp \
-	SkBitmapProcState_opts_SSE2.cpp \
-	SkBlitRow_opts_SSE2.cpp \
-	SkUtils_opts_SSE2.cpp \
-	opts_check_SSE2.cpp \
 	SkTime_Unix.cpp \
 	$(NULL)
 endif
 
 ifeq (android,$(MOZ_WIDGET_TOOLKIT))
 CPPSRCS += \
-	SkBitmapProcState_opts_arm.cpp \
-	SkBlitRow_opts_arm.cpp \
 	SkFontHost_FreeType.cpp \
 	SkFontHost_android.cpp \
 	SkFontHost_gamma.cpp \
-	SkUtils_opts_none.cpp \
 	SkMMapStream.cpp \
 	SkTime_Unix.cpp \
 	$(NULL)
 
 DEFINES += -DSK_BUILD_FOR_ANDROID_NDK
 OS_CXXFLAGS += $(CAIRO_FT_CFLAGS)
 endif
 
 ifeq (windows,$(MOZ_WIDGET_TOOLKIT))
 EXPORTS_skia += \
 	include/config/sk_stdint.h \
 	include/ports/SkTypeface_win.h \
 	$(NULL)
 CPPSRCS += \
 	SkFontHost_win.cpp \
 	SkTime_win.cpp \
+	$(NULL)
+endif
+
+ifneq (,$(INTEL_ARCHITECTURE))
+CPPSRCS += \
 	SkBitmapProcState_opts_SSE2.cpp \
 	SkBlitRow_opts_SSE2.cpp \
 	SkUtils_opts_SSE2.cpp \
 	opts_check_SSE2.cpp \
 	$(NULL)
+else
+ifeq ($(CPU_ARCH)_$(GNU_CC),arm_1)
+CPPSRCS += \
+	SkBitmapProcState_opts_arm.cpp \
+	SkBlitRow_opts_arm.cpp \
+	opts_check_arm.cpp \
+	$(NULL)
+SSRCS += memset.arm.S
+else
+CPPSRCS += \
+	SkBitmapProcState_opts_none.cpp \
+	SkBlitRow_opts_none.cpp \
+	SkUtils_opts_none.cpp \
+	$(NULL)
+endif
 endif
 
 include $(topsrcdir)/config/rules.mk
 
 ifneq (,$(INTEL_ARCHITECTURE))
 ifdef GNU_CC
 SkBitmapProcState_opts_SSE2.$(OBJ_SUFFIX): CXXFLAGS+=-msse2
 SkBlitRow_opts_SSE2.$(OBJ_SUFFIX): CXXFLAGS+=-msse2