aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Poirier <gpoirier@mplayerhq.hu>2006-05-16 14:24:45 +0000
committerGuillaume Poirier <gpoirier@mplayerhq.hu>2006-05-16 14:24:45 +0000
commitc2f69579bb9cb929fb2cfcba426f524f0f107169 (patch)
tree2e5caecc9002cbb37058a7be5b77dc6f70d841bd
parentb997b34fa7a52120acd6738258c7049e54f10821 (diff)
downloadffmpeg-c2f69579bb9cb929fb2cfcba426f524f0f107169.tar.gz
fix compilation of 3dnowext instinsincs, both on ia32 and AMD64.
3dnow intrinsincs are for now only compiled if 3dnowext support is available. (I should add smth that checks for plain 3dnow later) Originally committed as revision 5386 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rwxr-xr-xconfigure8
-rw-r--r--libavcodec/Makefile7
2 files changed, 13 insertions, 2 deletions
diff --git a/configure b/configure
index ea24e7dae6..f491f2aaa7 100755
--- a/configure
+++ b/configure
@@ -1114,13 +1114,19 @@ fi
cat > $TMPC << EOF
#include <mm3dnow.h>
int main(void) {
+__m64 b1;
+b1 = _m_pswapd(b1);
_m_femms();
return 0;
}
EOF
mm3dnow=no
-if $cc -m3dnow -o $TMPO $TMPC 2> /dev/null ; then
+march=athlon
+if test "$cpu" = "x86_64"; then
+ march=k8
+fi
+if $cc -march=$march -o $TMPO $TMPC 2> /dev/null ; then
mm3dnow=yes
fi
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 6f82a5bd3e..afc63b752b 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -350,7 +350,12 @@ depend: CFLAGS+= -msse
endif
ifdef TARGET_BUILTIN_3DNOW
i386/fft_3dn.o: CFLAGS+= -m3dnow
-i386/fft_3dn2.o: CFLAGS+= -m3dnow
+ifeq ($(TARGET_ARCH_X86),yes)
+i386/fft_3dn2.o: CFLAGS+= -march=athlon
+endif
+ifeq ($(TARGET_ARCH_X86_64),yes)
+i386/fft_3dn2.o: CFLAGS+= -march=k8
+endif
endif
endif