diff --git a/gfx/ycbcr/moz.build b/gfx/ycbcr/moz.build
index 0c8eb7b83c..54becb776f 100644
--- a/gfx/ycbcr/moz.build
+++ b/gfx/ycbcr/moz.build
@@ -58,6 +58,10 @@ if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['HAVE_ARM_NEON']:
     SOURCES += [
         'yuv_convert_arm.cpp',
     ]
+    if CONFIG['CC_TYPE'] == 'clang':
+        SOURCES['yuv_convert_arm.cpp'].flags += [
+            '-fno-integrated-as'
+        ]
 
 LOCAL_INCLUDES += ['/media/libyuv/include']
 
diff --git a/media/libjpeg/moz.build b/media/libjpeg/moz.build
index 1068e3f0ff..5ed27e92b2 100644
--- a/media/libjpeg/moz.build
+++ b/media/libjpeg/moz.build
@@ -92,11 +92,10 @@ if CONFIG['LIBJPEG_TURBO_ASFLAGS']:
             'simd/arm/jquanti-neon.c',
         ]
         CFLAGS += ['-mfpu=neon']
-    elif CONFIG['CPU_ARCH'] == 'aarch64':
-        SOURCES += [
-            'simd/jsimd_arm64.c',
-            'simd/jsimd_arm64_neon.S',
-        ]
+        if CONFIG['CC_TYPE'] == 'clang':
+            SOURCES['simd/arm/aarch32/jsimd_neon.S'].flags += [
+                '-fno-integrated-as',
+            ]
     elif CONFIG['CPU_ARCH'] == 'aarch64':
         LOCAL_INCLUDES += [
             '/media/libjpeg/simd/arm',