summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rwxr-xr-xconfigure6
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 6697f02cc8..c6c376326f 100644
--- a/Makefile
+++ b/Makefile
@@ -354,7 +354,7 @@ SRCS_COMMON-$(LIBMPEG2) += libmpcodecs/vd_libmpeg2.c \
libmpeg2/slice.c
SRCS_COMMON-$(LIBMPEG2)-$(ARCH_ALPHA) += libmpeg2/idct_alpha.c \
libmpeg2/motion_comp_alpha.c
-SRCS_COMMON-$(LIBMPEG2)-$(ARCH_ARMV4L) += libmpeg2/motion_comp_arm.c \
+SRCS_COMMON-$(LIBMPEG2)-$(ARCH_ARM) += libmpeg2/motion_comp_arm.c \
libmpeg2/motion_comp_arm_s.S
SRCS_COMMON-$(LIBMPEG2)-$(HAVE_ALTIVEC) += libmpeg2/idct_altivec.c \
libmpeg2/motion_comp_altivec.c
diff --git a/configure b/configure
index 652694ffae..51f49fe0fb 100755
--- a/configure
+++ b/configure
@@ -1681,7 +1681,7 @@ EOF
fi
-_arch_all='X86 X86_32 X86_64 IA64 SPARC ARM ARMV4L SH POWERPC PPC ALPHA SGI_MIPS PA_RISC S390 S390X VAX BFIN XTENSA GENERIC'
+_arch_all='X86 X86_32 X86_64 IA64 SPARC ARM SH POWERPC PPC ALPHA SGI_MIPS PA_RISC S390 S390X VAX BFIN XTENSA GENERIC'
case "$host_arch" in
i[3-9]86|x86|x86pc|k5|k6|k6-2|k6-3|pentium*|athlon*|i586-i686)
_arch='X86 X86_32'
@@ -2032,8 +2032,8 @@ EOF
;;
arm|armv4l|armv5tel)
- _arch='ARM ARMV4L'
- _target_arch='ARCH_ARMV4L = yes'
+ _arch='ARM'
+ _target_arch='ARCH_ARM = yes'
iproc='arm'
;;