bug 880773: move SSRCS to mozbuild (file batch #1). r=mshal

UltraBlame original commit: 024f4fcbdfdb1919de16455bf45be9adaf86ccc2
marco-c · Sep 29, 2019 · 27c0c82 · 27c0c82
1 parent f29c704
commit 27c0c82
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 6 deletions.
diff --git a/gfx/cairo/libpixman/src/Makefile.in b/gfx/cairo/libpixman/src/Makefile.in
@@ -136,14 +136,14 @@ endif
 
 ifdef USE_ARM_SIMD_GCC
 CSRCS += pixman-arm-simd.c
-SSRCS += pixman-arm-simd-asm.S pixman-arm-simd-asm-scaled.S
+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
-SSRCS += pixman-arm-neon-asm.S
-SSRCS += pixman-arm-neon-asm-bilinear.S
+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

diff --git a/gfx/cairo/libpixman/src/moz.build b/gfx/cairo/libpixman/src/moz.build
@@ -11,3 +11,18 @@ EXPORTS += [
     'pixman.h',
 ]
 
+# Apple's arm assembler doesn't support the same syntax as
+# the standard GNU assembler, so use the C fallback paths for now.
+# This may be fixable if clang's ARM/iOS assembler improves into a
+# viable solution in the future.
+if CONFIG['OS_ARCH'] != 'Darwin' and CONFIG['GNU_CC']:
+    if CONFIG['HAVE_ARM_NEON']:
+        SSRCS += [
+            'pixman-arm-neon-asm-bilinear.S',
+            'pixman-arm-neon-asm.S',
+        ]
+    if CONFIG['HAVE_ARM_SIMD']:
+        SSRCS += [
+            'pixman-arm-simd-asm-scaled.S',
+            'pixman-arm-simd-asm.S',
+        ]
diff --git a/gfx/skia/Makefile.in b/gfx/skia/Makefile.in
@@ -83,7 +83,7 @@ DEFINES += -DSK_BUILD_SSSE3
 endif
 else
 ifeq ($(CPU_ARCH)_$(GNU_CC),arm_1)
-SSRCS += memset.arm.S
+DISABLED_SSRCS += memset.arm.S
 endif
 endif
 

diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build
@@ -474,5 +474,10 @@ CPP_SOURCES += [
     'SkXfermode.cpp',
 ]
 
+if not CONFIG['INTEL_ARCHITECTURE'] and CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC']:
+    SSRCS += [
+        'memset.arm.S',
+    ]
+
 LIBRARY_NAME = 'skia'
 
diff --git a/media/libjpeg/Makefile.in b/media/libjpeg/Makefile.in
@@ -85,7 +85,7 @@ endif
 
 ifeq (1,$(LIBJPEG_TURBO_ARM_ASM))
   DISABLED_CSRCS += simd/jsimd_arm.c
-  SSRCS += simd/jsimd_arm_neon.S
+  DISABLED_SSRCS += simd/jsimd_arm_neon.S
 endif
 
 ifeq (1,$(LIBJPEG_TURBO_X64_ASM))

diff --git a/media/libjpeg/moz.build b/media/libjpeg/moz.build
@@ -130,6 +130,9 @@ if CONFIG['LIBJPEG_TURBO_ARM_ASM']:
     CSRCS += [
         'simd/jsimd_arm.c',
     ]
+    SSRCS += [
+        'simd/jsimd_arm_neon.S',
+    ]
 elif CONFIG['LIBJPEG_TURBO_X64_ASM']:
     CSRCS += [
         'simd/jsimd_x86_64.c',

diff --git a/toolkit/crashreporter/google-breakpad/src/common/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/Makefile.in
@@ -49,7 +49,7 @@ DISABLED_CSRCS = \
 
 ifeq ($(OS_TARGET),Android)
 VPATH += $(srcdir)/android
-SSRCS := breakpad_getcontext.S
+DISABLED_SSRCS := breakpad_getcontext.S
 TARGET_LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src/common/android/include/
 DEFINES += -DNO_STABS_SUPPORT
 endif

diff --git a/toolkit/crashreporter/google-breakpad/src/common/moz.build b/toolkit/crashreporter/google-breakpad/src/common/moz.build
@@ -61,5 +61,10 @@ if CONFIG['OS_ARCH'] == 'Darwin':
         'mac/dump_syms.mm',
     ]
 
+if CONFIG['OS_TARGET'] == 'Android':
+    SSRCS += [
+        'breakpad_getcontext.S',
+    ]
+
 LIBRARY_NAME = 'breakpad_common_s'
-Original file line number
+Diff line change
@@ Expand Up / @@ -83,7 +83,7 @@ DEFINES += -DSK_BUILD_SSSE3 @@
     endif
     else
     ifeq ($(CPU_ARCH)_$(GNU_CC),arm_1)
-    SSRCS += memset.arm.S
+    DISABLED_SSRCS += memset.arm.S
     endif
     endif
@@ Expand Down @@