Don't use LLVM internal assembler on armhf

Avoid the usage of LLVM own assembler implementation on specific parts
as the assembler isn't build with NEON support.

Author: Olivier Tilloy <olivier.tilloy@canonical.com>
Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1561819

Gbp-Pq: Topic porting-armhf
Gbp-Pq: Name Don-t-use-LLVM-internal-assembler-on-armhf.patch

diff --git a/gfx/ycbcr/moz.build b/gfx/ycbcr/moz.build
index c643fbaf406b872aa36ef74c4b0668c9b87352af..59a7eab46cca2e2d7b663df17ed836b61a48036d 100644 (file)
--- a/gfx/ycbcr/moz.build
+++ b/gfx/ycbcr/moz.build
@@ -60,6 +60,9 @@ if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['HAVE_ARM_NEON']:
     SOURCES += [
         'yuv_convert_arm.cpp',
     ]
+    # The integrated assembler fails to build yuv_convert_arm.cpp because it doesn't have NEON
+    if CONFIG['CC_TYPE'] == 'clang':
+        CXXFLAGS += ['-fno-integrated-as']
 
 LOCAL_INCLUDES += ['/media/libyuv/libyuv/include']
 

diff --git a/media/libjpeg/moz.build b/media/libjpeg/moz.build
index c214868216c6a8b51c5a5918288a2252adc29e6d..dba24f2f580f0ce1c747e9380f713b053c5a38cd 100644 (file)
--- a/media/libjpeg/moz.build
+++ b/media/libjpeg/moz.build
@@ -219,6 +219,10 @@ if CONFIG['CPU_ARCH'] == 'x86_64':
     ASFLAGS += ['-I%s/media/libjpeg/simd/nasm/' % TOPSRCDIR]
     ASFLAGS += ['-I%s/media/libjpeg/simd/x86_64/' % TOPSRCDIR]
 
+# The integrated assembler fails to build simd/arm/jsimd_neon.S because it doesn't have NEON
+if CONFIG['CC_TYPE'] == 'clang' and CONFIG['CPU_ARCH'] == 'arm':
+    ASFLAGS += ['-fno-integrated-as']
+
 # We allow warnings for third-party code that can be updated from upstream.
 AllowCompilerWarnings()