From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Me5AL-0001ob-9s for qemu-devel@nongnu.org; Thu, 20 Aug 2009 06:46:45 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Me5AG-0001iO-8g for qemu-devel@nongnu.org; Thu, 20 Aug 2009 06:46:44 -0400 Received: from [199.232.76.173] (port=48670 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Me5AF-0001i8-JS for qemu-devel@nongnu.org; Thu, 20 Aug 2009 06:46:39 -0400 Received: from cantor2.suse.de ([195.135.220.15]:50586 helo=mx2.suse.de) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Me5AF-0003qy-38 for qemu-devel@nongnu.org; Thu, 20 Aug 2009 06:46:39 -0400 From: Ulrich Hecht Date: Thu, 20 Aug 2009 12:46:38 +0200 Message-Id: <1250765198-9420-1-git-send-email-uli@suse.de> Subject: [Qemu-devel] [PATCH 03/13] S/390 host/target build system support List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Anthony Liguori changes to configure and makefiles for S/390 host and target support, fixed as suggested by Juan Quintela adapted to most recent changes in build system Signed-off-by: Ulrich Hecht --- configure | 22 ++++++++++++++++------ 1 files changed, 16 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 0b2c721..8e109c5 100755 --- a/configure +++ b/configure @@ -156,9 +156,12 @@ case "$cpu" in parisc|parisc64) cpu="hppa" ;; - s390*) + s390) cpu="s390" ;; + s390x) + cpu="s390x" + ;; sparc|sun4[cdmuv]) cpu="sparc" ;; @@ -730,6 +733,7 @@ sh4eb-linux-user \ sparc-linux-user \ sparc64-linux-user \ sparc32plus-linux-user \ +s390x-linux-user \ " fi # the following are Darwin specific @@ -785,7 +789,7 @@ fi # host long bits test hostlongbits="32" case "$cpu" in - x86_64|alpha|ia64|sparc64|ppc64) + x86_64|alpha|ia64|sparc64|ppc64|s390x) hostlongbits=64 ;; esac @@ -1562,7 +1566,7 @@ echo >> $config_host_mak echo "CONFIG_QEMU_SHAREDIR=\"$prefix$datasuffix\"" >> $config_host_mak case "$cpu" in - i386|x86_64|alpha|cris|hppa|ia64|m68k|microblaze|mips|mips64|ppc|ppc64|s390|sparc|sparc64) + i386|x86_64|alpha|cris|hppa|ia64|m68k|microblaze|mips|mips64|ppc|ppc64|s390|s390x|sparc|sparc64) ARCH=$cpu ;; armv4b|armv4l) @@ -1824,7 +1828,7 @@ config_h=$target_dir/config.h target_arch2=`echo $target | cut -d '-' -f 1` target_bigendian="no" case "$target_arch2" in - armeb|m68k|microblaze|mips|mipsn32|mips64|ppc|ppcemb|ppc64|ppc64abi32|sh4eb|sparc|sparc64|sparc32plus) + armeb|m68k|microblaze|mips|mipsn32|mips64|ppc|ppcemb|ppc64|ppc64abi32|s390x|sh4eb|sparc|sparc64|sparc32plus) target_bigendian=yes ;; esac @@ -1985,6 +1989,10 @@ case "$target_arch2" in echo "TARGET_ABI32=y" >> $config_mak target_phys_bits=64 ;; + s390x) + target_nptl="yes" + target_phys_bits=64 + ;; *) echo "Unsupported target CPU" exit 1 @@ -2057,7 +2065,7 @@ fi echo "TARGET_XML_FILES=$list" >> $config_mak case "$target_arch2" in - arm|armeb|m68k|microblaze|mips|mipsel|mipsn32|mipsn32el|mips64|mips64el|ppc|ppc64|ppc64abi32|ppcemb|sparc|sparc64|sparc32plus) + arm|armeb|m68k|microblaze|mips|mipsel|mipsn32|mipsn32el|mips64|mips64el|ppc|ppc64|ppc64abi32|ppcemb|s390x|sparc|sparc64|sparc32plus) echo "CONFIG_SOFTFLOAT=y" >> $config_mak ;; *) @@ -2090,6 +2098,8 @@ ldflags="" if test "$ARCH" = "sparc64" ; then cflags="-I\$(SRC_PATH)/tcg/sparc $cflags" +elif test "$ARCH" = "s390x" ; then + cflags="-I\$(SRC_PATH)/tcg/s390 $cflags" else cflags="-I\$(SRC_PATH)/tcg/\$(ARCH) $cflags" fi @@ -2125,7 +2135,7 @@ for i in $ARCH $TARGET_BASE_ARCH ; do ppc*) echo "CONFIG_PPC_DIS=y" >> $config_mak ;; - s390) + s390*) echo "CONFIG_S390_DIS=y" >> $config_mak ;; sh4) -- 1.6.2.1