Fix CONFIG_DAALA_DCT4/8/16 builds with CMake. Build aom_ports/x86/emms.asm for all x86 targets. It was previously guarded by HAVE_MMX, which violates assumptions established by the configure build. BUG=aomedia:683 Change-Id: Icac2b0ba6272c61dbb71dfc3824a8cf391c251b6
diff --git a/aom_ports/aom_ports.cmake b/aom_ports/aom_ports.cmake index 922691e..e1ffb56 100644 --- a/aom_ports/aom_ports.cmake +++ b/aom_ports/aom_ports.cmake
@@ -22,16 +22,16 @@ "${AOM_ROOT}/aom_ports/msvc.h" "${AOM_ROOT}/aom_ports/system_state.h") +set(AOM_PORTS_ASM_X86 "${AOM_ROOT}/aom_ports/emms.asm") + set(AOM_PORTS_INCLUDES_X86 "${AOM_ROOT}/aom_ports/x86_abi_support.asm") -set(AOM_PORTS_ASM_MMX "${AOM_ROOT}/aom_ports/emms.asm") - set(AOM_PORTS_SOURCES_ARM "${AOM_ROOT}/aom_ports/arm.h" "${AOM_ROOT}/aom_ports/arm_cpudetect.c") -# For arm targets and targets where HAVE_MMX is true: +# For arm and x86 targets: # Creates the aom_ports build target, adds the includes in aom_ports to the # target, and makes libaom depend on it. # Otherwise: @@ -39,8 +39,8 @@ # For all target platforms: # The libaom target must exist before this function is called. function (setup_aom_ports_targets) - if (HAVE_MMX) - add_asm_library("aom_ports" "AOM_PORTS_ASM_MMX" "aom") + if ("${AOM_TARGET_CPU}" MATCHES "^x86") + add_asm_library("aom_ports" "AOM_PORTS_ASM_X86" "aom") set(aom_ports_has_symbols 1) elseif ("${AOM_TARGET_CPU}" MATCHES "arm") add_library(aom_ports OBJECT ${AOM_PORTS_SOURCES_ARM})