[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [6302] Migrate to check_define
From: |
malc |
Subject: |
[Qemu-devel] [6302] Migrate to check_define |
Date: |
Wed, 14 Jan 2009 18:39:52 +0000 |
Revision: 6302
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6302
Author: malc
Date: 2009-01-14 18:39:52 +0000 (Wed, 14 Jan 2009)
Log Message:
-----------
Migrate to check_define
Modified Paths:
--------------
trunk/configure
Modified: trunk/configure
===================================================================
--- trunk/configure 2009-01-14 18:39:49 UTC (rev 6301)
+++ trunk/configure 2009-01-14 18:39:52 UTC (rev 6302)
@@ -88,8 +88,14 @@
else
cpu="sparc"
fi
+elif check_define _ARCH_PPC ; then
+ if check_define _ARCH_PPC64 ; then
+ cpu="ppc64"
+ else
+ cpu="ppc"
+ fi
else
- cpu=`test $(uname -s) = AIX && uname -p || uname -m`
+ cpu=`uname -m`
fi
target_list=""
@@ -127,9 +133,12 @@
mips64)
cpu="mips64"
;;
- "Power Macintosh"|ppc|ppc64|powerpc)
- cpu="powerpc"
+ ppc)
+ cpu="ppc"
;;
+ ppc64)
+ cpu="ppc64"
+ ;;
s390*)
cpu="s390"
;;
@@ -678,7 +687,8 @@
-o "$cpu" = "m68k" \
-o "$cpu" = "mips" \
-o "$cpu" = "mips64" \
- -o "$cpu" = "powerpc" \
+ -o "$cpu" = "ppc" \
+ -o "$cpu" = "ppc64" \
-o "$cpu" = "s390" \
-o "$cpu" = "sparc" \
-o "$cpu" = "sparc64"; then
@@ -692,20 +702,11 @@
if test "$cpu" = "x86_64" \
-o "$cpu" = "alpha" \
-o "$cpu" = "ia64" \
- -o "$cpu" = "sparc64"; then
+ -o "$cpu" = "sparc64" \
+ -o "$cpu" = "ppc64"; then
hostlongbits="64"
fi
-# ppc specific hostlongbits selection
-if test "$cpu" = "powerpc" ; then
- if $cc $ARCH_CFLAGS -dM -E - -o $TMPI 2>/dev/null </dev/null; then
- grep -q __powerpc64__ $TMPI && hostlongbits=64
- else
- echo hostlongbits test failed
- exit 1
- fi
-fi
-
# check gcc options support
cat > $TMPC <<EOF
int main(void) {
@@ -1210,15 +1211,14 @@
echo "ARCH=mips64" >> $config_mak
echo "#define HOST_MIPS64 1" >> $config_h
;;
- powerpc)
- if test "$hostlongbits" = "32"; then
- echo "ARCH=ppc" >> $config_mak
- echo "#define HOST_PPC 1" >> $config_h
- else
- echo "ARCH=ppc64" >> $config_mak
- echo "#define HOST_PPC64 1" >> $config_h
- fi
+ ppc)
+ echo "ARCH=ppc" >> $config_mak
+ echo "#define HOST_PPC 1" >> $config_h
;;
+ ppc64)
+ echo "ARCH=ppc64" >> $config_mak
+ echo "#define HOST_PPC64 1" >> $config_h
+ ;;
s390)
echo "ARCH=s390" >> $config_mak
echo "#define HOST_S390 1" >> $config_h
@@ -1534,7 +1534,7 @@
# Make sure the target and host cpus are compatible
if test "$kvm" = "yes" -a ! \( "$target_cpu" = "$cpu" -o \
- \( "$target_cpu" = "ppcemb" -a "$cpu" = "powerpc" \) -o \
+ \( "$target_cpu" = "ppcemb" -a "$cpu" = "ppc" \) -o \
\( "$target_cpu" = "x86_64" -a "$cpu" = "i386" \) -o \
\( "$target_cpu" = "i386" -a "$cpu" = "x86_64" \) \) ; then
kvm="no"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [6302] Migrate to check_define,
malc <=