Bug 1509724 - Don't include x86_abi_support.asm in libvpx build. r=dmajor
authorThomas Daede <tdaede@mozilla.com>
Wed, 16 Jan 2019 21:42:38 +0000
changeset 514144 c82dc10b75c089465aa167d3905ffbe8f0643e31
parent 514143 2664998ae6e62503cacd55a91cdf701dcad43415
child 514145 62cf6d29e787107d8632a31f0ef4ca7645287df3
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)
reviewersdmajor
bugs1509724
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 1509724 - Don't include x86_abi_support.asm in libvpx build. r=dmajor Differential Revision: https://phabricator.services.mozilla.com/D16615
media/libvpx/generate_sources_mozbuild.sh
media/libvpx/sources.mozbuild
--- a/media/libvpx/generate_sources_mozbuild.sh
+++ b/media/libvpx/generate_sources_mozbuild.sh
@@ -73,16 +73,19 @@ function convert_srcs_to_project_files {
   # 1. Filter .c, .h, .s, .S and .asm files.
   # 3. Convert .asm.s to .asm because moz.build will do the conversion.
 
   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')
+
   # 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'
   exports_list=$(echo "$exports_list" | egrep -v '/(internal|src)/')
--- a/media/libvpx/sources.mozbuild
+++ b/media/libvpx/sources.mozbuild
@@ -251,17 +251,16 @@ files = {
     'libvpx/vpx_dsp/x86/vpx_subpixel_8t_intrin_avx2.c',
     'libvpx/vpx_dsp/x86/vpx_subpixel_8t_intrin_ssse3.c',
     'libvpx/vpx_dsp/x86/vpx_subpixel_8t_sse2.asm',
     'libvpx/vpx_dsp/x86/vpx_subpixel_8t_ssse3.asm',
     'libvpx/vpx_dsp/x86/vpx_subpixel_bilinear_sse2.asm',
     'libvpx/vpx_dsp/x86/vpx_subpixel_bilinear_ssse3.asm',
     'libvpx/vpx_mem/vpx_mem.c',
     'libvpx/vpx_ports/emms.asm',
-    'libvpx/vpx_ports/x86_abi_support.asm',
     'libvpx/vpx_scale/generic/gen_scalers.c',
     'libvpx/vpx_scale/generic/vpx_scale.c',
     'libvpx/vpx_scale/generic/yv12config.c',
     'libvpx/vpx_scale/generic/yv12extend.c',
     'libvpx/vpx_scale/vpx_scale_rtcd.c',
     'libvpx/vpx_util/vpx_thread.c',
     'libvpx/vpx_util/vpx_write_yuv_frame.c',
 ],
@@ -510,17 +509,16 @@ files = {
     'libvpx/vpx_dsp/x86/vpx_subpixel_8t_intrin_avx2.c',
     'libvpx/vpx_dsp/x86/vpx_subpixel_8t_intrin_ssse3.c',
     'libvpx/vpx_dsp/x86/vpx_subpixel_8t_sse2.asm',
     'libvpx/vpx_dsp/x86/vpx_subpixel_8t_ssse3.asm',
     'libvpx/vpx_dsp/x86/vpx_subpixel_bilinear_sse2.asm',
     'libvpx/vpx_dsp/x86/vpx_subpixel_bilinear_ssse3.asm',
     'libvpx/vpx_mem/vpx_mem.c',
     'libvpx/vpx_ports/emms.asm',
-    'libvpx/vpx_ports/x86_abi_support.asm',
     'libvpx/vpx_scale/generic/gen_scalers.c',
     'libvpx/vpx_scale/generic/vpx_scale.c',
     'libvpx/vpx_scale/generic/yv12config.c',
     'libvpx/vpx_scale/generic/yv12extend.c',
     'libvpx/vpx_scale/vpx_scale_rtcd.c',
     'libvpx/vpx_util/vpx_thread.c',
     'libvpx/vpx_util/vpx_write_yuv_frame.c',
 ],