From c2f69579bb9cb929fb2cfcba426f524f0f107169 Mon Sep 17 00:00:00 2001
From: Guillaume Poirier <gpoirier@mplayerhq.hu>
Date: Tue, 16 May 2006 14:24:45 +0000
Subject: [PATCH] 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
---
 configure           | 8 +++++++-
 libavcodec/Makefile | 7 ++++++-
 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