From nobody Sun Nov 16 14:01:57 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1600607380; cv=none; d=zohomail.com; s=zohoarc; b=mZ8Kel8rFrkLsinqJEI3Ho0eW5MpbG5k85g6GsM7XE2brqAuXXaXz93Arqqw++dHjh4rmR4322JNzs/cUDQc7a7Z0bB0YY+Z/0Z+UyWz0hHyn0nTkzckdrGpO/mKh6aUNzQAUADQ6Jusgj8diIYBRXBfyy6lBeC5LRTAZJxJU4o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600607380; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5+tq8qpu88E88Ipztb4Wa3/MoeHfAeXur/zOBQlT2gU=; b=KjKoUpE+arQ7kvlRUzcOVpAB7bBK4NsqnRG3nGWq9mLcCxqtnLGdU95f8w/on+QEkCIlVTaERIQLv5nUzam477MiZR4W6MgS6tur8qZ0MdE/Gbc66JQXPA9/kaSliSrMA9R11Y8E0ncgyLPQBZDcY+zbVwOUT9w4A4p4jl79hlM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1600607379994987.9086562725307; Sun, 20 Sep 2020 06:09:39 -0700 (PDT) Received: from localhost ([::1]:33518 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJz62-00080j-GE for importer@patchew.org; Sun, 20 Sep 2020 09:09:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60116) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJz3r-0006BM-JX for qemu-devel@nongnu.org; Sun, 20 Sep 2020 09:07:23 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:49948 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kJz3k-00017o-Fd for qemu-devel@nongnu.org; Sun, 20 Sep 2020 09:07:23 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-538-VVwEcVApPAWywQQ9GKqueA-1; Sun, 20 Sep 2020 09:07:12 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AF2581074642 for ; Sun, 20 Sep 2020 13:07:11 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6EA0D60C47 for ; Sun, 20 Sep 2020 13:07:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600607235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5+tq8qpu88E88Ipztb4Wa3/MoeHfAeXur/zOBQlT2gU=; b=h9HWv09tIy/lGI4RvdyB8JVprBUqgipCvVkzA+w6xzL0AjoAPldOMD/rS4pZQ7W+iluFmU 0jB1d0kQJbP8AoQL8VAJ97MbfZNf4A5rYrmSRPp7/PYUAUGNVHbSxt4clDfHRQOT0YHj/6 7CWRDFyH/GPSB1qwtEwoUsh7qjQMcrE= X-MC-Unique: VVwEcVApPAWywQQ9GKqueA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 7/9] configure: remove target configuration Date: Sun, 20 Sep 2020 09:07:06 -0400 Message-Id: <20200920130708.1156310-8-pbonzini@redhat.com> In-Reply-To: <20200920130708.1156310-1-pbonzini@redhat.com> References: <20200920130708.1156310-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/20 09:07:15 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.501, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The config-target.mak files are small constant, we can therefore just write them down explicitly. This removes about 10% of the configure script, including the whole logic to detect which accelerators are supported by each target. Signed-off-by: Paolo Bonzini --- configure | 407 +----------------- .../targets/aarch64-linux-user.mak | 5 + default-configs/targets/aarch64-softmmu.mak | 5 + .../targets/aarch64_be-linux-user.mak | 6 + default-configs/targets/alpha-linux-user.mak | 6 + default-configs/targets/alpha-softmmu.mak | 7 + default-configs/targets/arm-linux-user.mak | 7 + default-configs/targets/arm-softmmu.mak | 7 + default-configs/targets/armeb-linux-user.mak | 8 + default-configs/targets/avr-softmmu.mak | 4 + default-configs/targets/cris-linux-user.mak | 3 + default-configs/targets/cris-softmmu.mak | 3 + default-configs/targets/hppa-linux-user.mak | 7 + default-configs/targets/hppa-softmmu.mak | 8 + default-configs/targets/i386-bsd-user.mak | 6 + default-configs/targets/i386-linux-user.mak | 6 + default-configs/targets/i386-softmmu.mak | 7 + default-configs/targets/lm32-softmmu.mak | 4 + default-configs/targets/m68k-linux-user.mak | 8 + default-configs/targets/m68k-softmmu.mak | 7 + .../targets/microblaze-linux-user.mak | 7 + .../targets/microblaze-softmmu.mak | 7 + .../targets/microblazeel-linux-user.mak | 6 + .../targets/microblazeel-softmmu.mak | 6 + default-configs/targets/mips-linux-user.mak | 8 + default-configs/targets/mips-softmmu.mak | 9 + default-configs/targets/mips64-linux-user.mak | 8 + default-configs/targets/mips64-softmmu.mak | 8 + .../targets/mips64el-linux-user.mak | 7 + default-configs/targets/mips64el-softmmu.mak | 7 + default-configs/targets/mipsel-linux-user.mak | 7 + default-configs/targets/mipsel-softmmu.mak | 8 + .../targets/mipsn32-linux-user.mak | 9 + .../targets/mipsn32el-linux-user.mak | 8 + default-configs/targets/moxie-softmmu.mak | 4 + default-configs/targets/nios2-linux-user.mak | 3 + default-configs/targets/nios2-softmmu.mak | 3 + default-configs/targets/or1k-linux-user.mak | 4 + default-configs/targets/or1k-softmmu.mak | 4 + default-configs/targets/ppc-linux-user.mak | 7 + default-configs/targets/ppc-softmmu.mak | 7 + default-configs/targets/ppc64-linux-user.mak | 7 + default-configs/targets/ppc64-softmmu.mak | 8 + .../targets/ppc64abi32-linux-user.mak | 8 + .../targets/ppc64le-linux-user.mak | 6 + .../targets/riscv32-linux-user.mak | 4 + default-configs/targets/riscv32-softmmu.mak | 5 + .../targets/riscv64-linux-user.mak | 4 + default-configs/targets/riscv64-softmmu.mak | 5 + default-configs/targets/rx-softmmu.mak | 4 + default-configs/targets/s390x-linux-user.mak | 7 + default-configs/targets/s390x-softmmu.mak | 8 + default-configs/targets/sh4-linux-user.mak | 7 + default-configs/targets/sh4-softmmu.mak | 6 + default-configs/targets/sh4eb-linux-user.mak | 8 + default-configs/targets/sh4eb-softmmu.mak | 7 + default-configs/targets/sparc-bsd-user.mak | 7 + default-configs/targets/sparc-linux-user.mak | 7 + default-configs/targets/sparc-softmmu.mak | 7 + .../targets/sparc32plus-linux-user.mak | 8 + default-configs/targets/sparc64-bsd-user.mak | 7 + .../targets/sparc64-linux-user.mak | 7 + default-configs/targets/sparc64-softmmu.mak | 7 + default-configs/targets/tilegx-linux-user.mak | 3 + default-configs/targets/tricore-softmmu.mak | 3 + default-configs/targets/unicore32-softmmu.mak | 3 + default-configs/targets/x86_64-bsd-user.mak | 6 + default-configs/targets/x86_64-linux-user.mak | 6 + default-configs/targets/x86_64-softmmu.mak | 7 + default-configs/targets/xtensa-linux-user.mak | 7 + default-configs/targets/xtensa-softmmu.mak | 7 + .../targets/xtensaeb-linux-user.mak | 8 + default-configs/targets/xtensaeb-softmmu.mak | 8 + meson.build | 27 +- 74 files changed, 482 insertions(+), 405 deletions(-) create mode 100644 default-configs/targets/aarch64-linux-user.mak create mode 100644 default-configs/targets/aarch64-softmmu.mak create mode 100644 default-configs/targets/aarch64_be-linux-user.mak create mode 100644 default-configs/targets/alpha-linux-user.mak create mode 100644 default-configs/targets/alpha-softmmu.mak create mode 100644 default-configs/targets/arm-linux-user.mak create mode 100644 default-configs/targets/arm-softmmu.mak create mode 100644 default-configs/targets/armeb-linux-user.mak create mode 100644 default-configs/targets/avr-softmmu.mak create mode 100644 default-configs/targets/cris-linux-user.mak create mode 100644 default-configs/targets/cris-softmmu.mak create mode 100644 default-configs/targets/hppa-linux-user.mak create mode 100644 default-configs/targets/hppa-softmmu.mak create mode 100644 default-configs/targets/i386-bsd-user.mak create mode 100644 default-configs/targets/i386-linux-user.mak create mode 100644 default-configs/targets/i386-softmmu.mak create mode 100644 default-configs/targets/lm32-softmmu.mak create mode 100644 default-configs/targets/m68k-linux-user.mak create mode 100644 default-configs/targets/m68k-softmmu.mak create mode 100644 default-configs/targets/microblaze-linux-user.mak create mode 100644 default-configs/targets/microblaze-softmmu.mak create mode 100644 default-configs/targets/microblazeel-linux-user.mak create mode 100644 default-configs/targets/microblazeel-softmmu.mak create mode 100644 default-configs/targets/mips-linux-user.mak create mode 100644 default-configs/targets/mips-softmmu.mak create mode 100644 default-configs/targets/mips64-linux-user.mak create mode 100644 default-configs/targets/mips64-softmmu.mak create mode 100644 default-configs/targets/mips64el-linux-user.mak create mode 100644 default-configs/targets/mips64el-softmmu.mak create mode 100644 default-configs/targets/mipsel-linux-user.mak create mode 100644 default-configs/targets/mipsel-softmmu.mak create mode 100644 default-configs/targets/mipsn32-linux-user.mak create mode 100644 default-configs/targets/mipsn32el-linux-user.mak create mode 100644 default-configs/targets/moxie-softmmu.mak create mode 100644 default-configs/targets/nios2-linux-user.mak create mode 100644 default-configs/targets/nios2-softmmu.mak create mode 100644 default-configs/targets/or1k-linux-user.mak create mode 100644 default-configs/targets/or1k-softmmu.mak create mode 100644 default-configs/targets/ppc-linux-user.mak create mode 100644 default-configs/targets/ppc-softmmu.mak create mode 100644 default-configs/targets/ppc64-linux-user.mak create mode 100644 default-configs/targets/ppc64-softmmu.mak create mode 100644 default-configs/targets/ppc64abi32-linux-user.mak create mode 100644 default-configs/targets/ppc64le-linux-user.mak create mode 100644 default-configs/targets/riscv32-linux-user.mak create mode 100644 default-configs/targets/riscv32-softmmu.mak create mode 100644 default-configs/targets/riscv64-linux-user.mak create mode 100644 default-configs/targets/riscv64-softmmu.mak create mode 100644 default-configs/targets/rx-softmmu.mak create mode 100644 default-configs/targets/s390x-linux-user.mak create mode 100644 default-configs/targets/s390x-softmmu.mak create mode 100644 default-configs/targets/sh4-linux-user.mak create mode 100644 default-configs/targets/sh4-softmmu.mak create mode 100644 default-configs/targets/sh4eb-linux-user.mak create mode 100644 default-configs/targets/sh4eb-softmmu.mak create mode 100644 default-configs/targets/sparc-bsd-user.mak create mode 100644 default-configs/targets/sparc-linux-user.mak create mode 100644 default-configs/targets/sparc-softmmu.mak create mode 100644 default-configs/targets/sparc32plus-linux-user.mak create mode 100644 default-configs/targets/sparc64-bsd-user.mak create mode 100644 default-configs/targets/sparc64-linux-user.mak create mode 100644 default-configs/targets/sparc64-softmmu.mak create mode 100644 default-configs/targets/tilegx-linux-user.mak create mode 100644 default-configs/targets/tricore-softmmu.mak create mode 100644 default-configs/targets/unicore32-softmmu.mak create mode 100644 default-configs/targets/x86_64-bsd-user.mak create mode 100644 default-configs/targets/x86_64-linux-user.mak create mode 100644 default-configs/targets/x86_64-softmmu.mak create mode 100644 default-configs/targets/xtensa-linux-user.mak create mode 100644 default-configs/targets/xtensa-softmmu.mak create mode 100644 default-configs/targets/xtensaeb-linux-user.mak create mode 100644 default-configs/targets/xtensaeb-softmmu.mak diff --git a/configure b/configure index e64327e0f8..f6275d95fc 100755 --- a/configure +++ b/configure @@ -220,99 +220,6 @@ glob() { eval test -z '"${1#'"$2"'}"' } =20 -supported_hax_target() { - test "$hax" =3D "enabled" || return 1 - glob "$1" "*-softmmu" || return 1 - case "${1%-softmmu}" in - i386|x86_64) - return 0 - ;; - esac - return 1 -} - -supported_kvm_target() { - test "$kvm" =3D "enabled" || return 1 - glob "$1" "*-softmmu" || return 1 - case "${1%-softmmu}:$cpu" in - aarch64:aarch64 | \ - i386:i386 | i386:x86_64 | i386:x32 | \ - x86_64:i386 | x86_64:x86_64 | x86_64:x32 | \ - mips:mips | mipsel:mips | mips64:mips | mips64el:mips | \ - ppc:ppc | ppc64:ppc | ppc:ppc64 | ppc64:ppc64 | ppc64:ppc64le | \ - s390x:s390x) - return 0 - ;; - esac - return 1 -} - -supported_xen_target() { - test "$xen" =3D "enabled" || return 1 - glob "$1" "*-softmmu" || return 1 - # Only i386 and x86_64 provide the xenpv machine. - case "${1%-softmmu}" in - i386|x86_64) - return 0 - ;; - esac - return 1 -} - -supported_hvf_target() { - test "$hvf" =3D "enabled" || return 1 - glob "$1" "*-softmmu" || return 1 - case "${1%-softmmu}" in - x86_64) - return 0 - ;; - esac - return 1 -} - -supported_whpx_target() { - test "$whpx" =3D "enabled" || return 1 - glob "$1" "*-softmmu" || return 1 - case "${1%-softmmu}" in - i386|x86_64) - return 0 - ;; - esac - return 1 -} - -supported_target() { - case "$1" in - *-softmmu) - ;; - *-linux-user) - if test "$linux" !=3D "yes"; then - print_error "Target '$target' is only available on a Linux= host" - return 1 - fi - ;; - *-bsd-user) - if test "$bsd" !=3D "yes"; then - print_error "Target '$target' is only available on a BSD h= ost" - return 1 - fi - ;; - *) - print_error "Invalid target name '$target'" - return 1 - ;; - esac - test "$tcg" =3D "enabled" && return 0 - supported_kvm_target "$1" && return 0 - supported_xen_target "$1" && return 0 - supported_hax_target "$1" && return 0 - supported_hvf_target "$1" && return 0 - supported_whpx_target "$1" && return 0 - print_error "TCG disabled, but hardware accelerator not available for = '$target'" - return 1 -} - - ld_has() { $ld --help 2>/dev/null | grep ".$1" >/dev/null 2>&1 } @@ -2292,12 +2199,13 @@ if test "$solaris" =3D "yes" ; then fi =20 if test -z "${target_list+xxx}" ; then + default_targets=3Dyes for target in $default_target_list; do - supported_target $target 2>/dev/null && \ - target_list=3D"$target_list $target" + target_list=3D"$target_list $target" done target_list=3D"${target_list# }" else + default_targets=3Dno target_list=3D$(echo "$target_list" | sed -e 's/,/ /g') for target in $target_list; do # Check that we recognised the target name; this allows a more @@ -2309,7 +2217,6 @@ else error_exit "Unknown target name '$target'" ;; esac - supported_target $target || exit 1 done fi =20 @@ -2653,27 +2560,6 @@ if test "$seccomp" !=3D "no" ; then fi fi =20 -########################################## -# simple accelerator probes - -if test "$kvm" =3D "auto" ; then - if test "$linux" =3D yes ; then - kvm=3Denabled - else - if test "$kvm" =3D "enabled" ; then - feature_not_found "kvm" "KVM is only available on Linux" - fi - fi -fi - -if test "$hax" =3D "auto" ; then - if test "$mingw" =3D yes || test "$darwin" =3D yes || test "$targetos" = =3D NetBSD; then - hax=3Denabled - else - hax=3Ddisabled - fi -fi - ########################################## # xen probe =20 @@ -2992,22 +2878,6 @@ if test "$xen_pci_passthrough" !=3D "disabled"; then fi fi =20 -########################################## -# Windows Hypervisor Platform accelerator (WHPX) check -if test "$whpx" =3D "enabled" && test "$ARCH" !=3D "x86_64"; then - error_exit "WHPX requires 64-bit host" -fi -if test "$whpx" !=3D "disabled" && test "$ARCH" =3D "x86_64"; then - if check_include "WinHvPlatform.h" && check_include "WinHvEmulation.h"= ; then - whpx=3D"yes" - else - if test "$whpx" =3D "auto"; then - feature_not_found "WinHvPlatform" "WinHvEmulation is not insta= lled" - fi - whpx=3D"disabled" - fi -fi - ########################################## # gettext probe if test "$gettext" !=3D "false" ; then @@ -7375,281 +7245,13 @@ fi =20 for target in $target_list; do target_dir=3D"$target" -config_target_mak=3D$target_dir/config-target.mak target_name=3D$(echo $target | cut -d '-' -f 1) -target_aligned_only=3D"no" -case "$target_name" in - alpha|hppa|mips64el|mips64|mipsel|mips|mipsn32|mipsn32el|sh4|sh4eb|sparc= |sparc64|sparc32plus|xtensa|xtensaeb) - target_aligned_only=3D"yes" - ;; -esac -target_bigendian=3D"no" -case "$target_name" in - armeb|aarch64_be|hppa|lm32|m68k|microblaze|mips|mipsn32|mips64|moxie|or1= k|ppc|ppc64|ppc64abi32|s390x|sh4eb|sparc|sparc64|sparc32plus|xtensaeb) - target_bigendian=3D"yes" - ;; -esac -target_softmmu=3D"no" -target_user_only=3D"no" -target_linux_user=3D"no" -target_bsd_user=3D"no" -case "$target" in - ${target_name}-softmmu) - target_softmmu=3D"yes" - ;; - ${target_name}-linux-user) - target_user_only=3D"yes" - target_linux_user=3D"yes" - ;; - ${target_name}-bsd-user) - target_user_only=3D"yes" - target_bsd_user=3D"yes" - ;; - *) - error_exit "Target '$target' not recognised" - exit 1 - ;; -esac - mkdir -p $target_dir -echo "# Automatically generated by configure - do not modify" > $config_ta= rget_mak - -bflt=3D"no" -mttcg=3D"no" -interp_prefix1=3D$(echo "$interp_prefix" | sed "s/%M/$target_name/g") -gdb_xml_files=3D"" - -TARGET_ARCH=3D"$target_name" -TARGET_BASE_ARCH=3D"" -TARGET_ABI_DIR=3D"" -TARGET_SYSTBL_ABI=3D"" -TARGET_SYSTBL=3D"" - -case "$target_name" in - i386) - mttcg=3D"yes" - gdb_xml_files=3D"i386-32bit.xml" - TARGET_SYSTBL_ABI=3Di386 - TARGET_SYSTBL=3Dsyscall_32.tbl - ;; - x86_64) - TARGET_BASE_ARCH=3Di386 - TARGET_SYSTBL_ABI=3Dcommon,64 - TARGET_SYSTBL=3Dsyscall_64.tbl - mttcg=3D"yes" - gdb_xml_files=3D"i386-64bit.xml" - ;; - alpha) - mttcg=3D"yes" - TARGET_SYSTBL_ABI=3Dcommon - ;; - arm|armeb) - TARGET_ARCH=3Darm - TARGET_SYSTBL_ABI=3Dcommon,oabi - bflt=3D"yes" - mttcg=3D"yes" - gdb_xml_files=3D"arm-core.xml arm-vfp.xml arm-vfp3.xml arm-neon.xml ar= m-m-profile.xml" - ;; - aarch64|aarch64_be) - TARGET_ARCH=3Daarch64 - TARGET_BASE_ARCH=3Darm - bflt=3D"yes" - mttcg=3D"yes" - gdb_xml_files=3D"aarch64-core.xml aarch64-fpu.xml arm-core.xml arm-vfp= .xml arm-vfp3.xml arm-neon.xml arm-m-profile.xml" - ;; - avr) - gdb_xml_files=3D"avr-cpu.xml" - target_compiler=3D$cross_cc_avr - ;; - cris) - ;; - hppa) - mttcg=3D"yes" - TARGET_SYSTBL_ABI=3Dcommon,32 - ;; - lm32) - ;; - m68k) - bflt=3D"yes" - gdb_xml_files=3D"cf-core.xml cf-fp.xml m68k-core.xml m68k-fp.xml" - TARGET_SYSTBL_ABI=3Dcommon - ;; - microblaze|microblazeel) - TARGET_ARCH=3Dmicroblaze - TARGET_SYSTBL_ABI=3Dcommon - mttcg=3D"yes" - bflt=3D"yes" - ;; - mips|mipsel) - mttcg=3D"yes" - TARGET_ARCH=3Dmips - echo "TARGET_ABI_MIPSO32=3Dy" >> $config_target_mak - TARGET_SYSTBL_ABI=3Do32 - TARGET_SYSTBL=3Dsyscall_o32.tbl - ;; - mipsn32|mipsn32el) - mttcg=3D"yes" - TARGET_ARCH=3Dmips64 - TARGET_BASE_ARCH=3Dmips - echo "TARGET_ABI_MIPSN32=3Dy" >> $config_target_mak - echo "TARGET_ABI32=3Dy" >> $config_target_mak - TARGET_SYSTBL_ABI=3Dn32 - TARGET_SYSTBL=3Dsyscall_n32.tbl - ;; - mips64|mips64el) - mttcg=3D"no" - TARGET_ARCH=3Dmips64 - TARGET_BASE_ARCH=3Dmips - echo "TARGET_ABI_MIPSN64=3Dy" >> $config_target_mak - TARGET_SYSTBL_ABI=3Dn64 - TARGET_SYSTBL=3Dsyscall_n64.tbl - ;; - moxie) - ;; - nios2) - ;; - or1k) - TARGET_ARCH=3Dopenrisc - TARGET_BASE_ARCH=3Dopenrisc - ;; - ppc) - gdb_xml_files=3D"power-core.xml power-fpu.xml power-altivec.xml power-= spe.xml" - TARGET_SYSTBL_ABI=3Dcommon,nospu,32 - ;; - ppc64) - TARGET_BASE_ARCH=3Dppc - TARGET_ABI_DIR=3Dppc - TARGET_SYSTBL_ABI=3Dcommon,nospu,64 - mttcg=3Dyes - gdb_xml_files=3D"power64-core.xml power-fpu.xml power-altivec.xml powe= r-spe.xml power-vsx.xml" - ;; - ppc64le) - TARGET_ARCH=3Dppc64 - TARGET_BASE_ARCH=3Dppc - TARGET_ABI_DIR=3Dppc - TARGET_SYSTBL_ABI=3Dcommon,nospu,64 - mttcg=3Dyes - gdb_xml_files=3D"power64-core.xml power-fpu.xml power-altivec.xml powe= r-spe.xml power-vsx.xml" - ;; - ppc64abi32) - TARGET_ARCH=3Dppc64 - TARGET_BASE_ARCH=3Dppc - TARGET_ABI_DIR=3Dppc - TARGET_SYSTBL_ABI=3Dcommon,nospu,32 - echo "TARGET_ABI32=3Dy" >> $config_target_mak - gdb_xml_files=3D"power64-core.xml power-fpu.xml power-altivec.xml powe= r-spe.xml power-vsx.xml" - deprecated_features=3D"ppc64abi32 ${deprecated_features}" - ;; - riscv32) - TARGET_BASE_ARCH=3Driscv - TARGET_ABI_DIR=3Driscv - mttcg=3Dyes - gdb_xml_files=3D"riscv-32bit-cpu.xml riscv-32bit-fpu.xml riscv-64bit-f= pu.xml riscv-32bit-csr.xml riscv-32bit-virtual.xml" - ;; - riscv64) - TARGET_BASE_ARCH=3Driscv - TARGET_ABI_DIR=3Driscv - mttcg=3Dyes - gdb_xml_files=3D"riscv-64bit-cpu.xml riscv-32bit-fpu.xml riscv-64bit-f= pu.xml riscv-64bit-csr.xml riscv-64bit-virtual.xml" - ;; - rx) - TARGET_ARCH=3Drx - bflt=3D"yes" - target_compiler=3D$cross_cc_rx - gdb_xml_files=3D"rx-core.xml" - ;; - sh4|sh4eb) - TARGET_ARCH=3Dsh4 - TARGET_SYSTBL_ABI=3Dcommon - bflt=3D"yes" - ;; - sparc) - TARGET_SYSTBL_ABI=3Dcommon,32 - ;; - sparc64) - TARGET_BASE_ARCH=3Dsparc - TARGET_SYSTBL_ABI=3Dcommon,64 - ;; - sparc32plus) - TARGET_ARCH=3Dsparc64 - TARGET_BASE_ARCH=3Dsparc - TARGET_ABI_DIR=3Dsparc - TARGET_SYSTBL_ABI=3Dcommon,32 - echo "TARGET_ABI32=3Dy" >> $config_target_mak - ;; - s390x) - TARGET_SYSTBL_ABI=3Dcommon,64 - mttcg=3Dyes - gdb_xml_files=3D"s390x-core64.xml s390-acr.xml s390-fpr.xml s390-vx.xm= l s390-cr.xml s390-virt.xml s390-gs.xml" - ;; - tilegx) - ;; - tricore) - ;; - unicore32) - ;; - xtensa|xtensaeb) - TARGET_ARCH=3Dxtensa - TARGET_SYSTBL_ABI=3Dcommon - bflt=3D"yes" - mttcg=3D"yes" - ;; - *) - error_exit "Unsupported target CPU" - ;; -esac -# TARGET_BASE_ARCH needs to be defined after TARGET_ARCH -if [ "$TARGET_BASE_ARCH" =3D "" ]; then - TARGET_BASE_ARCH=3D$TARGET_ARCH -fi -if [ "$TARGET_SYSTBL_ABI" !=3D "" ] && [ "$TARGET_SYSTBL" =3D "" ]; then - TARGET_SYSTBL=3Dsyscall.tbl -fi - -upper() { - echo "$@"| LC_ALL=3DC tr '[a-z]' '[A-Z]' -} - -target_arch_name=3D"$(upper $TARGET_ARCH)" -echo "TARGET_$target_arch_name=3Dy" >> $config_target_mak -echo "TARGET_BASE_ARCH=3D$TARGET_BASE_ARCH" >> $config_target_mak -if [ "$TARGET_ABI_DIR" =3D "" ]; then - TARGET_ABI_DIR=3D$TARGET_ARCH -fi -echo "TARGET_ABI_DIR=3D$TARGET_ABI_DIR" >> $config_target_mak -if [ "$TARGET_SYSTBL_ABI" !=3D "" ]; then - echo "TARGET_SYSTBL_ABI=3D$TARGET_SYSTBL_ABI" >> $config_target_mak - echo "TARGET_SYSTBL=3D$TARGET_SYSTBL" >> $config_target_mak -fi - -if test "$target_aligned_only" =3D "yes" ; then - echo "TARGET_ALIGNED_ONLY=3Dy" >> $config_target_mak -fi -if test "$target_bigendian" =3D "yes" ; then - echo "TARGET_WORDS_BIGENDIAN=3Dy" >> $config_target_mak -fi -if test "$target_softmmu" =3D "yes" ; then - if test "$mttcg" =3D "yes" ; then - echo "TARGET_SUPPORTS_MTTCG=3Dy" >> $config_target_mak - fi -fi if test "$target_user_only" =3D "yes" ; then symlink "../qemu-$target_name" "$target_dir/qemu-$target_name" else symlink "../qemu-system-$target_name" "$target_dir/qemu-system-$target_n= ame" fi -list=3D"" -if test ! -z "$gdb_xml_files" ; then - for x in $gdb_xml_files; do - list=3D"$list gdb-xml/$x" - done - echo "TARGET_XML_FILES=3D$list" >> $config_target_mak -fi - -if test "$target_user_only" =3D "yes" && test "$bflt" =3D "yes"; then - echo "TARGET_HAS_BFLT=3Dy" >> $config_target_mak -fi - done # for target in $targets =20 if [ "$fdt" =3D "git" ]; then @@ -7659,6 +7261,9 @@ if [ "$capstone" =3D "git" -o "$capstone" =3D "intern= al" ]; then subdirs=3D"$subdirs capstone" fi echo "CONFIG_QEMU_INTERP_PREFIX=3D$interp_prefix" | sed 's/%M/@0@/' >> $co= nfig_host_mak +if test "$default_targets" =3D "yes"; then + echo "CONFIG_DEFAULT_TARGETS=3Dy" >> $config_host_mak +fi echo "SUBDIRS=3D$subdirs" >> $config_host_mak if test -n "$LIBCAPSTONE"; then echo "LIBCAPSTONE=3D$LIBCAPSTONE" >> $config_host_mak diff --git a/default-configs/targets/aarch64-linux-user.mak b/default-confi= gs/targets/aarch64-linux-user.mak new file mode 100644 index 0000000000..4495e86509 --- /dev/null +++ b/default-configs/targets/aarch64-linux-user.mak @@ -0,0 +1,5 @@ +TARGET_AARCH64=3Dy +TARGET_BASE_ARCH=3Darm +TARGET_ABI_DIR=3Daarch64 +TARGET_XML_FILES=3D gdb-xml/aarch64-core.xml gdb-xml/aarch64-fpu.xml gdb-x= ml/arm-core.xml gdb-xml/arm-vfp.xml gdb-xml/arm-vfp3.xml gdb-xml/arm-neon.x= ml gdb-xml/arm-m-profile.xml +TARGET_HAS_BFLT=3Dy diff --git a/default-configs/targets/aarch64-softmmu.mak b/default-configs/= targets/aarch64-softmmu.mak new file mode 100644 index 0000000000..53f83ea81f --- /dev/null +++ b/default-configs/targets/aarch64-softmmu.mak @@ -0,0 +1,5 @@ +TARGET_AARCH64=3Dy +TARGET_BASE_ARCH=3Darm +TARGET_ABI_DIR=3Daarch64 +TARGET_SUPPORTS_MTTCG=3Dy +TARGET_XML_FILES=3D gdb-xml/aarch64-core.xml gdb-xml/aarch64-fpu.xml gdb-x= ml/arm-core.xml gdb-xml/arm-vfp.xml gdb-xml/arm-vfp3.xml gdb-xml/arm-neon.x= ml gdb-xml/arm-m-profile.xml diff --git a/default-configs/targets/aarch64_be-linux-user.mak b/default-co= nfigs/targets/aarch64_be-linux-user.mak new file mode 100644 index 0000000000..da13693d3d --- /dev/null +++ b/default-configs/targets/aarch64_be-linux-user.mak @@ -0,0 +1,6 @@ +TARGET_AARCH64=3Dy +TARGET_BASE_ARCH=3Darm +TARGET_ABI_DIR=3Daarch64 +TARGET_WORDS_BIGENDIAN=3Dy +TARGET_XML_FILES=3D gdb-xml/aarch64-core.xml gdb-xml/aarch64-fpu.xml gdb-x= ml/arm-core.xml gdb-xml/arm-vfp.xml gdb-xml/arm-vfp3.xml gdb-xml/arm-neon.x= ml gdb-xml/arm-m-profile.xml +TARGET_HAS_BFLT=3Dy diff --git a/default-configs/targets/alpha-linux-user.mak b/default-configs= /targets/alpha-linux-user.mak new file mode 100644 index 0000000000..5ff89f5d48 --- /dev/null +++ b/default-configs/targets/alpha-linux-user.mak @@ -0,0 +1,6 @@ +TARGET_ALPHA=3Dy +TARGET_BASE_ARCH=3Dalpha +TARGET_ABI_DIR=3Dalpha +TARGET_SYSTBL_ABI=3Dcommon +TARGET_SYSTBL=3Dsyscall.tbl +TARGET_ALIGNED_ONLY=3Dy diff --git a/default-configs/targets/alpha-softmmu.mak b/default-configs/ta= rgets/alpha-softmmu.mak new file mode 100644 index 0000000000..b78114b028 --- /dev/null +++ b/default-configs/targets/alpha-softmmu.mak @@ -0,0 +1,7 @@ +TARGET_ALPHA=3Dy +TARGET_BASE_ARCH=3Dalpha +TARGET_ABI_DIR=3Dalpha +TARGET_SYSTBL_ABI=3Dcommon +TARGET_SYSTBL=3Dsyscall.tbl +TARGET_ALIGNED_ONLY=3Dy +TARGET_SUPPORTS_MTTCG=3Dy diff --git a/default-configs/targets/arm-linux-user.mak b/default-configs/t= argets/arm-linux-user.mak new file mode 100644 index 0000000000..7c54c3c2a2 --- /dev/null +++ b/default-configs/targets/arm-linux-user.mak @@ -0,0 +1,7 @@ +TARGET_ARM=3Dy +TARGET_BASE_ARCH=3Darm +TARGET_ABI_DIR=3Darm +TARGET_SYSTBL_ABI=3Dcommon,oabi +TARGET_SYSTBL=3Dsyscall.tbl +TARGET_XML_FILES=3D gdb-xml/arm-core.xml gdb-xml/arm-vfp.xml gdb-xml/arm-v= fp3.xml gdb-xml/arm-neon.xml gdb-xml/arm-m-profile.xml +TARGET_HAS_BFLT=3Dy diff --git a/default-configs/targets/arm-softmmu.mak b/default-configs/targ= ets/arm-softmmu.mak new file mode 100644 index 0000000000..d40b995f25 --- /dev/null +++ b/default-configs/targets/arm-softmmu.mak @@ -0,0 +1,7 @@ +TARGET_ARM=3Dy +TARGET_BASE_ARCH=3Darm +TARGET_ABI_DIR=3Darm +TARGET_SYSTBL_ABI=3Dcommon,oabi +TARGET_SYSTBL=3Dsyscall.tbl +TARGET_SUPPORTS_MTTCG=3Dy +TARGET_XML_FILES=3D gdb-xml/arm-core.xml gdb-xml/arm-vfp.xml gdb-xml/arm-v= fp3.xml gdb-xml/arm-neon.xml gdb-xml/arm-m-profile.xml diff --git a/default-configs/targets/armeb-linux-user.mak b/default-configs= /targets/armeb-linux-user.mak new file mode 100644 index 0000000000..1882aa472d --- /dev/null +++ b/default-configs/targets/armeb-linux-user.mak @@ -0,0 +1,8 @@ +TARGET_ARM=3Dy +TARGET_BASE_ARCH=3Darm +TARGET_ABI_DIR=3Darm +TARGET_SYSTBL_ABI=3Dcommon,oabi +TARGET_SYSTBL=3Dsyscall.tbl +TARGET_WORDS_BIGENDIAN=3Dy +TARGET_XML_FILES=3D gdb-xml/arm-core.xml gdb-xml/arm-vfp.xml gdb-xml/arm-v= fp3.xml gdb-xml/arm-neon.xml gdb-xml/arm-m-profile.xml +TARGET_HAS_BFLT=3Dy diff --git a/default-configs/targets/avr-softmmu.mak b/default-configs/targ= ets/avr-softmmu.mak new file mode 100644 index 0000000000..ecd292b2f7 --- /dev/null +++ b/default-configs/targets/avr-softmmu.mak @@ -0,0 +1,4 @@ +TARGET_AVR=3Dy +TARGET_BASE_ARCH=3Davr +TARGET_ABI_DIR=3Davr +TARGET_XML_FILES=3D gdb-xml/avr-cpu.xml diff --git a/default-configs/targets/cris-linux-user.mak b/default-configs/= targets/cris-linux-user.mak new file mode 100644 index 0000000000..ba61135172 --- /dev/null +++ b/default-configs/targets/cris-linux-user.mak @@ -0,0 +1,3 @@ +TARGET_CRIS=3Dy +TARGET_BASE_ARCH=3Dcris +TARGET_ABI_DIR=3Dcris diff --git a/default-configs/targets/cris-softmmu.mak b/default-configs/tar= gets/cris-softmmu.mak new file mode 100644 index 0000000000..ba61135172 --- /dev/null +++ b/default-configs/targets/cris-softmmu.mak @@ -0,0 +1,3 @@ +TARGET_CRIS=3Dy +TARGET_BASE_ARCH=3Dcris +TARGET_ABI_DIR=3Dcris diff --git a/default-configs/targets/hppa-linux-user.mak b/default-configs/= targets/hppa-linux-user.mak new file mode 100644 index 0000000000..94222e8fc6 --- /dev/null +++ b/default-configs/targets/hppa-linux-user.mak @@ -0,0 +1,7 @@ +TARGET_HPPA=3Dy +TARGET_BASE_ARCH=3Dhppa +TARGET_ABI_DIR=3Dhppa +TARGET_SYSTBL_ABI=3Dcommon,32 +TARGET_SYSTBL=3Dsyscall.tbl +TARGET_ALIGNED_ONLY=3Dy +TARGET_WORDS_BIGENDIAN=3Dy diff --git a/default-configs/targets/hppa-softmmu.mak b/default-configs/tar= gets/hppa-softmmu.mak new file mode 100644 index 0000000000..617c6483c0 --- /dev/null +++ b/default-configs/targets/hppa-softmmu.mak @@ -0,0 +1,8 @@ +TARGET_HPPA=3Dy +TARGET_BASE_ARCH=3Dhppa +TARGET_ABI_DIR=3Dhppa +TARGET_SYSTBL_ABI=3Dcommon,32 +TARGET_SYSTBL=3Dsyscall.tbl +TARGET_ALIGNED_ONLY=3Dy +TARGET_WORDS_BIGENDIAN=3Dy +TARGET_SUPPORTS_MTTCG=3Dy diff --git a/default-configs/targets/i386-bsd-user.mak b/default-configs/ta= rgets/i386-bsd-user.mak new file mode 100644 index 0000000000..34b52e9ee2 --- /dev/null +++ b/default-configs/targets/i386-bsd-user.mak @@ -0,0 +1,6 @@ +TARGET_I386=3Dy +TARGET_BASE_ARCH=3Di386 +TARGET_ABI_DIR=3Di386 +TARGET_SYSTBL_ABI=3Di386 +TARGET_SYSTBL=3Dsyscall_32.tbl +TARGET_XML_FILES=3D gdb-xml/i386-32bit.xml diff --git a/default-configs/targets/i386-linux-user.mak b/default-configs/= targets/i386-linux-user.mak new file mode 100644 index 0000000000..34b52e9ee2 --- /dev/null +++ b/default-configs/targets/i386-linux-user.mak @@ -0,0 +1,6 @@ +TARGET_I386=3Dy +TARGET_BASE_ARCH=3Di386 +TARGET_ABI_DIR=3Di386 +TARGET_SYSTBL_ABI=3Di386 +TARGET_SYSTBL=3Dsyscall_32.tbl +TARGET_XML_FILES=3D gdb-xml/i386-32bit.xml diff --git a/default-configs/targets/i386-softmmu.mak b/default-configs/tar= gets/i386-softmmu.mak new file mode 100644 index 0000000000..be9198bb84 --- /dev/null +++ b/default-configs/targets/i386-softmmu.mak @@ -0,0 +1,7 @@ +TARGET_I386=3Dy +TARGET_BASE_ARCH=3Di386 +TARGET_ABI_DIR=3Di386 +TARGET_SYSTBL_ABI=3Di386 +TARGET_SYSTBL=3Dsyscall_32.tbl +TARGET_SUPPORTS_MTTCG=3Dy +TARGET_XML_FILES=3D gdb-xml/i386-32bit.xml diff --git a/default-configs/targets/lm32-softmmu.mak b/default-configs/tar= gets/lm32-softmmu.mak new file mode 100644 index 0000000000..c327d27d5f --- /dev/null +++ b/default-configs/targets/lm32-softmmu.mak @@ -0,0 +1,4 @@ +TARGET_LM32=3Dy +TARGET_BASE_ARCH=3Dlm32 +TARGET_ABI_DIR=3Dlm32 +TARGET_WORDS_BIGENDIAN=3Dy diff --git a/default-configs/targets/m68k-linux-user.mak b/default-configs/= targets/m68k-linux-user.mak new file mode 100644 index 0000000000..e7c0af5881 --- /dev/null +++ b/default-configs/targets/m68k-linux-user.mak @@ -0,0 +1,8 @@ +TARGET_M68K=3Dy +TARGET_BASE_ARCH=3Dm68k +TARGET_ABI_DIR=3Dm68k +TARGET_SYSTBL_ABI=3Dcommon +TARGET_SYSTBL=3Dsyscall.tbl +TARGET_WORDS_BIGENDIAN=3Dy +TARGET_XML_FILES=3D gdb-xml/cf-core.xml gdb-xml/cf-fp.xml gdb-xml/m68k-cor= e.xml gdb-xml/m68k-fp.xml +TARGET_HAS_BFLT=3Dy diff --git a/default-configs/targets/m68k-softmmu.mak b/default-configs/tar= gets/m68k-softmmu.mak new file mode 100644 index 0000000000..f8bf4fc5ac --- /dev/null +++ b/default-configs/targets/m68k-softmmu.mak @@ -0,0 +1,7 @@ +TARGET_M68K=3Dy +TARGET_BASE_ARCH=3Dm68k +TARGET_ABI_DIR=3Dm68k +TARGET_SYSTBL_ABI=3Dcommon +TARGET_SYSTBL=3Dsyscall.tbl +TARGET_WORDS_BIGENDIAN=3Dy +TARGET_XML_FILES=3D gdb-xml/cf-core.xml gdb-xml/cf-fp.xml gdb-xml/m68k-cor= e.xml gdb-xml/m68k-fp.xml diff --git a/default-configs/targets/microblaze-linux-user.mak b/default-co= nfigs/targets/microblaze-linux-user.mak new file mode 100644 index 0000000000..809819424d --- /dev/null +++ b/default-configs/targets/microblaze-linux-user.mak @@ -0,0 +1,7 @@ +TARGET_MICROBLAZE=3Dy +TARGET_BASE_ARCH=3Dmicroblaze +TARGET_ABI_DIR=3Dmicroblaze +TARGET_SYSTBL_ABI=3Dcommon +TARGET_SYSTBL=3Dsyscall.tbl +TARGET_WORDS_BIGENDIAN=3Dy +TARGET_HAS_BFLT=3Dy diff --git a/default-configs/targets/microblaze-softmmu.mak b/default-confi= gs/targets/microblaze-softmmu.mak new file mode 100644 index 0000000000..1b0a76a61f --- /dev/null +++ b/default-configs/targets/microblaze-softmmu.mak @@ -0,0 +1,7 @@ +TARGET_MICROBLAZE=3Dy +TARGET_BASE_ARCH=3Dmicroblaze +TARGET_ABI_DIR=3Dmicroblaze +TARGET_SYSTBL_ABI=3Dcommon +TARGET_SYSTBL=3Dsyscall.tbl +TARGET_WORDS_BIGENDIAN=3Dy +TARGET_SUPPORTS_MTTCG=3Dy diff --git a/default-configs/targets/microblazeel-linux-user.mak b/default-= configs/targets/microblazeel-linux-user.mak new file mode 100644 index 0000000000..416b42eeb6 --- /dev/null +++ b/default-configs/targets/microblazeel-linux-user.mak @@ -0,0 +1,6 @@ +TARGET_MICROBLAZE=3Dy +TARGET_BASE_ARCH=3Dmicroblaze +TARGET_ABI_DIR=3Dmicroblaze +TARGET_SYSTBL_ABI=3Dcommon +TARGET_SYSTBL=3Dsyscall.tbl +TARGET_HAS_BFLT=3Dy diff --git a/default-configs/targets/microblazeel-softmmu.mak b/default-con= figs/targets/microblazeel-softmmu.mak new file mode 100644 index 0000000000..3a2cf8be0f --- /dev/null +++ b/default-configs/targets/microblazeel-softmmu.mak @@ -0,0 +1,6 @@ +TARGET_MICROBLAZE=3Dy +TARGET_BASE_ARCH=3Dmicroblaze +TARGET_ABI_DIR=3Dmicroblaze +TARGET_SYSTBL_ABI=3Dcommon +TARGET_SYSTBL=3Dsyscall.tbl +TARGET_SUPPORTS_MTTCG=3Dy diff --git a/default-configs/targets/mips-linux-user.mak b/default-configs/= targets/mips-linux-user.mak new file mode 100644 index 0000000000..bcfff16a7b --- /dev/null +++ b/default-configs/targets/mips-linux-user.mak @@ -0,0 +1,8 @@ +TARGET_ABI_MIPSO32=3Dy +TARGET_MIPS=3Dy +TARGET_BASE_ARCH=3Dmips +TARGET_ABI_DIR=3Dmips +TARGET_SYSTBL_ABI=3Do32 +TARGET_SYSTBL=3Dsyscall_o32.tbl +TARGET_ALIGNED_ONLY=3Dy +TARGET_WORDS_BIGENDIAN=3Dy diff --git a/default-configs/targets/mips-softmmu.mak b/default-configs/tar= gets/mips-softmmu.mak new file mode 100644 index 0000000000..8ab9ff2ac9 --- /dev/null +++ b/default-configs/targets/mips-softmmu.mak @@ -0,0 +1,9 @@ +TARGET_ABI_MIPSO32=3Dy +TARGET_MIPS=3Dy +TARGET_BASE_ARCH=3Dmips +TARGET_ABI_DIR=3Dmips +TARGET_SYSTBL_ABI=3Do32 +TARGET_SYSTBL=3Dsyscall_o32.tbl +TARGET_ALIGNED_ONLY=3Dy +TARGET_WORDS_BIGENDIAN=3Dy +TARGET_SUPPORTS_MTTCG=3Dy diff --git a/default-configs/targets/mips64-linux-user.mak b/default-config= s/targets/mips64-linux-user.mak new file mode 100644 index 0000000000..c02c5460a7 --- /dev/null +++ b/default-configs/targets/mips64-linux-user.mak @@ -0,0 +1,8 @@ +TARGET_ABI_MIPSN64=3Dy +TARGET_MIPS64=3Dy +TARGET_BASE_ARCH=3Dmips +TARGET_ABI_DIR=3Dmips64 +TARGET_SYSTBL_ABI=3Dn64 +TARGET_SYSTBL=3Dsyscall_n64.tbl +TARGET_ALIGNED_ONLY=3Dy +TARGET_WORDS_BIGENDIAN=3Dy diff --git a/default-configs/targets/mips64-softmmu.mak b/default-configs/t= argets/mips64-softmmu.mak new file mode 100644 index 0000000000..c02c5460a7 --- /dev/null +++ b/default-configs/targets/mips64-softmmu.mak @@ -0,0 +1,8 @@ +TARGET_ABI_MIPSN64=3Dy +TARGET_MIPS64=3Dy +TARGET_BASE_ARCH=3Dmips +TARGET_ABI_DIR=3Dmips64 +TARGET_SYSTBL_ABI=3Dn64 +TARGET_SYSTBL=3Dsyscall_n64.tbl +TARGET_ALIGNED_ONLY=3Dy +TARGET_WORDS_BIGENDIAN=3Dy diff --git a/default-configs/targets/mips64el-linux-user.mak b/default-conf= igs/targets/mips64el-linux-user.mak new file mode 100644 index 0000000000..8cbbc38e78 --- /dev/null +++ b/default-configs/targets/mips64el-linux-user.mak @@ -0,0 +1,7 @@ +TARGET_ABI_MIPSN64=3Dy +TARGET_MIPS64=3Dy +TARGET_BASE_ARCH=3Dmips +TARGET_ABI_DIR=3Dmips64 +TARGET_SYSTBL_ABI=3Dn64 +TARGET_SYSTBL=3Dsyscall_n64.tbl +TARGET_ALIGNED_ONLY=3Dy diff --git a/default-configs/targets/mips64el-softmmu.mak b/default-configs= /targets/mips64el-softmmu.mak new file mode 100644 index 0000000000..8cbbc38e78 --- /dev/null +++ b/default-configs/targets/mips64el-softmmu.mak @@ -0,0 +1,7 @@ +TARGET_ABI_MIPSN64=3Dy +TARGET_MIPS64=3Dy +TARGET_BASE_ARCH=3Dmips +TARGET_ABI_DIR=3Dmips64 +TARGET_SYSTBL_ABI=3Dn64 +TARGET_SYSTBL=3Dsyscall_n64.tbl +TARGET_ALIGNED_ONLY=3Dy diff --git a/default-configs/targets/mipsel-linux-user.mak b/default-config= s/targets/mipsel-linux-user.mak new file mode 100644 index 0000000000..26aa9c8279 --- /dev/null +++ b/default-configs/targets/mipsel-linux-user.mak @@ -0,0 +1,7 @@ +TARGET_ABI_MIPSO32=3Dy +TARGET_MIPS=3Dy +TARGET_BASE_ARCH=3Dmips +TARGET_ABI_DIR=3Dmips +TARGET_SYSTBL_ABI=3Do32 +TARGET_SYSTBL=3Dsyscall_o32.tbl +TARGET_ALIGNED_ONLY=3Dy diff --git a/default-configs/targets/mipsel-softmmu.mak b/default-configs/t= argets/mipsel-softmmu.mak new file mode 100644 index 0000000000..afa0851887 --- /dev/null +++ b/default-configs/targets/mipsel-softmmu.mak @@ -0,0 +1,8 @@ +TARGET_ABI_MIPSO32=3Dy +TARGET_MIPS=3Dy +TARGET_BASE_ARCH=3Dmips +TARGET_ABI_DIR=3Dmips +TARGET_SYSTBL_ABI=3Do32 +TARGET_SYSTBL=3Dsyscall_o32.tbl +TARGET_ALIGNED_ONLY=3Dy +TARGET_SUPPORTS_MTTCG=3Dy diff --git a/default-configs/targets/mipsn32-linux-user.mak b/default-confi= gs/targets/mipsn32-linux-user.mak new file mode 100644 index 0000000000..81d548e699 --- /dev/null +++ b/default-configs/targets/mipsn32-linux-user.mak @@ -0,0 +1,9 @@ +TARGET_ABI_MIPSN32=3Dy +TARGET_ABI32=3Dy +TARGET_MIPS64=3Dy +TARGET_BASE_ARCH=3Dmips +TARGET_ABI_DIR=3Dmips64 +TARGET_SYSTBL_ABI=3Dn32 +TARGET_SYSTBL=3Dsyscall_n32.tbl +TARGET_ALIGNED_ONLY=3Dy +TARGET_WORDS_BIGENDIAN=3Dy diff --git a/default-configs/targets/mipsn32el-linux-user.mak b/default-con= figs/targets/mipsn32el-linux-user.mak new file mode 100644 index 0000000000..6de47f2a79 --- /dev/null +++ b/default-configs/targets/mipsn32el-linux-user.mak @@ -0,0 +1,8 @@ +TARGET_ABI_MIPSN32=3Dy +TARGET_ABI32=3Dy +TARGET_MIPS64=3Dy +TARGET_BASE_ARCH=3Dmips +TARGET_ABI_DIR=3Dmips64 +TARGET_SYSTBL_ABI=3Dn32 +TARGET_SYSTBL=3Dsyscall_n32.tbl +TARGET_ALIGNED_ONLY=3Dy diff --git a/default-configs/targets/moxie-softmmu.mak b/default-configs/ta= rgets/moxie-softmmu.mak new file mode 100644 index 0000000000..da093f5b36 --- /dev/null +++ b/default-configs/targets/moxie-softmmu.mak @@ -0,0 +1,4 @@ +TARGET_MOXIE=3Dy +TARGET_BASE_ARCH=3Dmoxie +TARGET_ABI_DIR=3Dmoxie +TARGET_WORDS_BIGENDIAN=3Dy diff --git a/default-configs/targets/nios2-linux-user.mak b/default-configs= /targets/nios2-linux-user.mak new file mode 100644 index 0000000000..a2308a16aa --- /dev/null +++ b/default-configs/targets/nios2-linux-user.mak @@ -0,0 +1,3 @@ +TARGET_NIOS2=3Dy +TARGET_BASE_ARCH=3Dnios2 +TARGET_ABI_DIR=3Dnios2 diff --git a/default-configs/targets/nios2-softmmu.mak b/default-configs/ta= rgets/nios2-softmmu.mak new file mode 100644 index 0000000000..a2308a16aa --- /dev/null +++ b/default-configs/targets/nios2-softmmu.mak @@ -0,0 +1,3 @@ +TARGET_NIOS2=3Dy +TARGET_BASE_ARCH=3Dnios2 +TARGET_ABI_DIR=3Dnios2 diff --git a/default-configs/targets/or1k-linux-user.mak b/default-configs/= targets/or1k-linux-user.mak new file mode 100644 index 0000000000..2f5ff844df --- /dev/null +++ b/default-configs/targets/or1k-linux-user.mak @@ -0,0 +1,4 @@ +TARGET_OPENRISC=3Dy +TARGET_BASE_ARCH=3Dopenrisc +TARGET_ABI_DIR=3Dopenrisc +TARGET_WORDS_BIGENDIAN=3Dy diff --git a/default-configs/targets/or1k-softmmu.mak b/default-configs/tar= gets/or1k-softmmu.mak new file mode 100644 index 0000000000..2f5ff844df --- /dev/null +++ b/default-configs/targets/or1k-softmmu.mak @@ -0,0 +1,4 @@ +TARGET_OPENRISC=3Dy +TARGET_BASE_ARCH=3Dopenrisc +TARGET_ABI_DIR=3Dopenrisc +TARGET_WORDS_BIGENDIAN=3Dy diff --git a/default-configs/targets/ppc-linux-user.mak b/default-configs/t= argets/ppc-linux-user.mak new file mode 100644 index 0000000000..c4d912bfb1 --- /dev/null +++ b/default-configs/targets/ppc-linux-user.mak @@ -0,0 +1,7 @@ +TARGET_PPC=3Dy +TARGET_BASE_ARCH=3Dppc +TARGET_ABI_DIR=3Dppc +TARGET_SYSTBL_ABI=3Dcommon,nospu,32 +TARGET_SYSTBL=3Dsyscall.tbl +TARGET_WORDS_BIGENDIAN=3Dy +TARGET_XML_FILES=3D gdb-xml/power-core.xml gdb-xml/power-fpu.xml gdb-xml/p= ower-altivec.xml gdb-xml/power-spe.xml diff --git a/default-configs/targets/ppc-softmmu.mak b/default-configs/targ= ets/ppc-softmmu.mak new file mode 100644 index 0000000000..c4d912bfb1 --- /dev/null +++ b/default-configs/targets/ppc-softmmu.mak @@ -0,0 +1,7 @@ +TARGET_PPC=3Dy +TARGET_BASE_ARCH=3Dppc +TARGET_ABI_DIR=3Dppc +TARGET_SYSTBL_ABI=3Dcommon,nospu,32 +TARGET_SYSTBL=3Dsyscall.tbl +TARGET_WORDS_BIGENDIAN=3Dy +TARGET_XML_FILES=3D gdb-xml/power-core.xml gdb-xml/power-fpu.xml gdb-xml/p= ower-altivec.xml gdb-xml/power-spe.xml diff --git a/default-configs/targets/ppc64-linux-user.mak b/default-configs= /targets/ppc64-linux-user.mak new file mode 100644 index 0000000000..7f96ab7e9d --- /dev/null +++ b/default-configs/targets/ppc64-linux-user.mak @@ -0,0 +1,7 @@ +TARGET_PPC64=3Dy +TARGET_BASE_ARCH=3Dppc +TARGET_ABI_DIR=3Dppc +TARGET_SYSTBL_ABI=3Dcommon,nospu,64 +TARGET_SYSTBL=3Dsyscall.tbl +TARGET_WORDS_BIGENDIAN=3Dy +TARGET_XML_FILES=3D gdb-xml/power64-core.xml gdb-xml/power-fpu.xml gdb-xml= /power-altivec.xml gdb-xml/power-spe.xml gdb-xml/power-vsx.xml diff --git a/default-configs/targets/ppc64-softmmu.mak b/default-configs/ta= rgets/ppc64-softmmu.mak new file mode 100644 index 0000000000..a73211918a --- /dev/null +++ b/default-configs/targets/ppc64-softmmu.mak @@ -0,0 +1,8 @@ +TARGET_PPC64=3Dy +TARGET_BASE_ARCH=3Dppc +TARGET_ABI_DIR=3Dppc +TARGET_SYSTBL_ABI=3Dcommon,nospu,64 +TARGET_SYSTBL=3Dsyscall.tbl +TARGET_WORDS_BIGENDIAN=3Dy +TARGET_SUPPORTS_MTTCG=3Dy +TARGET_XML_FILES=3D gdb-xml/power64-core.xml gdb-xml/power-fpu.xml gdb-xml= /power-altivec.xml gdb-xml/power-spe.xml gdb-xml/power-vsx.xml diff --git a/default-configs/targets/ppc64abi32-linux-user.mak b/default-co= nfigs/targets/ppc64abi32-linux-user.mak new file mode 100644 index 0000000000..13a02700aa --- /dev/null +++ b/default-configs/targets/ppc64abi32-linux-user.mak @@ -0,0 +1,8 @@ +TARGET_ABI32=3Dy +TARGET_PPC64=3Dy +TARGET_BASE_ARCH=3Dppc +TARGET_ABI_DIR=3Dppc +TARGET_SYSTBL_ABI=3Dcommon,nospu,32 +TARGET_SYSTBL=3Dsyscall.tbl +TARGET_WORDS_BIGENDIAN=3Dy +TARGET_XML_FILES=3D gdb-xml/power64-core.xml gdb-xml/power-fpu.xml gdb-xml= /power-altivec.xml gdb-xml/power-spe.xml gdb-xml/power-vsx.xml diff --git a/default-configs/targets/ppc64le-linux-user.mak b/default-confi= gs/targets/ppc64le-linux-user.mak new file mode 100644 index 0000000000..3dd54b894c --- /dev/null +++ b/default-configs/targets/ppc64le-linux-user.mak @@ -0,0 +1,6 @@ +TARGET_PPC64=3Dy +TARGET_BASE_ARCH=3Dppc +TARGET_ABI_DIR=3Dppc +TARGET_SYSTBL_ABI=3Dcommon,nospu,64 +TARGET_SYSTBL=3Dsyscall.tbl +TARGET_XML_FILES=3D gdb-xml/power64-core.xml gdb-xml/power-fpu.xml gdb-xml= /power-altivec.xml gdb-xml/power-spe.xml gdb-xml/power-vsx.xml diff --git a/default-configs/targets/riscv32-linux-user.mak b/default-confi= gs/targets/riscv32-linux-user.mak new file mode 100644 index 0000000000..91d72a46b0 --- /dev/null +++ b/default-configs/targets/riscv32-linux-user.mak @@ -0,0 +1,4 @@ +TARGET_RISCV32=3Dy +TARGET_BASE_ARCH=3Driscv +TARGET_ABI_DIR=3Driscv +TARGET_XML_FILES=3D gdb-xml/riscv-32bit-cpu.xml gdb-xml/riscv-32bit-fpu.xm= l gdb-xml/riscv-64bit-fpu.xml gdb-xml/riscv-32bit-csr.xml gdb-xml/riscv-32b= it-virtual.xml diff --git a/default-configs/targets/riscv32-softmmu.mak b/default-configs/= targets/riscv32-softmmu.mak new file mode 100644 index 0000000000..35e5b2fb85 --- /dev/null +++ b/default-configs/targets/riscv32-softmmu.mak @@ -0,0 +1,5 @@ +TARGET_RISCV32=3Dy +TARGET_BASE_ARCH=3Driscv +TARGET_ABI_DIR=3Driscv +TARGET_SUPPORTS_MTTCG=3Dy +TARGET_XML_FILES=3D gdb-xml/riscv-32bit-cpu.xml gdb-xml/riscv-32bit-fpu.xm= l gdb-xml/riscv-64bit-fpu.xml gdb-xml/riscv-32bit-csr.xml gdb-xml/riscv-32b= it-virtual.xml diff --git a/default-configs/targets/riscv64-linux-user.mak b/default-confi= gs/targets/riscv64-linux-user.mak new file mode 100644 index 0000000000..9e53193cdb --- /dev/null +++ b/default-configs/targets/riscv64-linux-user.mak @@ -0,0 +1,4 @@ +TARGET_RISCV64=3Dy +TARGET_BASE_ARCH=3Driscv +TARGET_ABI_DIR=3Driscv +TARGET_XML_FILES=3D gdb-xml/riscv-64bit-cpu.xml gdb-xml/riscv-32bit-fpu.xm= l gdb-xml/riscv-64bit-fpu.xml gdb-xml/riscv-64bit-csr.xml gdb-xml/riscv-64b= it-virtual.xml diff --git a/default-configs/targets/riscv64-softmmu.mak b/default-configs/= targets/riscv64-softmmu.mak new file mode 100644 index 0000000000..4b9a61cd8f --- /dev/null +++ b/default-configs/targets/riscv64-softmmu.mak @@ -0,0 +1,5 @@ +TARGET_RISCV64=3Dy +TARGET_BASE_ARCH=3Driscv +TARGET_ABI_DIR=3Driscv +TARGET_SUPPORTS_MTTCG=3Dy +TARGET_XML_FILES=3D gdb-xml/riscv-64bit-cpu.xml gdb-xml/riscv-32bit-fpu.xm= l gdb-xml/riscv-64bit-fpu.xml gdb-xml/riscv-64bit-csr.xml gdb-xml/riscv-64b= it-virtual.xml diff --git a/default-configs/targets/rx-softmmu.mak b/default-configs/targe= ts/rx-softmmu.mak new file mode 100644 index 0000000000..52a8c0df10 --- /dev/null +++ b/default-configs/targets/rx-softmmu.mak @@ -0,0 +1,4 @@ +TARGET_RX=3Dy +TARGET_BASE_ARCH=3Drx +TARGET_ABI_DIR=3Drx +TARGET_XML_FILES=3D gdb-xml/rx-core.xml diff --git a/default-configs/targets/s390x-linux-user.mak b/default-configs= /targets/s390x-linux-user.mak new file mode 100644 index 0000000000..77ebec769f --- /dev/null +++ b/default-configs/targets/s390x-linux-user.mak @@ -0,0 +1,7 @@ +TARGET_S390X=3Dy +TARGET_BASE_ARCH=3Ds390x +TARGET_ABI_DIR=3Ds390x +TARGET_SYSTBL_ABI=3Dcommon,64 +TARGET_SYSTBL=3Dsyscall.tbl +TARGET_WORDS_BIGENDIAN=3Dy +TARGET_XML_FILES=3D gdb-xml/s390x-core64.xml gdb-xml/s390-acr.xml gdb-xml/= s390-fpr.xml gdb-xml/s390-vx.xml gdb-xml/s390-cr.xml gdb-xml/s390-virt.xml = gdb-xml/s390-gs.xml diff --git a/default-configs/targets/s390x-softmmu.mak b/default-configs/ta= rgets/s390x-softmmu.mak new file mode 100644 index 0000000000..f2a80d3208 --- /dev/null +++ b/default-configs/targets/s390x-softmmu.mak @@ -0,0 +1,8 @@ +TARGET_S390X=3Dy +TARGET_BASE_ARCH=3Ds390x +TARGET_ABI_DIR=3Ds390x +TARGET_SYSTBL_ABI=3Dcommon,64 +TARGET_SYSTBL=3Dsyscall.tbl +TARGET_WORDS_BIGENDIAN=3Dy +TARGET_SUPPORTS_MTTCG=3Dy +TARGET_XML_FILES=3D gdb-xml/s390x-core64.xml gdb-xml/s390-acr.xml gdb-xml/= s390-fpr.xml gdb-xml/s390-vx.xml gdb-xml/s390-cr.xml gdb-xml/s390-virt.xml = gdb-xml/s390-gs.xml diff --git a/default-configs/targets/sh4-linux-user.mak b/default-configs/t= argets/sh4-linux-user.mak new file mode 100644 index 0000000000..4292dd6128 --- /dev/null +++ b/default-configs/targets/sh4-linux-user.mak @@ -0,0 +1,7 @@ +TARGET_SH4=3Dy +TARGET_BASE_ARCH=3Dsh4 +TARGET_ABI_DIR=3Dsh4 +TARGET_SYSTBL_ABI=3Dcommon +TARGET_SYSTBL=3Dsyscall.tbl +TARGET_ALIGNED_ONLY=3Dy +TARGET_HAS_BFLT=3Dy diff --git a/default-configs/targets/sh4-softmmu.mak b/default-configs/targ= ets/sh4-softmmu.mak new file mode 100644 index 0000000000..e46bf0e278 --- /dev/null +++ b/default-configs/targets/sh4-softmmu.mak @@ -0,0 +1,6 @@ +TARGET_SH4=3Dy +TARGET_BASE_ARCH=3Dsh4 +TARGET_ABI_DIR=3Dsh4 +TARGET_SYSTBL_ABI=3Dcommon +TARGET_SYSTBL=3Dsyscall.tbl +TARGET_ALIGNED_ONLY=3Dy diff --git a/default-configs/targets/sh4eb-linux-user.mak b/default-configs= /targets/sh4eb-linux-user.mak new file mode 100644 index 0000000000..cf9178f4ea --- /dev/null +++ b/default-configs/targets/sh4eb-linux-user.mak @@ -0,0 +1,8 @@ +TARGET_SH4=3Dy +TARGET_BASE_ARCH=3Dsh4 +TARGET_ABI_DIR=3Dsh4 +TARGET_SYSTBL_ABI=3Dcommon +TARGET_SYSTBL=3Dsyscall.tbl +TARGET_ALIGNED_ONLY=3Dy +TARGET_WORDS_BIGENDIAN=3Dy +TARGET_HAS_BFLT=3Dy diff --git a/default-configs/targets/sh4eb-softmmu.mak b/default-configs/ta= rgets/sh4eb-softmmu.mak new file mode 100644 index 0000000000..db4140ec32 --- /dev/null +++ b/default-configs/targets/sh4eb-softmmu.mak @@ -0,0 +1,7 @@ +TARGET_SH4=3Dy +TARGET_BASE_ARCH=3Dsh4 +TARGET_ABI_DIR=3Dsh4 +TARGET_SYSTBL_ABI=3Dcommon +TARGET_SYSTBL=3Dsyscall.tbl +TARGET_ALIGNED_ONLY=3Dy +TARGET_WORDS_BIGENDIAN=3Dy diff --git a/default-configs/targets/sparc-bsd-user.mak b/default-configs/t= argets/sparc-bsd-user.mak new file mode 100644 index 0000000000..7f2fcba978 --- /dev/null +++ b/default-configs/targets/sparc-bsd-user.mak @@ -0,0 +1,7 @@ +TARGET_SPARC=3Dy +TARGET_BASE_ARCH=3Dsparc +TARGET_ABI_DIR=3Dsparc +TARGET_SYSTBL_ABI=3Dcommon,32 +TARGET_SYSTBL=3Dsyscall.tbl +TARGET_ALIGNED_ONLY=3Dy +TARGET_WORDS_BIGENDIAN=3Dy diff --git a/default-configs/targets/sparc-linux-user.mak b/default-configs= /targets/sparc-linux-user.mak new file mode 100644 index 0000000000..7f2fcba978 --- /dev/null +++ b/default-configs/targets/sparc-linux-user.mak @@ -0,0 +1,7 @@ +TARGET_SPARC=3Dy +TARGET_BASE_ARCH=3Dsparc +TARGET_ABI_DIR=3Dsparc +TARGET_SYSTBL_ABI=3Dcommon,32 +TARGET_SYSTBL=3Dsyscall.tbl +TARGET_ALIGNED_ONLY=3Dy +TARGET_WORDS_BIGENDIAN=3Dy diff --git a/default-configs/targets/sparc-softmmu.mak b/default-configs/ta= rgets/sparc-softmmu.mak new file mode 100644 index 0000000000..7f2fcba978 --- /dev/null +++ b/default-configs/targets/sparc-softmmu.mak @@ -0,0 +1,7 @@ +TARGET_SPARC=3Dy +TARGET_BASE_ARCH=3Dsparc +TARGET_ABI_DIR=3Dsparc +TARGET_SYSTBL_ABI=3Dcommon,32 +TARGET_SYSTBL=3Dsyscall.tbl +TARGET_ALIGNED_ONLY=3Dy +TARGET_WORDS_BIGENDIAN=3Dy diff --git a/default-configs/targets/sparc32plus-linux-user.mak b/default-c= onfigs/targets/sparc32plus-linux-user.mak new file mode 100644 index 0000000000..f5fcb7879e --- /dev/null +++ b/default-configs/targets/sparc32plus-linux-user.mak @@ -0,0 +1,8 @@ +TARGET_ABI32=3Dy +TARGET_SPARC64=3Dy +TARGET_BASE_ARCH=3Dsparc +TARGET_ABI_DIR=3Dsparc +TARGET_SYSTBL_ABI=3Dcommon,32 +TARGET_SYSTBL=3Dsyscall.tbl +TARGET_ALIGNED_ONLY=3Dy +TARGET_WORDS_BIGENDIAN=3Dy diff --git a/default-configs/targets/sparc64-bsd-user.mak b/default-configs= /targets/sparc64-bsd-user.mak new file mode 100644 index 0000000000..817529e587 --- /dev/null +++ b/default-configs/targets/sparc64-bsd-user.mak @@ -0,0 +1,7 @@ +TARGET_SPARC64=3Dy +TARGET_BASE_ARCH=3Dsparc +TARGET_ABI_DIR=3Dsparc64 +TARGET_SYSTBL_ABI=3Dcommon,64 +TARGET_SYSTBL=3Dsyscall.tbl +TARGET_ALIGNED_ONLY=3Dy +TARGET_WORDS_BIGENDIAN=3Dy diff --git a/default-configs/targets/sparc64-linux-user.mak b/default-confi= gs/targets/sparc64-linux-user.mak new file mode 100644 index 0000000000..817529e587 --- /dev/null +++ b/default-configs/targets/sparc64-linux-user.mak @@ -0,0 +1,7 @@ +TARGET_SPARC64=3Dy +TARGET_BASE_ARCH=3Dsparc +TARGET_ABI_DIR=3Dsparc64 +TARGET_SYSTBL_ABI=3Dcommon,64 +TARGET_SYSTBL=3Dsyscall.tbl +TARGET_ALIGNED_ONLY=3Dy +TARGET_WORDS_BIGENDIAN=3Dy diff --git a/default-configs/targets/sparc64-softmmu.mak b/default-configs/= targets/sparc64-softmmu.mak new file mode 100644 index 0000000000..817529e587 --- /dev/null +++ b/default-configs/targets/sparc64-softmmu.mak @@ -0,0 +1,7 @@ +TARGET_SPARC64=3Dy +TARGET_BASE_ARCH=3Dsparc +TARGET_ABI_DIR=3Dsparc64 +TARGET_SYSTBL_ABI=3Dcommon,64 +TARGET_SYSTBL=3Dsyscall.tbl +TARGET_ALIGNED_ONLY=3Dy +TARGET_WORDS_BIGENDIAN=3Dy diff --git a/default-configs/targets/tilegx-linux-user.mak b/default-config= s/targets/tilegx-linux-user.mak new file mode 100644 index 0000000000..064d3320d7 --- /dev/null +++ b/default-configs/targets/tilegx-linux-user.mak @@ -0,0 +1,3 @@ +TARGET_TILEGX=3Dy +TARGET_BASE_ARCH=3Dtilegx +TARGET_ABI_DIR=3Dtilegx diff --git a/default-configs/targets/tricore-softmmu.mak b/default-configs/= targets/tricore-softmmu.mak new file mode 100644 index 0000000000..356e5d8669 --- /dev/null +++ b/default-configs/targets/tricore-softmmu.mak @@ -0,0 +1,3 @@ +TARGET_TRICORE=3Dy +TARGET_BASE_ARCH=3Dtricore +TARGET_ABI_DIR=3Dtricore diff --git a/default-configs/targets/unicore32-softmmu.mak b/default-config= s/targets/unicore32-softmmu.mak new file mode 100644 index 0000000000..d8c7860ac1 --- /dev/null +++ b/default-configs/targets/unicore32-softmmu.mak @@ -0,0 +1,3 @@ +TARGET_UNICORE32=3Dy +TARGET_BASE_ARCH=3Dunicore32 +TARGET_ABI_DIR=3Dunicore32 diff --git a/default-configs/targets/x86_64-bsd-user.mak b/default-configs/= targets/x86_64-bsd-user.mak new file mode 100644 index 0000000000..6a9418f9ff --- /dev/null +++ b/default-configs/targets/x86_64-bsd-user.mak @@ -0,0 +1,6 @@ +TARGET_X86_64=3Dy +TARGET_BASE_ARCH=3Di386 +TARGET_ABI_DIR=3Dx86_64 +TARGET_SYSTBL_ABI=3Dcommon,64 +TARGET_SYSTBL=3Dsyscall_64.tbl +TARGET_XML_FILES=3D gdb-xml/i386-64bit.xml diff --git a/default-configs/targets/x86_64-linux-user.mak b/default-config= s/targets/x86_64-linux-user.mak new file mode 100644 index 0000000000..6a9418f9ff --- /dev/null +++ b/default-configs/targets/x86_64-linux-user.mak @@ -0,0 +1,6 @@ +TARGET_X86_64=3Dy +TARGET_BASE_ARCH=3Di386 +TARGET_ABI_DIR=3Dx86_64 +TARGET_SYSTBL_ABI=3Dcommon,64 +TARGET_SYSTBL=3Dsyscall_64.tbl +TARGET_XML_FILES=3D gdb-xml/i386-64bit.xml diff --git a/default-configs/targets/x86_64-softmmu.mak b/default-configs/t= argets/x86_64-softmmu.mak new file mode 100644 index 0000000000..8b56e6e6da --- /dev/null +++ b/default-configs/targets/x86_64-softmmu.mak @@ -0,0 +1,7 @@ +TARGET_X86_64=3Dy +TARGET_BASE_ARCH=3Di386 +TARGET_ABI_DIR=3Dx86_64 +TARGET_SYSTBL_ABI=3Dcommon,64 +TARGET_SYSTBL=3Dsyscall_64.tbl +TARGET_SUPPORTS_MTTCG=3Dy +TARGET_XML_FILES=3D gdb-xml/i386-64bit.xml diff --git a/default-configs/targets/xtensa-linux-user.mak b/default-config= s/targets/xtensa-linux-user.mak new file mode 100644 index 0000000000..63d9cff69f --- /dev/null +++ b/default-configs/targets/xtensa-linux-user.mak @@ -0,0 +1,7 @@ +TARGET_XTENSA=3Dy +TARGET_BASE_ARCH=3Dxtensa +TARGET_ABI_DIR=3Dxtensa +TARGET_SYSTBL_ABI=3Dcommon +TARGET_SYSTBL=3Dsyscall.tbl +TARGET_ALIGNED_ONLY=3Dy +TARGET_HAS_BFLT=3Dy diff --git a/default-configs/targets/xtensa-softmmu.mak b/default-configs/t= argets/xtensa-softmmu.mak new file mode 100644 index 0000000000..2166f97738 --- /dev/null +++ b/default-configs/targets/xtensa-softmmu.mak @@ -0,0 +1,7 @@ +TARGET_XTENSA=3Dy +TARGET_BASE_ARCH=3Dxtensa +TARGET_ABI_DIR=3Dxtensa +TARGET_SYSTBL_ABI=3Dcommon +TARGET_SYSTBL=3Dsyscall.tbl +TARGET_ALIGNED_ONLY=3Dy +TARGET_SUPPORTS_MTTCG=3Dy diff --git a/default-configs/targets/xtensaeb-linux-user.mak b/default-conf= igs/targets/xtensaeb-linux-user.mak new file mode 100644 index 0000000000..e66b7dd0e3 --- /dev/null +++ b/default-configs/targets/xtensaeb-linux-user.mak @@ -0,0 +1,8 @@ +TARGET_XTENSA=3Dy +TARGET_BASE_ARCH=3Dxtensa +TARGET_ABI_DIR=3Dxtensa +TARGET_SYSTBL_ABI=3Dcommon +TARGET_SYSTBL=3Dsyscall.tbl +TARGET_ALIGNED_ONLY=3Dy +TARGET_WORDS_BIGENDIAN=3Dy +TARGET_HAS_BFLT=3Dy diff --git a/default-configs/targets/xtensaeb-softmmu.mak b/default-configs= /targets/xtensaeb-softmmu.mak new file mode 100644 index 0000000000..2372d22492 --- /dev/null +++ b/default-configs/targets/xtensaeb-softmmu.mak @@ -0,0 +1,8 @@ +TARGET_XTENSA=3Dy +TARGET_BASE_ARCH=3Dxtensa +TARGET_ABI_DIR=3Dxtensa +TARGET_SYSTBL_ABI=3Dcommon +TARGET_SYSTBL=3Dsyscall.tbl +TARGET_ALIGNED_ONLY=3Dy +TARGET_WORDS_BIGENDIAN=3Dy +TARGET_SUPPORTS_MTTCG=3Dy diff --git a/meson.build b/meson.build index 6863b9febf..5ddaf16b88 100644 --- a/meson.build +++ b/meson.build @@ -722,13 +722,25 @@ kconfig_external_symbols =3D [ ] ignored =3D ['TARGET_XML_FILES', 'TARGET_ABI_DIR', 'TARGET_DIRS'] =20 +default_targets =3D 'CONFIG_DEFAULT_TARGETS' in config_host +actual_target_dirs =3D [] foreach target : target_dirs config_target =3D { 'TARGET_NAME': target.split('-')[0] } if target.endswith('linux-user') - assert(targetos =3D=3D 'linux') + if targetos !=3D 'linux' + if default_targets + continue + endif + error('Target @0@ is only available on a Linux host'.format(target)) + endif config_target +=3D { 'CONFIG_LINUX_USER': 'y' } elif target.endswith('bsd-user') - assert('CONFIG_BSD' in config_host) + if not 'CONFIG_BSD' in config_host + if default_targets + continue + endif + error('Target @0@ is only available on a BSD host'.format(target)) + endif config_target +=3D { 'CONFIG_BSD_USER': 'y' } elif target.endswith('softmmu') config_target +=3D { 'CONFIG_SOFTMMU': 'y' } @@ -752,8 +764,14 @@ foreach target : target_dirs endif have_accel =3D true endforeach - assert(have_accel) + if not have_accel + if default_targets + continue + endif + error('No accelerator available for target @0@'.format(target)) + endif =20 + actual_target_dirs +=3D target config_target +=3D keyval.load('default-configs/targets' / target + '.ma= k') =20 foreach k, v: disassemblers @@ -815,6 +833,7 @@ foreach target : target_dirs endif config_target_mak +=3D {target: config_target} endforeach +target_dirs =3D actual_target_dirs =20 # This configuration is used to build files that are shared by # multiple binaries, and then extracted out of the "common" @@ -1600,7 +1619,7 @@ if config_host.has_key('CONFIG_MODULES') endif summary_info +=3D {'host CPU': cpu} summary_info +=3D {'host endianness': build_machine.endian()} -summary_info +=3D {'target list': config_host['TARGET_DIRS']} +summary_info +=3D {'target list': ' '.join(target_dirs)} summary_info +=3D {'gprof enabled': config_host.has_key('CONFIG_GPROF'= )} summary_info +=3D {'sparse enabled': meson.get_compiler('c').cmd_array(= ).contains('cgcc')} summary_info +=3D {'strip binaries': get_option('strip')} --=20 2.26.2