Bug 1521078 - Don't assemble include only .asm files. r=TD-Linux
authorAlex Chronopoulos <achronop@gmail.com>
Mon, 21 Jan 2019 11:23:42 +0000
changeset 514676 b099ed392e48dc314699e15dd0341ef1cf11bab5
parent 514675 1e173178e49f41ecb99f5179308c0591b960ef6f
child 514677 1df92f5b3d7d6527b3ce0b4ef8850df5ee68cc19
push id1953
push userffxbld-merge
push dateMon, 11 Mar 2019 12:10:20 +0000
treeherdermozilla-release@9c35dcbaa899 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersTD-Linux
bugs1521078
milestone66.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1521078 - Don't assemble include only .asm files. r=TD-Linux Differential Revision: https://phabricator.services.mozilla.com/D16975
media/libdav1d/asm/moz.build
media/libvpx/generate_sources_mozbuild.sh
--- a/media/libdav1d/asm/moz.build
+++ b/media/libdav1d/asm/moz.build
@@ -21,31 +21,28 @@ CFLAGS += [
     '-I%s/dist/include/dav1d/' % TOPOBJDIR,
 ]
 
 # This is Linux only for now
 
 # Attaching config.asm file
 if CONFIG['CPU_ARCH'] == 'x86':
     ASFLAGS += ['-I%s/media/libdav1d/asm/x86_32/' % TOPSRCDIR]
-    SOURCES += ['x86_32/config.asm']
 
 if CONFIG['CPU_ARCH'] == 'x86_64':
     # Change the default stack aligment (16) to 32
     if CONFIG['CC_TYPE'] == 'clang':
         CFLAGS += ['-mstack-alignment=32']
     elif CONFIG['CC_TYPE'] == 'gcc':
         CFLAGS += ['-mpreferred-stack-boundary=5']
 
     if CONFIG['OS_TARGET'] == 'Darwin':
         ASFLAGS += ['-I%s/media/libdav1d/asm/x86_64/osx/' % TOPSRCDIR]
-        SOURCES += ['x86_64/osx/config.asm']
     else:
         ASFLAGS += ['-I%s/media/libdav1d/asm/x86_64/' % TOPSRCDIR]
-        SOURCES += ['x86_64/config.asm']
 
 if CONFIG['CPU_ARCH'] in ('x86', 'x86_64'):
     SOURCES += [
         '../../../third_party/dav1d/src/x86/cpu.c',
     ]
 
     EXPORTS.dav1d += [
         '../../../third_party/dav1d/src/x86/cpu.h',
--- a/media/libvpx/generate_sources_mozbuild.sh
+++ b/media/libvpx/generate_sources_mozbuild.sh
@@ -75,16 +75,17 @@ function convert_srcs_to_project_files {
 
   local source_list=$(grep -E '(\.c|\.h|\.S|\.s|\.asm)$' $1)
 
   # Remove vpx_config.c.
   source_list=$(echo "$source_list" | grep -v 'vpx_config\.c')
 
   # Remove include-only asm files (no object code emitted)
   source_list=$(echo "$source_list" | grep -v 'x86_abi_support\.asm')
+  source_list=$(echo "$source_list" | grep -v 'config\.asm')
 
   # The actual ARM files end in .asm. We have rules to translate them to .S
   source_list=$(echo "$source_list" | sed s/\.asm\.s$/.asm/)
 
   # Exports - everything in vpx, vpx_mem, vpx_ports, vpx_scale
   local exports_list=$(echo "$source_list" | \
     egrep '^(vpx|vpx_mem|vpx_ports|vpx_scale)/.*h$')
   # but not anything in one level down, like 'internal'