Bug 1521078 - Don't assemble include only .asm files. r=TD-Linux

Differential Revision: https://phabricator.services.mozilla.com/D16975

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Alex Chronopoulos 2019-01-21 11:23:42 +00:00
parent 177f356f36
commit ed3d0e43c1
2 changed files with 1 additions and 3 deletions

View File

@ -26,7 +26,6 @@ CFLAGS += [
# 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
@ -37,10 +36,8 @@ if CONFIG['CPU_ARCH'] == 'x86_64':
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 += [

View File

@ -80,6 +80,7 @@ function convert_srcs_to_project_files {
# 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/)