diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-12-19 13:51:11 -0800 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-12-19 13:51:11 -0800 |
| commit | 056bcc877111cfb4c32daf1c493df3d86eb1ec35 (patch) | |
| tree | 78d3aea9ec52469d96ee176570f0d14e2825d772 | |
| parent | 080919b3c2dea17d1a8db0e8a12f94ed587b54d0 (diff) | |
| download | libvpx-056bcc877111cfb4c32daf1c493df3d86eb1ec35.tar libvpx-056bcc877111cfb4c32daf1c493df3d86eb1ec35.tar.gz libvpx-056bcc877111cfb4c32daf1c493df3d86eb1ec35.tar.bz2 libvpx-056bcc877111cfb4c32daf1c493df3d86eb1ec35.zip | |
remove armv6 files from armv5 build
Make bilinearfilter_arm.c compiled only when HAVE_ARMV6, as its definitions
are v6 only. This is normally not a problem for static builds as the file
is elided at link time, but this was not being done properly for the
--enable-shared --enable-pic build.
Change-Id: Ic800a7cde751f74f22555c5b247f99f9df5e550d
| -rw-r--r-- | vp8/encoder/arm/variance_arm.c | 2 | ||||
| -rw-r--r-- | vp8/vp8_common.mk | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vp8/encoder/arm/variance_arm.c b/vp8/encoder/arm/variance_arm.c index e77be9f73..7fc7473ac 100644 --- a/vp8/encoder/arm/variance_arm.c +++ b/vp8/encoder/arm/variance_arm.c @@ -11,9 +11,9 @@ #include "vpx_config.h" #include "vp8/encoder/variance.h" #include "vp8/common/filter.h" -#include "vp8/common/arm/bilinearfilter_arm.h" #if HAVE_ARMV6 +#include "vp8/common/arm/bilinearfilter_arm.h" unsigned int vp8_sub_pixel_variance8x8_armv6 ( diff --git a/vp8/vp8_common.mk b/vp8/vp8_common.mk index e2756a6ca..8b7f0fd45 100644 --- a/vp8/vp8_common.mk +++ b/vp8/vp8_common.mk @@ -115,8 +115,6 @@ endif # common (c) VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/arm_systemdependent.c -VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/bilinearfilter_arm.c -VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/bilinearfilter_arm.h VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/filter_arm.c VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/idct_arm.h VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/loopfilter_arm.c @@ -128,6 +126,8 @@ VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/dequantize_arm.c VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/dequantize_arm.h # common (armv6) +VP8_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/bilinearfilter_arm.c +VP8_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/bilinearfilter_arm.h VP8_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/bilinearfilter_v6$(ASM) VP8_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/copymem8x4_v6$(ASM) VP8_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/copymem8x8_v6$(ASM) |