Issue #1829 - Revert "Issue #1751 - Remove Mac/ARM C fallback on gcc from pixman"

This reverts commit 2215d8467e260453efe6abcbc66218e367d0d2c3.

1 files changed, 14 insertions, 5 deletions

diff --git a/gfx/cairo/libpixman/src/moz.build b/gfx/cairo/libpixman/src/moz.build
index 02e2582452..9b463afd64 100644
--- a/gfx/cairo/libpixman/src/moz.build
+++ b/gfx/cairo/libpixman/src/moz.build
@@ -8,7 +8,11 @@ EXPORTS += [
     'pixman.h',
 ]
 
-if CONFIG['GNU_CC']:
+# 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']:
         SOURCES += [
             'pixman-arm-neon-asm-bilinear.S',
@@ -86,11 +90,16 @@ if '86' in CONFIG['OS_TEST']:
 elif 'ppc' in CONFIG['OS_TEST']:
     if CONFIG['GNU_CC']:
         use_vmx = True
+# 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.
 elif 'arm' in CONFIG['OS_TEST']:
-    if CONFIG['HAVE_ARM_SIMD']:
-        use_arm_simd_gcc = True
-    if CONFIG['HAVE_ARM_NEON']:
-        use_arm_neon_gcc = True
+    if CONFIG['OS_ARCH'] != 'Darwin':
+        if CONFIG['HAVE_ARM_SIMD']:
+            use_arm_simd_gcc = True
+        if CONFIG['HAVE_ARM_NEON']:
+            use_arm_neon_gcc = True
 
 if use_mmx:
     DEFINES['USE_MMX'] = True