bug 880773: Cleanup/final patch - remove DISABLED_SSRCS. r=mshal
authorJoey Armstrong <joey@mozilla.com>
Tue, 16 Jul 2013 08:47:40 -0400
changeset 138663 3d33faf4d81fd4b1a8739d66d7a48d398ea4c9ea
parent 138662 381473907cd0cf9a9fa2eb633b6f03fff891495b
child 138664 a0ba09885dab0505e7d0b754426257d8bef8c81e
push id24964
push userryanvm@gmail.com
push dateTue, 16 Jul 2013 20:04:09 +0000
treeherderautoland@fd10ead17ace [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs880773
milestone25.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 880773: Cleanup/final patch - remove DISABLED_SSRCS. r=mshal
gfx/cairo/libpixman/src/Makefile.in
gfx/skia/Makefile.in
media/libjpeg/Makefile.in
toolkit/crashreporter/google-breakpad/src/common/Makefile.in
--- a/gfx/cairo/libpixman/src/Makefile.in
+++ b/gfx/cairo/libpixman/src/Makefile.in
@@ -131,24 +131,21 @@ endif
 
 ifdef USE_VMX
 CSRCS += pixman-vmx.c
 DEFINES += -DUSE_VMX
 endif
 
 ifdef USE_ARM_SIMD_GCC
 CSRCS += pixman-arm-simd.c
-DISABLED_SSRCS += pixman-arm-simd-asm.S pixman-arm-simd-asm-scaled.S
 DEFINES += -DUSE_ARM_SIMD
 endif
 
 ifdef USE_ARM_NEON_GCC
 CSRCS += pixman-arm-neon.c
-DISABLED_SSRCS += pixman-arm-neon-asm.S
-DISABLED_SSRCS += pixman-arm-neon-asm-bilinear.S
 DEFINES += -DUSE_ARM_NEON
 ARM_NEON_CFLAGS = -mfpu=neon
 endif
 
 LOCAL_INCLUDES	+= -I$(srcdir) -I$(srcdir)/../../cairo/src
 
 include $(topsrcdir)/config/rules.mk
 
--- a/gfx/skia/Makefile.in
+++ b/gfx/skia/Makefile.in
@@ -82,20 +82,16 @@ endif
 ifeq (windows,$(MOZ_WIDGET_TOOLKIT))
 DEFINES += -DSKIA_IMPLEMENTATION=1 -DGR_IMPLEMENTATION=1
 endif
 
 ifneq (,$(INTEL_ARCHITECTURE))
 ifdef HAVE_TOOLCHAIN_SUPPORT_MSSSE3
 DEFINES += -DSK_BUILD_SSSE3
 endif
-else
-ifeq ($(CPU_ARCH)_$(GNU_CC),arm_1)
-DISABLED_SSRCS += memset.arm.S
-endif
 endif
 
 include $(topsrcdir)/config/rules.mk
 
 ifneq (,$(INTEL_ARCHITECTURE))
 ifdef GNU_CC
 SkBitmapProcState_opts_SSE2.$(OBJ_SUFFIX): CXXFLAGS+=-msse2
 SkBitmapProcState_opts_SSSE3.$(OBJ_SUFFIX): CXXFLAGS+=-mssse3
--- a/media/libjpeg/Makefile.in
+++ b/media/libjpeg/Makefile.in
@@ -80,17 +80,16 @@ endif
 
 # No SIMD support?
 ifeq (,$(LIBJPEG_TURBO_X86_ASM)$(LIBJPEG_TURBO_X64_ASM)$(LIBJPEG_TURBO_ARM_ASM))
   DISABLED_CSRCS += jsimd_none.c
 endif
 
 ifeq (1,$(LIBJPEG_TURBO_ARM_ASM))
   DISABLED_CSRCS += simd/jsimd_arm.c
-  DISABLED_SSRCS += simd/jsimd_arm_neon.S
 endif
 
 ifeq (1,$(LIBJPEG_TURBO_X64_ASM))
   DISABLED_CSRCS   += simd/jsimd_x86_64.c
   DISABLED_ASFILES += \
 	simd/jccolss2-64.asm \
 	simd/jcgrass2-64.asm \
 	simd/jcqnts2f-64.asm \
--- a/toolkit/crashreporter/google-breakpad/src/common/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/common/Makefile.in
@@ -39,17 +39,16 @@ endif
 endif
 
 DISABLED_CSRCS = \
   convert_UTF.c \
   $(NULL)
 
 ifeq ($(OS_TARGET),Android)
 VPATH += $(srcdir)/android
-DISABLED_SSRCS := breakpad_getcontext.S
 TARGET_LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src/common/android/include/
 DEFINES += -DNO_STABS_SUPPORT
 endif
 
 ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
 DEFINES += -DELFSIZE=32
 endif