From 7cf0c783c1c099177b9b847c01d2c963ddf8288d Mon Sep 17 00:00:00 2001 From: James Zern Date: Tue, 4 Feb 2014 20:04:38 -0800 Subject: [PATCH] *.mk: s/\bUSE_X86INC/CONFIG_USE_X86INC/ CONFIG_USE_X86INC is available to every makefile, there's no need to duplicate its value with USE_X86INC Change-Id: Id12bd5f09cba78abba56ab5a8f56351562e5b8b6 --- libs.mk | 7 ------- vp9/vp9_common.mk | 2 +- vp9/vp9cx.mk | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/libs.mk b/libs.mk index cc40451d4..6c7d0801c 100644 --- a/libs.mk +++ b/libs.mk @@ -57,13 +57,6 @@ CLEAN-OBJS += $$(BUILD_PFX)$(1).h RTCD += $$(BUILD_PFX)$(1).h endef -# x86inc.asm is not compatible with pic 32bit builds. Restrict -# files which use it to 64bit builds or 32bit without pic -USE_X86INC = no -ifeq ($(CONFIG_USE_X86INC),yes) - USE_X86INC = yes -endif - CODEC_SRCS-yes += CHANGELOG CODEC_SRCS-yes += libs.mk diff --git a/vp9/vp9_common.mk b/vp9/vp9_common.mk index c691411bf..3dcf38437 100644 --- a/vp9/vp9_common.mk +++ b/vp9/vp9_common.mk @@ -81,7 +81,7 @@ VP9_COMMON_SRCS-$(HAVE_MMX) += common/x86/vp9_postproc_mmx.asm VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp9_postproc_sse2.asm endif -ifeq ($(USE_X86INC),yes) +ifeq ($(CONFIG_USE_X86INC),yes) VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp9_copy_sse2.asm VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp9_intrapred_sse2.asm VP9_COMMON_SRCS-$(HAVE_SSSE3) += common/x86/vp9_intrapred_ssse3.asm diff --git a/vp9/vp9cx.mk b/vp9/vp9cx.mk index 131d6c77f..c2a520eee 100644 --- a/vp9/vp9cx.mk +++ b/vp9/vp9cx.mk @@ -90,7 +90,7 @@ VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_subpel_variance_impl_sse2.asm VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_temporal_filter_apply_sse2.asm VP9_CX_SRCS-$(HAVE_SSE3) += encoder/x86/vp9_sad_sse3.asm -ifeq ($(USE_X86INC),yes) +ifeq ($(CONFIG_USE_X86INC),yes) VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_error_sse2.asm VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_sad_sse2.asm VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_subtract_sse2.asm -- 2.40.0