Bug 1555530 - Don't use integrated assembler with clang on ppc64 and s390x. r=froydnj a=jcristau
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 05 Jun 2019 00:34:33 +0000
changeset 536681 aa64aae1b32d2f2a1cc1829c67da7e18c6899bd1
parent 536680 aa3b94c7550a02cb7b9b23244cb62eb31af224e8
child 536682 078657522e9e0c0db743a772efa0322d1e436057
push id2082
push userffxbld-merge
push dateMon, 01 Jul 2019 08:34:18 +0000
treeherdermozilla-release@2fb19d0466d2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj, jcristau
bugs1555530
milestone68.0
Bug 1555530 - Don't use integrated assembler with clang on ppc64 and s390x. r=froydnj a=jcristau Differential Revision: https://phabricator.services.mozilla.com/D33728
xpcom/reflect/xptcall/md/unix/moz.build
--- a/xpcom/reflect/xptcall/md/unix/moz.build
+++ b/xpcom/reflect/xptcall/md/unix/moz.build
@@ -161,22 +161,26 @@ if CONFIG['CPU_ARCH'] == 'ppc':
             'xptcinvoke_asm_ppc_linux.S',
             'xptcinvoke_ppc_linux.cpp',
             'xptcstubs_asm_ppc_linux.S',
             'xptcstubs_ppc_linux.cpp',
         ]
 
 if CONFIG['CPU_ARCH'] == 'ppc64':
     if CONFIG['OS_ARCH'] in ('Linux', 'FreeBSD'):
-          SOURCES += [
-              'xptcinvoke_asm_ppc64_linux.S',
-              'xptcinvoke_ppc64_linux.cpp',
-              'xptcstubs_asm_ppc64_linux.S',
-              'xptcstubs_ppc64_linux.cpp',
-          ]
+        SOURCES += [
+            'xptcinvoke_asm_ppc64_linux.S',
+            'xptcinvoke_ppc64_linux.cpp',
+            'xptcstubs_asm_ppc64_linux.S',
+            'xptcstubs_ppc64_linux.cpp',
+        ]
+        if CONFIG['CC_TYPE'] == 'clang':
+            ASFLAGS += [
+                '-fno-integrated-as',
+            ]
 
 if CONFIG['OS_ARCH'] == 'OpenBSD' and CONFIG['CPU_ARCH'] == 'ppc':
     SOURCES += [
         'xptcinvoke_asm_ppc_openbsd.S',
         'xptcinvoke_ppc_openbsd.cpp',
         'xptcstubs_asm_ppc_openbsd.S',
         'xptcstubs_ppc_openbsd.cpp',
     ]
@@ -231,14 +235,18 @@ if CONFIG['OS_ARCH'] == 'Linux':
             'xptcstubs_linux_s390x.cpp',
         ]
         CXXFLAGS += [
             '-fno-strict-aliasing',
             '-fno-inline',
             '-fomit-frame-pointer',
             '-mbackchain',
         ]
+        if CONFIG['CC_TYPE'] == 'clang':
+            CXXFLAGS += [
+                '-fno-integrated-as',
+            ]
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '../..',
 ]