diff options
| author | Falk Hüffner <mellum@users.sourceforge.net> | 2002-09-19 16:06:25 +0000 |
|---|---|---|
| committer | Falk Hüffner <mellum@users.sourceforge.net> | 2002-09-19 16:06:25 +0000 |
| commit | 0af65aac18e8647d4098f625015af649d14aa084 (patch) | |
| tree | 45a40189dfd4b4f05b0c87345ea50817f1de13a7 | |
| parent | 590d3f81b75a235074a3bbb4a6ce0461163963bc (diff) | |
| download | ffmpeg-streaming-0af65aac18e8647d4098f625015af649d14aa084.zip ffmpeg-streaming-0af65aac18e8647d4098f625015af649d14aa084.tar.gz | |
* Remove -finline-limit=8000 (not supported by gcc 2.95)
* Hack to force correct gcc arch flags for motion_est_alpha.c
Originally committed as revision 956 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/Makefile | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index aecd34f..6f31975 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -69,7 +69,7 @@ endif ifeq ($(TARGET_ARCH_ALPHA),yes) OBJS += alpha/dsputil_alpha.o alpha/mpegvideo_alpha.o alpha/motion_est_alpha.o ASM_OBJS += alpha/dsputil_alpha_asm.o -CFLAGS += -Wa,-mpca56 -finline-limit=8000 -fforce-addr -freduce-all-givs +CFLAGS += -fforce-addr -freduce-all-givs endif ifeq ($(TARGET_ARCH_POWERPC),yes) @@ -110,6 +110,17 @@ dsputil.o: dsputil.c dsputil.h %.o: %.S $(CC) $(CFLAGS) -c -o $@ $< +# motion_est_alpha uses the MVI extension, which is not available with +# -mcpu=ev4 (default) or ev5/ev56. Thus, force -mcpu=pca56 in those +# cases. +ifeq ($(TARGET_ARCH_ALPHA),yes) +alpha/motion_est_alpha.o: alpha/motion_est_alpha.c + cpu=`echo "$(CFLAGS)" | sed -n 's,.*-mcpu=\([a-zA-Z0-9]*\).*,\1,p'`; \ + case x"$$cpu" in x|xev[45]*) newcpu=pca56;; *) newcpu=$$cpu;; esac; \ + echo $(CC) $(CFLAGS) -mcpu=$$newcpu -c -o $@ $<;\ + $(CC) $(CFLAGS) -mcpu=$$newcpu -c -o $@ $< +endif + # depend only used by mplayer now dep: depend |
