[Ffmpeg-devel] amd64 as canonical system type

[Jacob Meuser]

On Mon, May 09, 2005 at 03:37:31PM +0200, Michael Niedermayer wrote:
> Hi
> 
> On Monday 09 May 2005 12:11, Jacob Meuser wrote:
> > $ uname -a
> > OpenBSD puff 3.7 GENERIC#11 amd64
> > $ cc -dumpmachine
> > amd64-unknown-openbsd3.7
> > $ cc -v
> > Reading specs from /usr/lib/gcc-lib/amd64-unknown-openbsd3.7/3.3.5/specs
> > Configured with:
> > Thread model: single
> > gcc version 3.3.5 (propolice)
> > $
> >
> > attached is a patch for configure to properly recognize this
> > as ARCH_X86_64.
> 
> hmm IMHO the amd64 and x86_64 cases should be merged, as cc -dumpmachine might 
> contain x86_64 and uname -a amd64 or the other way around

how's this?

-- 
<jakemsr at jakemsr.com>
-------------- next part --------------
Index: configure
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/configure,v
retrieving revision 1.177
diff -u -r1.177 configure
--- configure	9 May 2005 13:24:22 -0000	1.177
+++ configure	10 May 2005 05:47:37 -0000
@@ -115,12 +115,13 @@
   i386|i486|i586|i686|i86pc|BePC)
     cpu="x86"
   ;;
-  x86_64)
-    if [ "`$cc -dumpmachine | grep x86_64 | cut -d- -f1`" = "x86_64" -a \
-         -z "`echo $CFLAGS | grep -- -m32`"  ]; then
-      cpu="x86_64"
-    else
-      cpu="x86"
+  x86_64|amd64)
+    cpu="x86"
+    canon_arch="`cc -dumpmachine | sed -e 's,\([^-]*\)-.*,\1,'`"
+    if [ x"$canon_arch" = x"x86_64" -o x"$canon_arch" = x"amd64" ]; then
+      if [ -z "`echo $CFLAGS | grep -- -m32`"  ]; then
+        cpu="x86_64"
+      fi
     fi
   ;;
   # armv4l is a subset of armv5tel