From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JkOr1-0005Iu-T3 for qemu-devel@nongnu.org; Fri, 11 Apr 2008 15:24:08 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JkOr0-0005Hx-Ch for qemu-devel@nongnu.org; Fri, 11 Apr 2008 15:24:06 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JkOr0-0005Hh-1J for qemu-devel@nongnu.org; Fri, 11 Apr 2008 15:24:06 -0400 Received: from mtaout01-winn.ispmail.ntl.com ([81.103.221.47]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1JkOqz-0007rT-OC for qemu-devel@nongnu.org; Fri, 11 Apr 2008 15:24:06 -0400 Received: from aamtaout03-winn.ispmail.ntl.com ([81.103.221.35]) by mtaout01-winn.ispmail.ntl.com with ESMTP id <20080411192701.REOV13584.mtaout01-winn.ispmail.ntl.com@aamtaout03-winn.ispmail.ntl.com> for ; Fri, 11 Apr 2008 20:27:01 +0100 Received: from miranda.arrow ([213.107.26.151]) by aamtaout03-winn.ispmail.ntl.com with ESMTP id <20080411193036.WHRI26699.aamtaout03-winn.ispmail.ntl.com@miranda.arrow> for ; Fri, 11 Apr 2008 20:30:36 +0100 Received: from sdb by miranda.arrow with local (Exim 4.63) (envelope-from ) id 1JkOqv-000819-BW for qemu-devel@nongnu.org; Fri, 11 Apr 2008 20:24:01 +0100 Date: Fri, 11 Apr 2008 20:24:01 +0100 From: Stuart Brady Message-ID: <20080411192401.GA30794@miranda.arrow> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Subject: [Qemu-devel] [PATCH] configure cleanup Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Hi, The included patch rearranges the configure script slightly, to reduce future merge conflicts and to make it easier to read diffs for changes to the script that add support extra host/target architectures/ABIs. (I wouldn't normally shuffle code around like this, but as I stated, the intention is to avoid conflicts, not to create needless churn.) diff -urN qemu-orig/configure qemu-new/configure --- qemu-orig/configure 2008-04-11 20:04:02.000000000 +0100 +++ qemu-new/configure 2008-04-11 19:46:18.000000000 +0100 @@ -575,7 +575,14 @@ else # if cross compiling, cannot launch a program, so make a static guess -if test "$cpu" = "powerpc" -o "$cpu" = "mips" -o "$cpu" = "mips64" -o "$cpu" = "s390" -o "$cpu" = "sparc" -o "$cpu" = "sparc64" -o "$cpu" = "m68k" -o "$cpu" = "armv4b"; then +if test "$cpu" = "armv4b" \ + -o "$cpu" = "m68k" \ + -o "$cpu" = "mips" \ + -o "$cpu" = "mips64" \ + -o "$cpu" = "powerpc" \ + -o "$cpu" = "s390" \ + -o "$cpu" = "sparc" \ + -o "$cpu" = "sparc64"; then bigendian="yes" fi @@ -583,7 +590,10 @@ # host long bits test hostlongbits="32" -if test "$cpu" = "sparc64" -o "$cpu" = "ia64" -o "$cpu" = "x86_64" -o "$cpu" = "alpha"; then +if test "$cpu" = "x86_64" \ + -o "$cpu" = "alpha" \ + -o "$cpu" = "ia64" \ + -o "$cpu" = "sparc64"; then hostlongbits="64" fi @@ -843,42 +853,42 @@ elif test "$cpu" = "x86_64" ; then echo "ARCH=x86_64" >> $config_mak echo "#define HOST_X86_64 1" >> $config_h +elif test "$cpu" = "alpha" ; then + echo "ARCH=alpha" >> $config_mak + echo "#define HOST_ALPHA 1" >> $config_h elif test "$cpu" = "armv4b" ; then echo "ARCH=arm" >> $config_mak echo "#define HOST_ARM 1" >> $config_h elif test "$cpu" = "armv4l" ; then echo "ARCH=arm" >> $config_mak echo "#define HOST_ARM 1" >> $config_h -elif test "$cpu" = "powerpc" ; then - echo "ARCH=ppc" >> $config_mak - echo "#define HOST_PPC 1" >> $config_h +elif test "$cpu" = "cris" ; then + echo "ARCH=cris" >> $config_mak + echo "#define HOST_CRIS 1" >> $config_h +elif test "$cpu" = "ia64" ; then + echo "ARCH=ia64" >> $config_mak + echo "#define HOST_IA64 1" >> $config_h +elif test "$cpu" = "m68k" ; then + echo "ARCH=m68k" >> $config_mak + echo "#define HOST_M68K 1" >> $config_h elif test "$cpu" = "mips" ; then echo "ARCH=mips" >> $config_mak echo "#define HOST_MIPS 1" >> $config_h elif test "$cpu" = "mips64" ; then echo "ARCH=mips64" >> $config_mak echo "#define HOST_MIPS64 1" >> $config_h -elif test "$cpu" = "cris" ; then - echo "ARCH=cris" >> $config_mak - echo "#define HOST_CRIS 1" >> $config_h +elif test "$cpu" = "powerpc" ; then + echo "ARCH=ppc" >> $config_mak + echo "#define HOST_PPC 1" >> $config_h elif test "$cpu" = "s390" ; then echo "ARCH=s390" >> $config_mak echo "#define HOST_S390 1" >> $config_h -elif test "$cpu" = "alpha" ; then - echo "ARCH=alpha" >> $config_mak - echo "#define HOST_ALPHA 1" >> $config_h elif test "$cpu" = "sparc" ; then echo "ARCH=sparc" >> $config_mak echo "#define HOST_SPARC 1" >> $config_h elif test "$cpu" = "sparc64" ; then echo "ARCH=sparc64" >> $config_mak echo "#define HOST_SPARC64 1" >> $config_h -elif test "$cpu" = "ia64" ; then - echo "ARCH=ia64" >> $config_mak - echo "#define HOST_IA64 1" >> $config_h -elif test "$cpu" = "m68k" ; then - echo "ARCH=m68k" >> $config_mak - echo "#define HOST_M68K 1" >> $config_h else echo "Unsupported CPU = $cpu" exit 1 @@ -1049,18 +1059,18 @@ target_cpu=`echo $target | cut -d '-' -f 1` target_bigendian="no" [ "$target_cpu" = "armeb" ] && target_bigendian=yes -[ "$target_cpu" = "sparc" ] && target_bigendian=yes -[ "$target_cpu" = "sparc64" ] && target_bigendian=yes -[ "$target_cpu" = "sparc32plus" ] && target_bigendian=yes +[ "$target_cpu" = "m68k" ] && target_bigendian=yes +[ "$target_cpu" = "mips" ] && target_bigendian=yes +[ "$target_cpu" = "mipsn32" ] && target_bigendian=yes +[ "$target_cpu" = "mips64" ] && target_bigendian=yes [ "$target_cpu" = "ppc" ] && target_bigendian=yes [ "$target_cpu" = "ppcemb" ] && target_bigendian=yes [ "$target_cpu" = "ppc64" ] && target_bigendian=yes [ "$target_cpu" = "ppc64abi32" ] && target_bigendian=yes -[ "$target_cpu" = "mips" ] && target_bigendian=yes -[ "$target_cpu" = "mipsn32" ] && target_bigendian=yes -[ "$target_cpu" = "mips64" ] && target_bigendian=yes [ "$target_cpu" = "sh4eb" ] && target_bigendian=yes -[ "$target_cpu" = "m68k" ] && target_bigendian=yes +[ "$target_cpu" = "sparc" ] && target_bigendian=yes +[ "$target_cpu" = "sparc64" ] && target_bigendian=yes +[ "$target_cpu" = "sparc32plus" ] && target_bigendian=yes target_softmmu="no" target_user_only="no" target_linux_user="no" @@ -1129,6 +1139,18 @@ if test $kqemu = "yes" -a "$target_softmmu" = "yes" -a $cpu = "i386" ; then echo "#define USE_KQEMU 1" >> $config_h fi +elif test "$target_cpu" = "x86_64" ; then + echo "TARGET_ARCH=x86_64" >> $config_mak + echo "#define TARGET_ARCH \"x86_64\"" >> $config_h + echo "#define TARGET_I386 1" >> $config_h + echo "#define TARGET_X86_64 1" >> $config_h + if test $kqemu = "yes" -a "$target_softmmu" = "yes" -a $cpu = "x86_64" ; then + echo "#define USE_KQEMU 1" >> $config_h + fi +elif test "$target_cpu" = "alpha" ; then + echo "TARGET_ARCH=alpha" >> $config_mak + echo "#define TARGET_ARCH \"alpha\"" >> $config_h + echo "#define TARGET_ALPHA 1" >> $config_h elif test "$target_cpu" = "arm" -o "$target_cpu" = "armeb" ; then echo "TARGET_ARCH=arm" >> $config_mak echo "CONFIG_NO_DYNGEN_OP=yes" >> $config_mak @@ -1136,24 +1158,33 @@ echo "#define TARGET_ARM 1" >> $config_h echo "#define CONFIG_NO_DYNGEN_OP 1" >> $config_h bflt="yes" -elif test "$target_cpu" = "sparc" ; then - echo "TARGET_ARCH=sparc" >> $config_mak - echo "#define TARGET_ARCH \"sparc\"" >> $config_h - echo "#define TARGET_SPARC 1" >> $config_h -elif test "$target_cpu" = "sparc64" ; then - echo "TARGET_ARCH=sparc64" >> $config_mak - echo "#define TARGET_ARCH \"sparc64\"" >> $config_h - echo "#define TARGET_SPARC 1" >> $config_h - echo "#define TARGET_SPARC64 1" >> $config_h - elfload32="yes" -elif test "$target_cpu" = "sparc32plus" ; then - echo "TARGET_ARCH=sparc64" >> $config_mak - echo "TARGET_ABI_DIR=sparc" >> $config_mak - echo "TARGET_ARCH2=sparc32plus" >> $config_mak - echo "#define TARGET_ARCH \"sparc64\"" >> $config_h - echo "#define TARGET_SPARC 1" >> $config_h - echo "#define TARGET_SPARC64 1" >> $config_h - echo "#define TARGET_ABI32 1" >> $config_h +elif test "$target_cpu" = "cris" ; then + echo "TARGET_ARCH=cris" >> $config_mak + echo "#define TARGET_ARCH \"cris\"" >> $config_h + echo "#define TARGET_CRIS 1" >> $config_h + echo "CONFIG_SOFTFLOAT=yes" >> $config_mak + echo "#define CONFIG_SOFTFLOAT 1" >> $config_h +elif test "$target_cpu" = "m68k" ; then + echo "TARGET_ARCH=m68k" >> $config_mak + echo "#define TARGET_ARCH \"m68k\"" >> $config_h + echo "#define TARGET_M68K 1" >> $config_h + bflt="yes" +elif test "$target_cpu" = "mips" -o "$target_cpu" = "mipsel" ; then + echo "TARGET_ARCH=mips" >> $config_mak + echo "#define TARGET_ARCH \"mips\"" >> $config_h + echo "#define TARGET_MIPS 1" >> $config_h + echo "#define TARGET_ABI_MIPSO32 1" >> $config_h +elif test "$target_cpu" = "mipsn32" -o "$target_cpu" = "mipsn32el" ; then + echo "TARGET_ARCH=mipsn32" >> $config_mak + echo "#define TARGET_ARCH \"mipsn32\"" >> $config_h + echo "#define TARGET_MIPS 1" >> $config_h + echo "#define TARGET_ABI_MIPSN32 1" >> $config_h +elif test "$target_cpu" = "mips64" -o "$target_cpu" = "mips64el" ; then + echo "TARGET_ARCH=mips64" >> $config_mak + echo "#define TARGET_ARCH \"mips64\"" >> $config_h + echo "#define TARGET_MIPS 1" >> $config_h + echo "#define TARGET_MIPS64 1" >> $config_h + echo "#define TARGET_ABI_MIPSN64 1" >> $config_h elif test "$target_cpu" = "ppc" ; then echo "TARGET_ARCH=ppc" >> $config_mak echo "#define TARGET_ARCH \"ppc\"" >> $config_h @@ -1178,50 +1209,29 @@ echo "#define TARGET_PPC 1" >> $config_h echo "#define TARGET_PPC64 1" >> $config_h echo "#define TARGET_ABI32 1" >> $config_h -elif test "$target_cpu" = "x86_64" ; then - echo "TARGET_ARCH=x86_64" >> $config_mak - echo "#define TARGET_ARCH \"x86_64\"" >> $config_h - echo "#define TARGET_I386 1" >> $config_h - echo "#define TARGET_X86_64 1" >> $config_h - if test $kqemu = "yes" -a "$target_softmmu" = "yes" -a $cpu = "x86_64" ; then - echo "#define USE_KQEMU 1" >> $config_h - fi -elif test "$target_cpu" = "mips" -o "$target_cpu" = "mipsel" ; then - echo "TARGET_ARCH=mips" >> $config_mak - echo "#define TARGET_ARCH \"mips\"" >> $config_h - echo "#define TARGET_MIPS 1" >> $config_h - echo "#define TARGET_ABI_MIPSO32 1" >> $config_h -elif test "$target_cpu" = "mipsn32" -o "$target_cpu" = "mipsn32el" ; then - echo "TARGET_ARCH=mipsn32" >> $config_mak - echo "#define TARGET_ARCH \"mipsn32\"" >> $config_h - echo "#define TARGET_MIPS 1" >> $config_h - echo "#define TARGET_ABI_MIPSN32 1" >> $config_h -elif test "$target_cpu" = "mips64" -o "$target_cpu" = "mips64el" ; then - echo "TARGET_ARCH=mips64" >> $config_mak - echo "#define TARGET_ARCH \"mips64\"" >> $config_h - echo "#define TARGET_MIPS 1" >> $config_h - echo "#define TARGET_MIPS64 1" >> $config_h - echo "#define TARGET_ABI_MIPSN64 1" >> $config_h -elif test "$target_cpu" = "cris" ; then - echo "TARGET_ARCH=cris" >> $config_mak - echo "#define TARGET_ARCH \"cris\"" >> $config_h - echo "#define TARGET_CRIS 1" >> $config_h - echo "CONFIG_SOFTFLOAT=yes" >> $config_mak - echo "#define CONFIG_SOFTFLOAT 1" >> $config_h elif test "$target_cpu" = "sh4" -o "$target_cpu" = "sh4eb" ; then echo "TARGET_ARCH=sh4" >> $config_mak echo "#define TARGET_ARCH \"sh4\"" >> $config_h echo "#define TARGET_SH4 1" >> $config_h bflt="yes" -elif test "$target_cpu" = "m68k" ; then - echo "TARGET_ARCH=m68k" >> $config_mak - echo "#define TARGET_ARCH \"m68k\"" >> $config_h - echo "#define TARGET_M68K 1" >> $config_h - bflt="yes" -elif test "$target_cpu" = "alpha" ; then - echo "TARGET_ARCH=alpha" >> $config_mak - echo "#define TARGET_ARCH \"alpha\"" >> $config_h - echo "#define TARGET_ALPHA 1" >> $config_h +elif test "$target_cpu" = "sparc" ; then + echo "TARGET_ARCH=sparc" >> $config_mak + echo "#define TARGET_ARCH \"sparc\"" >> $config_h + echo "#define TARGET_SPARC 1" >> $config_h +elif test "$target_cpu" = "sparc64" ; then + echo "TARGET_ARCH=sparc64" >> $config_mak + echo "#define TARGET_ARCH \"sparc64\"" >> $config_h + echo "#define TARGET_SPARC 1" >> $config_h + echo "#define TARGET_SPARC64 1" >> $config_h + elfload32="yes" +elif test "$target_cpu" = "sparc32plus" ; then + echo "TARGET_ARCH=sparc64" >> $config_mak + echo "TARGET_ABI_DIR=sparc" >> $config_mak + echo "TARGET_ARCH2=sparc32plus" >> $config_mak + echo "#define TARGET_ARCH \"sparc64\"" >> $config_h + echo "#define TARGET_SPARC 1" >> $config_h + echo "#define TARGET_SPARC64 1" >> $config_h + echo "#define TARGET_ABI32 1" >> $config_h else echo "Unsupported target CPU" exit 1 @@ -1247,7 +1257,18 @@ echo "#define CONFIG_DARWIN_USER 1" >> $config_h fi -if test "$target_cpu" = "arm" -o "$target_cpu" = "armeb" -o "$target_cpu" = "sparc" -o "$target_cpu" = "sparc64" -o "$target_cpu" = "sparc32plus" -o "$target_cpu" = "m68k" -o "$target_cpu" = "mips" -o "$target_cpu" = "mipsel" -o "$target_cpu" = "mipsn32" -o "$target_cpu" = "mipsn32el" -o "$target_cpu" = "mips64" -o "$target_cpu" = "mips64el"; then +if test "$target_cpu" = "arm" \ + -o "$target_cpu" = "armeb" \ + -o "$target_cpu" = "m68k" \ + -o "$target_cpu" = "mips" \ + -o "$target_cpu" = "mipsel" \ + -o "$target_cpu" = "mipsn32" \ + -o "$target_cpu" = "mipsn32el" \ + -o "$target_cpu" = "mips64" \ + -o "$target_cpu" = "mips64el" \ + -o "$target_cpu" = "sparc" \ + -o "$target_cpu" = "sparc64" \ + -o "$target_cpu" = "sparc32plus"; then echo "CONFIG_SOFTFLOAT=yes" >> $config_mak echo "#define CONFIG_SOFTFLOAT 1" >> $config_h fi Cheers, -- Stuart Brady