From patchwork Fri Oct 16 12:38:49 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Hecht X-Patchwork-Id: 36202 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6DD45B7BC7 for ; Fri, 16 Oct 2009 23:43:06 +1100 (EST) Received: from localhost ([127.0.0.1]:36279 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mym99-0006Vj-J4 for incoming@patchwork.ozlabs.org; Fri, 16 Oct 2009 08:43:03 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mym5R-0005C1-8B for qemu-devel@nongnu.org; Fri, 16 Oct 2009 08:39:13 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mym5L-0005AA-GT for qemu-devel@nongnu.org; Fri, 16 Oct 2009 08:39:11 -0400 Received: from [199.232.76.173] (port=37637 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mym5L-00059v-5G for qemu-devel@nongnu.org; Fri, 16 Oct 2009 08:39:07 -0400 Received: from cantor2.suse.de ([195.135.220.15]:36679 helo=mx2.suse.de) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mym5J-0005ie-G3 for qemu-devel@nongnu.org; Fri, 16 Oct 2009 08:39:06 -0400 Received: from relay1.suse.de (mail2.suse.de [195.135.221.8]) by mx2.suse.de (Postfix) with ESMTP id 94E8F8672B; Fri, 16 Oct 2009 14:39:02 +0200 (CEST) From: Ulrich Hecht To: qemu-devel@nongnu.org Date: Fri, 16 Oct 2009 14:38:49 +0200 Message-Id: <1255696735-21396-4-git-send-email-uli@suse.de> X-Mailer: git-send-email 1.6.2.1 In-Reply-To: <1255696735-21396-3-git-send-email-uli@suse.de> References: <1255696735-21396-1-git-send-email-uli@suse.de> <1255696735-21396-2-git-send-email-uli@suse.de> <1255696735-21396-3-git-send-email-uli@suse.de> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.4-2.6 Cc: riku.voipio@iki.fi, agraf@suse.de Subject: [Qemu-devel] [PATCH 3/9] S/390 host/target build system support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 ++++++++++++++++------ default-configs/s390x-linux-user.mak | 1 + 2 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 default-configs/s390x-linux-user.mak diff --git a/configure b/configure index ca6d45c..64be51f 100755 --- a/configure +++ b/configure @@ -157,9 +157,12 @@ case "$cpu" in parisc|parisc64) cpu="hppa" ;; - s390*) + s390) cpu="s390" ;; + s390x) + cpu="s390x" + ;; sparc|sun4[cdmuv]) cpu="sparc" ;; @@ -790,6 +793,7 @@ sh4eb-linux-user \ sparc-linux-user \ sparc64-linux-user \ sparc32plus-linux-user \ +s390x-linux-user \ " fi # the following are Darwin specific @@ -855,7 +859,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 @@ -1819,7 +1823,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) @@ -2090,7 +2094,7 @@ 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 @@ -2250,6 +2254,10 @@ case "$target_arch2" in echo "TARGET_ABI32=y" >> $config_target_mak target_phys_bits=64 ;; + s390x) + target_nptl="yes" + target_phys_bits=64 + ;; *) echo "Unsupported target CPU" exit 1 @@ -2318,7 +2326,7 @@ if test ! -z "$gdb_xml_files" ; then fi 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_target_mak ;; *) @@ -2351,6 +2359,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 @@ -2386,7 +2396,7 @@ for i in $ARCH $TARGET_BASE_ARCH ; do ppc*) echo "CONFIG_PPC_DIS=y" >> $config_target_mak ;; - s390) + s390*) echo "CONFIG_S390_DIS=y" >> $config_target_mak ;; sh4) diff --git a/default-configs/s390x-linux-user.mak b/default-configs/s390x-linux-user.mak new file mode 100644 index 0000000..a243c99 --- /dev/null +++ b/default-configs/s390x-linux-user.mak @@ -0,0 +1 @@ +# Default configuration for s390x-linux-user