From b39c0022edb5ebacc8138486f4a8c2beb8bcfdcb Mon Sep 17 00:00:00 2001
From: cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 22 Dec 2008 22:56:51 +0000
Subject: Allow compilation of 32bit mplayer on 64 bit systems with --cc='cc
 -m32'.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28180 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 51f49fe0fb..97a784ff76 100755
--- a/configure
+++ b/configure
@@ -1339,8 +1339,8 @@ if test -z "$_target" ; then
       i[3-9]86*|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686|BePC) host_arch=i386 ;;
       ia64) host_arch=ia64 ;;
       x86_64|amd64)
-        if [ -n "`$_cc -dumpmachine | sed -n '/^x86_64-/p;/^amd64-/p'`" -a \
-             -z "`echo $CFLAGS | grep -- -m32`"  ]; then
+        if [ -n "$($_cc -dumpmachine | sed -n '/^x86_64-/p;/^amd64-/p')" -a \
+             -z "$(echo $CFLAGS $_cc | grep -- -m32)" ]; then
           host_arch=x86_64
         else
           host_arch=i386
-- 
cgit v1.2.3


From 693c9737eee4948aaf536c14ccc01e3356b46f15 Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 23 Dec 2008 11:42:11 +0000
Subject: Define HAVE_FAST_64BIT if appropriate

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28182 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'configure')

diff --git a/configure b/configure
index 97a784ff76..d5a44b3afe 100755
--- a/configure
+++ b/configure
@@ -1919,6 +1919,7 @@ EOF
   ia64)
     _arch='IA64'
     _target_arch='ARCH_IA64 = yes'
+    def_fast_64bit='#define HAVE_FAST_64BIT 1'
     iproc='ia64'
     ;;
 
@@ -1927,6 +1928,7 @@ EOF
     _target_arch='ARCH_X86_64 = yes'
     _target_arch_x86="ARCH_X86 = yes"
     _def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1'
+    def_fast_64bit='#define HAVE_FAST_64BIT 1'
     iproc='x86_64'
 
     # gcc >= 3.4.0  doesn't support -mcpu, we have to use -mtune instead
@@ -2011,6 +2013,7 @@ EOF
     if test "$host_arch" = "sparc64" ; then
       _vis='yes'
       proc='ultrasparc'
+      def_fast_64bit='#define HAVE_FAST_64BIT 1'
     elif sunos ; then
 	echocheck "CPU type"
 	karch=`uname -m`
@@ -2050,6 +2053,9 @@ EOF
     _def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1'
     iproc='ppc'
 
+    if test "$host_arch" = "ppc64" -o "$host_arch" = "powerpc64" ; then
+      def_fast_64bit='#define HAVE_FAST_64BIT 1'
+    fi
     echocheck "CPU type"
     case $system_name in
       Linux)
@@ -8532,6 +8538,7 @@ $_def_libswscale_so
 
 $_def_dcbzl
 $_def_extern_prefix
+$def_fast_64bit
 $_def_fast_unaligned
 $_def_mkstemp
 $_def_pthreads
-- 
cgit v1.2.3


From fc9625633bd5e165517ff68e02e2f11196d8ad0f Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 23 Dec 2008 11:42:24 +0000
Subject: Set fast_cmov for all x86_64 systems, except for P4-based systems
 this should be better, in particular cmov is recommended for future systems.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28183 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure')

diff --git a/configure b/configure
index d5a44b3afe..c3d37a5bc9 100755
--- a/configure
+++ b/configure
@@ -1937,6 +1937,7 @@ EOF
     else
 	cpuopt=-mcpu
     fi
+    test $_fast_cmov = "auto" && _fast_cmov=yes
     if test "$_runtime_cpudetection" = no ; then
       case "$pvendor" in
       AuthenticAMD)
@@ -1948,7 +1949,6 @@ EOF
           # 64-bit prescotts exist, but as far as GCC is concerned they
           # have the same capabilities as a nocona.
           proc=nocona
-          test $_fast_cmov = "auto" && _fast_cmov=no
           ;;
         esac
         ;;
-- 
cgit v1.2.3


From ce7fc9babc01b8c3c177400dfbf891e31e63d649 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sat, 27 Dec 2008 12:00:11 +0000
Subject: Set and use only ARCH_PPC, not also ARCH_POWERPC.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28196 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index c3d37a5bc9..4ef38def50 100755
--- a/configure
+++ b/configure
@@ -1681,7 +1681,7 @@ EOF
 fi
 
 
-_arch_all='X86 X86_32 X86_64 IA64 SPARC ARM SH POWERPC PPC ALPHA SGI_MIPS PA_RISC S390 S390X VAX BFIN XTENSA GENERIC'
+_arch_all='X86 X86_32 X86_64 IA64 SPARC ARM SH PPC ALPHA SGI_MIPS PA_RISC S390 S390X VAX BFIN XTENSA GENERIC'
 case "$host_arch" in
   i[3-9]86|x86|x86pc|k5|k6|k6-2|k6-3|pentium*|athlon*|i586-i686)
   _arch='X86 X86_32'
@@ -2047,9 +2047,9 @@ EOF
     ;;
 
   ppc|ppc64|powerpc|powerpc64)
-    _arch='POWERPC PPC'
+    _arch='PPC'
     _def_dcbzl='#undef HAVE_DCBZL'
-    _target_arch='ARCH_POWERPC = yes'
+    _target_arch='ARCH_PPC = yes'
     _def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1'
     iproc='ppc'
 
-- 
cgit v1.2.3