Commit a2fc0f6a authored by Måns Rullgård's avatar Måns Rullgård
Browse files

ARM: replace "armv4l" with "arm"

Originally committed as revision 16179 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 2600f8c8
......@@ -789,7 +789,7 @@ THREADS_LIST='
ARCH_LIST='
alpha
armv4l
arm
bfin
ia64
m68k
......@@ -933,14 +933,14 @@ CMDLINE_SET="
# architecture extensions
altivec_deps="powerpc"
armv5te_deps="armv4l"
armv6_deps="armv4l"
armvfp_deps="armv4l"
iwmmxt_deps="armv4l"
armv5te_deps="arm"
armv6_deps="arm"
armvfp_deps="arm"
iwmmxt_deps="arm"
mmi_deps="mips"
mmx_deps="x86"
mmx2_deps="x86 mmx"
neon_deps="armv4l"
neon_deps="arm"
ssse3_deps="x86"
vis_deps="sparc"
......@@ -1309,9 +1309,8 @@ case "$arch" in
int test[sizeof(char*) - 7];
EOF
;;
# armv4l is a subset of armv[567]*l
arm|armv[4567]*l)
arch="armv4l"
arch="arm"
;;
alpha)
arch="alpha"
......@@ -1785,7 +1784,7 @@ EOF
fi
# We have to check if pld is a nop and disable it.
enabled armv4l && check_asm pld '"pld [r0]"'
enabled arm && check_asm pld '"pld [r0]"'
enabled armv5te && check_asm armv5te '"qadd r0, r0, r0"'
enabled armv6 && check_asm armv6 '"sadd16 r0, r0, r0"'
enabled armvfp && check_asm armvfp '"fadds s0, s0, s0"'
......@@ -2136,7 +2135,7 @@ if test $arch = "x86_32" -o $arch = "x86_64"; then
echo "EBX available ${ebx_available-no}"
echo "EBP available ${ebp_available-no}"
fi
if test $arch = "armv4l"; then
if test $arch = "arm"; then
echo "ARMv5TE enabled ${armv5te-no}"
echo "ARMv6 enabled ${armv6-no}"
echo "ARM VFP enabled ${armvfp-no}"
......@@ -2358,7 +2357,7 @@ if enabled source_path_used; then
doc \
libavcodec \
libavcodec/alpha \
libavcodec/armv4l \
libavcodec/arm \
libavcodec/bfin \
libavcodec/i386 \
libavcodec/mlib \
......
......@@ -429,29 +429,29 @@ OBJS-$(ARCH_ALPHA) += alpha/dsputil_alpha.o \
alpha/mpegvideo_alpha.o \
alpha/simple_idct_alpha.o \
OBJS-$(ARCH_ARMV4L) += armv4l/dsputil_arm.o \
armv4l/dsputil_arm_s.o \
armv4l/jrevdct_arm.o \
armv4l/mpegvideo_arm.o \
armv4l/simple_idct_arm.o \
OBJS-$(ARCH_ARM) += arm/dsputil_arm.o \
arm/dsputil_arm_s.o \
arm/jrevdct_arm.o \
arm/mpegvideo_arm.o \
arm/simple_idct_arm.o \
OBJS-$(HAVE_ARMV5TE) += armv4l/mpegvideo_armv5te.o \
armv4l/mpegvideo_armv5te_s.o \
armv4l/simple_idct_armv5te.o \
OBJS-$(HAVE_ARMV5TE) += arm/mpegvideo_armv5te.o \
arm/mpegvideo_armv5te_s.o \
arm/simple_idct_armv5te.o \
OBJS-$(HAVE_ARMV6) += armv4l/simple_idct_armv6.o \
OBJS-$(HAVE_ARMV6) += arm/simple_idct_armv6.o \
OBJS-$(HAVE_ARMVFP) += armv4l/dsputil_vfp.o \
armv4l/float_arm_vfp.o \
OBJS-$(HAVE_ARMVFP) += arm/dsputil_vfp.o \
arm/float_arm_vfp.o \
OBJS-$(HAVE_IWMMXT) += armv4l/dsputil_iwmmxt.o \
armv4l/mpegvideo_iwmmxt.o \
OBJS-$(HAVE_IWMMXT) += arm/dsputil_iwmmxt.o \
arm/mpegvideo_iwmmxt.o \
OBJS-$(HAVE_NEON) += armv4l/dsputil_neon.o \
armv4l/dsputil_neon_s.o \
armv4l/h264dsp_neon.o \
armv4l/h264idct_neon.o \
armv4l/simple_idct_neon.o \
OBJS-$(HAVE_NEON) += arm/dsputil_neon.o \
arm/dsputil_neon_s.o \
arm/h264dsp_neon.o \
arm/h264idct_neon.o \
arm/simple_idct_neon.o \
OBJS-$(ARCH_BFIN) += bfin/dsputil_bfin.o \
bfin/fdct_bfin.o \
......@@ -499,7 +499,7 @@ TESTS-$(CONFIG_OLDSCALER) += imgresample-test$(EXESUF)
TESTS-$(ARCH_X86) += i386/cpuid-test$(EXESUF) motion-test$(EXESUF)
CLEANFILES = apiexample$(EXESUF)
DIRS = alpha armv4l bfin i386 mlib ppc ps2 sh4 sparc
DIRS = alpha arm bfin i386 mlib ppc ps2 sh4 sparc
include $(SUBDIR)../subdir.mak
......
/*
* ARMv4L optimized DSP utils
* ARM optimized DSP utils
* Copyright (c) 2001 Lionel Ulmer.
*
* This file is part of FFmpeg.
......@@ -121,7 +121,7 @@ int mm_support(void)
return ENABLE_IWMMXT * FF_MM_IWMMXT;
}
void dsputil_init_armv4l(DSPContext* c, AVCodecContext *avctx)
void dsputil_init_arm(DSPContext* c, AVCodecContext *avctx)
{
int idct_algo= avctx->idct_algo;
......
@
@ ARMv4L optimized DSP utils
@ ARMv4 optimized DSP utils
@ Copyright (c) 2004 AGAWA Koji <i (AT) atty (DOT) jp>
@
@ This file is part of FFmpeg.
......
......@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVCODEC_ARMV4L_MATHOPS_H
#define AVCODEC_ARMV4L_MATHOPS_H
#ifndef AVCODEC_ARM_MATHOPS_H
#define AVCODEC_ARM_MATHOPS_H
#include <stdint.h>
#include "libavutil/common.h"
......@@ -90,4 +90,4 @@ static inline av_const MUL16(int ra, int rb)
#endif
#endif /* AVCODEC_ARMV4L_MATHOPS_H */
#endif /* AVCODEC_ARM_MATHOPS_H */
......@@ -25,7 +25,7 @@
void MPV_common_init_iwmmxt(MpegEncContext *s);
void MPV_common_init_armv5te(MpegEncContext *s);
void MPV_common_init_armv4l(MpegEncContext *s)
void MPV_common_init_arm(MpegEncContext *s)
{
/* IWMMXT support is a superset of armv5te, so
* allow optimized functions for armv5te unless
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment