From nobody Sun Nov 16 12:30:53 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=1600607683; cv=none; d=zohomail.com; s=zohoarc; b=LyGRvLCLVZzM1UnuDo90tDNDn/RbxJOlf8l8IhR7qGX4r55hrhaSmh5QQTfm2B7MGgzLkFhc3tRlVelYhETrQ4Si1YCxLR9JEZk9xGgZUCxJkqzVwvUZDVMqOfEm6VJIYWdr65iG47Jc3/4wEH63zx4LnvDzTlvQbDxyFtPwsYc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600607683; 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=rhMctbgkeMPZhDoiOUuIIz9jqksde6/IoFkbGNb4ZGs=; b=g5jXvkm6AHRQk43NMj/XRFNmo4ZgQdD02PJUkWXvp63w/ll0RHjaTzBn36shHKC695o3t5kFLpeyCnCqcYAXZQ3nkdUxjETImVjSSQcFaVTcYir2pDxSZK1csNLZ7NkcbQ8YtZtvl8u348s4U9aenzCy1iHWAZVcS8jdu0gDRZM= 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 1600607683705426.11948976764666; Sun, 20 Sep 2020 06:14:43 -0700 (PDT) Received: from localhost ([::1]:45670 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJzAv-0004iJ-Ts for importer@patchew.org; Sun, 20 Sep 2020 09:14:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60114) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJz3q-0006A4-T9 for qemu-devel@nongnu.org; Sun, 20 Sep 2020 09:07:22 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:34150 helo=us-smtp-delivery-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-000184-GQ for qemu-devel@nongnu.org; Sun, 20 Sep 2020 09:07:22 -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-256-AZoclnhMNyWZjziQALU8VA-1; Sun, 20 Sep 2020 09:07:10 -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 A59271074644 for ; Sun, 20 Sep 2020 13:07:09 +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 73FA560C47 for ; Sun, 20 Sep 2020 13:07:09 +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=rhMctbgkeMPZhDoiOUuIIz9jqksde6/IoFkbGNb4ZGs=; b=AAMxwWO4/ksBHYtl8Lvoeg+4szonaYgHvYJzBFPf/oAxeq6/pleZe5zod5EX1lOaGz8UJA V+aM5rAZ6j1Tw3HbtsjK3pmpI4IfMLbA0Q5rX6zyKyqYMn5r6PgEq/9ncVGjWC2tYiv+hG hkLUOhn0ONR1Ib62V9KWBfE5XglcNyk= X-MC-Unique: AZoclnhMNyWZjziQALU8VA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 1/9] default-configs: move files to default-configs/devices/ Date: Sun, 20 Sep 2020 09:07:00 -0400 Message-Id: <20200920130708.1156310-2-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.61; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/20 09:07:13 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" Make room for target files in default-configs/targets/ Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson --- configure | 6 +++--- default-configs/{ =3D> devices}/aarch64-linux-user.mak | 0 default-configs/{ =3D> devices}/aarch64-softmmu.mak | 0 default-configs/{ =3D> devices}/aarch64_be-linux-user.mak | 0 default-configs/{ =3D> devices}/alpha-linux-user.mak | 0 default-configs/{ =3D> devices}/alpha-softmmu.mak | 0 default-configs/{ =3D> devices}/arm-linux-user.mak | 0 default-configs/{ =3D> devices}/arm-softmmu.mak | 0 default-configs/{ =3D> devices}/armeb-linux-user.mak | 0 default-configs/{ =3D> devices}/avr-softmmu.mak | 0 default-configs/{ =3D> devices}/cris-linux-user.mak | 0 default-configs/{ =3D> devices}/cris-softmmu.mak | 0 default-configs/{ =3D> devices}/hppa-linux-user.mak | 0 default-configs/{ =3D> devices}/hppa-softmmu.mak | 0 default-configs/{ =3D> devices}/i386-bsd-user.mak | 0 default-configs/{ =3D> devices}/i386-linux-user.mak | 0 default-configs/{ =3D> devices}/i386-softmmu.mak | 0 default-configs/{ =3D> devices}/lm32-softmmu.mak | 0 default-configs/{ =3D> devices}/m68k-linux-user.mak | 0 default-configs/{ =3D> devices}/m68k-softmmu.mak | 0 default-configs/{ =3D> devices}/microblaze-linux-user.mak | 0 default-configs/{ =3D> devices}/microblaze-softmmu.mak | 0 default-configs/{ =3D> devices}/microblazeel-linux-user.mak | 0 default-configs/{ =3D> devices}/microblazeel-softmmu.mak | 0 default-configs/{ =3D> devices}/mips-linux-user.mak | 0 default-configs/{ =3D> devices}/mips-softmmu-common.mak | 0 default-configs/{ =3D> devices}/mips-softmmu.mak | 0 default-configs/{ =3D> devices}/mips64-linux-user.mak | 0 default-configs/{ =3D> devices}/mips64-softmmu.mak | 0 default-configs/{ =3D> devices}/mips64el-linux-user.mak | 0 default-configs/{ =3D> devices}/mips64el-softmmu.mak | 0 default-configs/{ =3D> devices}/mipsel-linux-user.mak | 0 default-configs/{ =3D> devices}/mipsel-softmmu.mak | 0 default-configs/{ =3D> devices}/mipsn32-linux-user.mak | 0 default-configs/{ =3D> devices}/mipsn32el-linux-user.mak | 0 default-configs/{ =3D> devices}/moxie-softmmu.mak | 0 default-configs/{ =3D> devices}/nios2-linux-user.mak | 0 default-configs/{ =3D> devices}/nios2-softmmu.mak | 0 default-configs/{ =3D> devices}/or1k-linux-user.mak | 0 default-configs/{ =3D> devices}/or1k-softmmu.mak | 0 default-configs/{ =3D> devices}/ppc-linux-user.mak | 0 default-configs/{ =3D> devices}/ppc-softmmu.mak | 0 default-configs/{ =3D> devices}/ppc64-linux-user.mak | 0 default-configs/{ =3D> devices}/ppc64-softmmu.mak | 0 default-configs/{ =3D> devices}/ppc64abi32-linux-user.mak | 0 default-configs/{ =3D> devices}/ppc64le-linux-user.mak | 0 default-configs/{ =3D> devices}/riscv32-linux-user.mak | 0 default-configs/{ =3D> devices}/riscv32-softmmu.mak | 0 default-configs/{ =3D> devices}/riscv64-linux-user.mak | 0 default-configs/{ =3D> devices}/riscv64-softmmu.mak | 0 default-configs/{ =3D> devices}/rx-softmmu.mak | 0 default-configs/{ =3D> devices}/s390x-linux-user.mak | 0 default-configs/{ =3D> devices}/s390x-softmmu.mak | 0 default-configs/{ =3D> devices}/sh4-linux-user.mak | 0 default-configs/{ =3D> devices}/sh4-softmmu.mak | 0 default-configs/{ =3D> devices}/sh4eb-linux-user.mak | 0 default-configs/{ =3D> devices}/sh4eb-softmmu.mak | 0 default-configs/{ =3D> devices}/sparc-bsd-user.mak | 0 default-configs/{ =3D> devices}/sparc-linux-user.mak | 0 default-configs/{ =3D> devices}/sparc-softmmu.mak | 0 default-configs/{ =3D> devices}/sparc32plus-linux-user.mak | 0 default-configs/{ =3D> devices}/sparc64-bsd-user.mak | 0 default-configs/{ =3D> devices}/sparc64-linux-user.mak | 0 default-configs/{ =3D> devices}/sparc64-softmmu.mak | 0 default-configs/{ =3D> devices}/tilegx-linux-user.mak | 0 default-configs/{ =3D> devices}/tricore-softmmu.mak | 0 default-configs/{ =3D> devices}/unicore32-softmmu.mak | 0 default-configs/{ =3D> devices}/x86_64-bsd-user.mak | 0 default-configs/{ =3D> devices}/x86_64-linux-user.mak | 0 default-configs/{ =3D> devices}/x86_64-softmmu.mak | 0 default-configs/{ =3D> devices}/xtensa-linux-user.mak | 0 default-configs/{ =3D> devices}/xtensa-softmmu.mak | 0 default-configs/{ =3D> devices}/xtensaeb-linux-user.mak | 0 default-configs/{ =3D> devices}/xtensaeb-softmmu.mak | 0 meson.build | 2 +- 75 files changed, 4 insertions(+), 4 deletions(-) rename default-configs/{ =3D> devices}/aarch64-linux-user.mak (100%) rename default-configs/{ =3D> devices}/aarch64-softmmu.mak (100%) rename default-configs/{ =3D> devices}/aarch64_be-linux-user.mak (100%) rename default-configs/{ =3D> devices}/alpha-linux-user.mak (100%) rename default-configs/{ =3D> devices}/alpha-softmmu.mak (100%) rename default-configs/{ =3D> devices}/arm-linux-user.mak (100%) rename default-configs/{ =3D> devices}/arm-softmmu.mak (100%) rename default-configs/{ =3D> devices}/armeb-linux-user.mak (100%) rename default-configs/{ =3D> devices}/avr-softmmu.mak (100%) rename default-configs/{ =3D> devices}/cris-linux-user.mak (100%) rename default-configs/{ =3D> devices}/cris-softmmu.mak (100%) rename default-configs/{ =3D> devices}/hppa-linux-user.mak (100%) rename default-configs/{ =3D> devices}/hppa-softmmu.mak (100%) rename default-configs/{ =3D> devices}/i386-bsd-user.mak (100%) rename default-configs/{ =3D> devices}/i386-linux-user.mak (100%) rename default-configs/{ =3D> devices}/i386-softmmu.mak (100%) rename default-configs/{ =3D> devices}/lm32-softmmu.mak (100%) rename default-configs/{ =3D> devices}/m68k-linux-user.mak (100%) rename default-configs/{ =3D> devices}/m68k-softmmu.mak (100%) rename default-configs/{ =3D> devices}/microblaze-linux-user.mak (100%) rename default-configs/{ =3D> devices}/microblaze-softmmu.mak (100%) rename default-configs/{ =3D> devices}/microblazeel-linux-user.mak (100%) rename default-configs/{ =3D> devices}/microblazeel-softmmu.mak (100%) rename default-configs/{ =3D> devices}/mips-linux-user.mak (100%) rename default-configs/{ =3D> devices}/mips-softmmu-common.mak (100%) rename default-configs/{ =3D> devices}/mips-softmmu.mak (100%) rename default-configs/{ =3D> devices}/mips64-linux-user.mak (100%) rename default-configs/{ =3D> devices}/mips64-softmmu.mak (100%) rename default-configs/{ =3D> devices}/mips64el-linux-user.mak (100%) rename default-configs/{ =3D> devices}/mips64el-softmmu.mak (100%) rename default-configs/{ =3D> devices}/mipsel-linux-user.mak (100%) rename default-configs/{ =3D> devices}/mipsel-softmmu.mak (100%) rename default-configs/{ =3D> devices}/mipsn32-linux-user.mak (100%) rename default-configs/{ =3D> devices}/mipsn32el-linux-user.mak (100%) rename default-configs/{ =3D> devices}/moxie-softmmu.mak (100%) rename default-configs/{ =3D> devices}/nios2-linux-user.mak (100%) rename default-configs/{ =3D> devices}/nios2-softmmu.mak (100%) rename default-configs/{ =3D> devices}/or1k-linux-user.mak (100%) rename default-configs/{ =3D> devices}/or1k-softmmu.mak (100%) rename default-configs/{ =3D> devices}/ppc-linux-user.mak (100%) rename default-configs/{ =3D> devices}/ppc-softmmu.mak (100%) rename default-configs/{ =3D> devices}/ppc64-linux-user.mak (100%) rename default-configs/{ =3D> devices}/ppc64-softmmu.mak (100%) rename default-configs/{ =3D> devices}/ppc64abi32-linux-user.mak (100%) rename default-configs/{ =3D> devices}/ppc64le-linux-user.mak (100%) rename default-configs/{ =3D> devices}/riscv32-linux-user.mak (100%) rename default-configs/{ =3D> devices}/riscv32-softmmu.mak (100%) rename default-configs/{ =3D> devices}/riscv64-linux-user.mak (100%) rename default-configs/{ =3D> devices}/riscv64-softmmu.mak (100%) rename default-configs/{ =3D> devices}/rx-softmmu.mak (100%) rename default-configs/{ =3D> devices}/s390x-linux-user.mak (100%) rename default-configs/{ =3D> devices}/s390x-softmmu.mak (100%) rename default-configs/{ =3D> devices}/sh4-linux-user.mak (100%) rename default-configs/{ =3D> devices}/sh4-softmmu.mak (100%) rename default-configs/{ =3D> devices}/sh4eb-linux-user.mak (100%) rename default-configs/{ =3D> devices}/sh4eb-softmmu.mak (100%) rename default-configs/{ =3D> devices}/sparc-bsd-user.mak (100%) rename default-configs/{ =3D> devices}/sparc-linux-user.mak (100%) rename default-configs/{ =3D> devices}/sparc-softmmu.mak (100%) rename default-configs/{ =3D> devices}/sparc32plus-linux-user.mak (100%) rename default-configs/{ =3D> devices}/sparc64-bsd-user.mak (100%) rename default-configs/{ =3D> devices}/sparc64-linux-user.mak (100%) rename default-configs/{ =3D> devices}/sparc64-softmmu.mak (100%) rename default-configs/{ =3D> devices}/tilegx-linux-user.mak (100%) rename default-configs/{ =3D> devices}/tricore-softmmu.mak (100%) rename default-configs/{ =3D> devices}/unicore32-softmmu.mak (100%) rename default-configs/{ =3D> devices}/x86_64-bsd-user.mak (100%) rename default-configs/{ =3D> devices}/x86_64-linux-user.mak (100%) rename default-configs/{ =3D> devices}/x86_64-softmmu.mak (100%) rename default-configs/{ =3D> devices}/xtensa-linux-user.mak (100%) rename default-configs/{ =3D> devices}/xtensa-softmmu.mak (100%) rename default-configs/{ =3D> devices}/xtensaeb-linux-user.mak (100%) rename default-configs/{ =3D> devices}/xtensaeb-softmmu.mak (100%) diff --git a/configure b/configure index c65d3e06bb..bf55c24557 100755 --- a/configure +++ b/configure @@ -1716,13 +1716,13 @@ default_target_list=3D"" mak_wilds=3D"" =20 if [ "$softmmu" =3D "yes" ]; then - mak_wilds=3D"${mak_wilds} $source_path/default-configs/*-softmmu.mak" + mak_wilds=3D"${mak_wilds} $source_path/default-configs/devices/*-softm= mu.mak" fi if [ "$linux_user" =3D "yes" ]; then - mak_wilds=3D"${mak_wilds} $source_path/default-configs/*-linux-user.ma= k" + mak_wilds=3D"${mak_wilds} $source_path/default-configs/devices/*-linux= -user.mak" fi if [ "$bsd_user" =3D "yes" ]; then - mak_wilds=3D"${mak_wilds} $source_path/default-configs/*-bsd-user.mak" + mak_wilds=3D"${mak_wilds} $source_path/default-configs/devices/*-bsd-u= ser.mak" fi =20 if test -z "$target_list_exclude" -a -z "$target_list"; then diff --git a/default-configs/aarch64-linux-user.mak b/default-configs/devic= es/aarch64-linux-user.mak similarity index 100% rename from default-configs/aarch64-linux-user.mak rename to default-configs/devices/aarch64-linux-user.mak diff --git a/default-configs/aarch64-softmmu.mak b/default-configs/devices/= aarch64-softmmu.mak similarity index 100% rename from default-configs/aarch64-softmmu.mak rename to default-configs/devices/aarch64-softmmu.mak diff --git a/default-configs/aarch64_be-linux-user.mak b/default-configs/de= vices/aarch64_be-linux-user.mak similarity index 100% rename from default-configs/aarch64_be-linux-user.mak rename to default-configs/devices/aarch64_be-linux-user.mak diff --git a/default-configs/alpha-linux-user.mak b/default-configs/devices= /alpha-linux-user.mak similarity index 100% rename from default-configs/alpha-linux-user.mak rename to default-configs/devices/alpha-linux-user.mak diff --git a/default-configs/alpha-softmmu.mak b/default-configs/devices/al= pha-softmmu.mak similarity index 100% rename from default-configs/alpha-softmmu.mak rename to default-configs/devices/alpha-softmmu.mak diff --git a/default-configs/arm-linux-user.mak b/default-configs/devices/a= rm-linux-user.mak similarity index 100% rename from default-configs/arm-linux-user.mak rename to default-configs/devices/arm-linux-user.mak diff --git a/default-configs/arm-softmmu.mak b/default-configs/devices/arm-= softmmu.mak similarity index 100% rename from default-configs/arm-softmmu.mak rename to default-configs/devices/arm-softmmu.mak diff --git a/default-configs/armeb-linux-user.mak b/default-configs/devices= /armeb-linux-user.mak similarity index 100% rename from default-configs/armeb-linux-user.mak rename to default-configs/devices/armeb-linux-user.mak diff --git a/default-configs/avr-softmmu.mak b/default-configs/devices/avr-= softmmu.mak similarity index 100% rename from default-configs/avr-softmmu.mak rename to default-configs/devices/avr-softmmu.mak diff --git a/default-configs/cris-linux-user.mak b/default-configs/devices/= cris-linux-user.mak similarity index 100% rename from default-configs/cris-linux-user.mak rename to default-configs/devices/cris-linux-user.mak diff --git a/default-configs/cris-softmmu.mak b/default-configs/devices/cri= s-softmmu.mak similarity index 100% rename from default-configs/cris-softmmu.mak rename to default-configs/devices/cris-softmmu.mak diff --git a/default-configs/hppa-linux-user.mak b/default-configs/devices/= hppa-linux-user.mak similarity index 100% rename from default-configs/hppa-linux-user.mak rename to default-configs/devices/hppa-linux-user.mak diff --git a/default-configs/hppa-softmmu.mak b/default-configs/devices/hpp= a-softmmu.mak similarity index 100% rename from default-configs/hppa-softmmu.mak rename to default-configs/devices/hppa-softmmu.mak diff --git a/default-configs/i386-bsd-user.mak b/default-configs/devices/i3= 86-bsd-user.mak similarity index 100% rename from default-configs/i386-bsd-user.mak rename to default-configs/devices/i386-bsd-user.mak diff --git a/default-configs/i386-linux-user.mak b/default-configs/devices/= i386-linux-user.mak similarity index 100% rename from default-configs/i386-linux-user.mak rename to default-configs/devices/i386-linux-user.mak diff --git a/default-configs/i386-softmmu.mak b/default-configs/devices/i38= 6-softmmu.mak similarity index 100% rename from default-configs/i386-softmmu.mak rename to default-configs/devices/i386-softmmu.mak diff --git a/default-configs/lm32-softmmu.mak b/default-configs/devices/lm3= 2-softmmu.mak similarity index 100% rename from default-configs/lm32-softmmu.mak rename to default-configs/devices/lm32-softmmu.mak diff --git a/default-configs/m68k-linux-user.mak b/default-configs/devices/= m68k-linux-user.mak similarity index 100% rename from default-configs/m68k-linux-user.mak rename to default-configs/devices/m68k-linux-user.mak diff --git a/default-configs/m68k-softmmu.mak b/default-configs/devices/m68= k-softmmu.mak similarity index 100% rename from default-configs/m68k-softmmu.mak rename to default-configs/devices/m68k-softmmu.mak diff --git a/default-configs/microblaze-linux-user.mak b/default-configs/de= vices/microblaze-linux-user.mak similarity index 100% rename from default-configs/microblaze-linux-user.mak rename to default-configs/devices/microblaze-linux-user.mak diff --git a/default-configs/microblaze-softmmu.mak b/default-configs/devic= es/microblaze-softmmu.mak similarity index 100% rename from default-configs/microblaze-softmmu.mak rename to default-configs/devices/microblaze-softmmu.mak diff --git a/default-configs/microblazeel-linux-user.mak b/default-configs/= devices/microblazeel-linux-user.mak similarity index 100% rename from default-configs/microblazeel-linux-user.mak rename to default-configs/devices/microblazeel-linux-user.mak diff --git a/default-configs/microblazeel-softmmu.mak b/default-configs/dev= ices/microblazeel-softmmu.mak similarity index 100% rename from default-configs/microblazeel-softmmu.mak rename to default-configs/devices/microblazeel-softmmu.mak diff --git a/default-configs/mips-linux-user.mak b/default-configs/devices/= mips-linux-user.mak similarity index 100% rename from default-configs/mips-linux-user.mak rename to default-configs/devices/mips-linux-user.mak diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/devi= ces/mips-softmmu-common.mak similarity index 100% rename from default-configs/mips-softmmu-common.mak rename to default-configs/devices/mips-softmmu-common.mak diff --git a/default-configs/mips-softmmu.mak b/default-configs/devices/mip= s-softmmu.mak similarity index 100% rename from default-configs/mips-softmmu.mak rename to default-configs/devices/mips-softmmu.mak diff --git a/default-configs/mips64-linux-user.mak b/default-configs/device= s/mips64-linux-user.mak similarity index 100% rename from default-configs/mips64-linux-user.mak rename to default-configs/devices/mips64-linux-user.mak diff --git a/default-configs/mips64-softmmu.mak b/default-configs/devices/m= ips64-softmmu.mak similarity index 100% rename from default-configs/mips64-softmmu.mak rename to default-configs/devices/mips64-softmmu.mak diff --git a/default-configs/mips64el-linux-user.mak b/default-configs/devi= ces/mips64el-linux-user.mak similarity index 100% rename from default-configs/mips64el-linux-user.mak rename to default-configs/devices/mips64el-linux-user.mak diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/devices= /mips64el-softmmu.mak similarity index 100% rename from default-configs/mips64el-softmmu.mak rename to default-configs/devices/mips64el-softmmu.mak diff --git a/default-configs/mipsel-linux-user.mak b/default-configs/device= s/mipsel-linux-user.mak similarity index 100% rename from default-configs/mipsel-linux-user.mak rename to default-configs/devices/mipsel-linux-user.mak diff --git a/default-configs/mipsel-softmmu.mak b/default-configs/devices/m= ipsel-softmmu.mak similarity index 100% rename from default-configs/mipsel-softmmu.mak rename to default-configs/devices/mipsel-softmmu.mak diff --git a/default-configs/mipsn32-linux-user.mak b/default-configs/devic= es/mipsn32-linux-user.mak similarity index 100% rename from default-configs/mipsn32-linux-user.mak rename to default-configs/devices/mipsn32-linux-user.mak diff --git a/default-configs/mipsn32el-linux-user.mak b/default-configs/dev= ices/mipsn32el-linux-user.mak similarity index 100% rename from default-configs/mipsn32el-linux-user.mak rename to default-configs/devices/mipsn32el-linux-user.mak diff --git a/default-configs/moxie-softmmu.mak b/default-configs/devices/mo= xie-softmmu.mak similarity index 100% rename from default-configs/moxie-softmmu.mak rename to default-configs/devices/moxie-softmmu.mak diff --git a/default-configs/nios2-linux-user.mak b/default-configs/devices= /nios2-linux-user.mak similarity index 100% rename from default-configs/nios2-linux-user.mak rename to default-configs/devices/nios2-linux-user.mak diff --git a/default-configs/nios2-softmmu.mak b/default-configs/devices/ni= os2-softmmu.mak similarity index 100% rename from default-configs/nios2-softmmu.mak rename to default-configs/devices/nios2-softmmu.mak diff --git a/default-configs/or1k-linux-user.mak b/default-configs/devices/= or1k-linux-user.mak similarity index 100% rename from default-configs/or1k-linux-user.mak rename to default-configs/devices/or1k-linux-user.mak diff --git a/default-configs/or1k-softmmu.mak b/default-configs/devices/or1= k-softmmu.mak similarity index 100% rename from default-configs/or1k-softmmu.mak rename to default-configs/devices/or1k-softmmu.mak diff --git a/default-configs/ppc-linux-user.mak b/default-configs/devices/p= pc-linux-user.mak similarity index 100% rename from default-configs/ppc-linux-user.mak rename to default-configs/devices/ppc-linux-user.mak diff --git a/default-configs/ppc-softmmu.mak b/default-configs/devices/ppc-= softmmu.mak similarity index 100% rename from default-configs/ppc-softmmu.mak rename to default-configs/devices/ppc-softmmu.mak diff --git a/default-configs/ppc64-linux-user.mak b/default-configs/devices= /ppc64-linux-user.mak similarity index 100% rename from default-configs/ppc64-linux-user.mak rename to default-configs/devices/ppc64-linux-user.mak diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/devices/pp= c64-softmmu.mak similarity index 100% rename from default-configs/ppc64-softmmu.mak rename to default-configs/devices/ppc64-softmmu.mak diff --git a/default-configs/ppc64abi32-linux-user.mak b/default-configs/de= vices/ppc64abi32-linux-user.mak similarity index 100% rename from default-configs/ppc64abi32-linux-user.mak rename to default-configs/devices/ppc64abi32-linux-user.mak diff --git a/default-configs/ppc64le-linux-user.mak b/default-configs/devic= es/ppc64le-linux-user.mak similarity index 100% rename from default-configs/ppc64le-linux-user.mak rename to default-configs/devices/ppc64le-linux-user.mak diff --git a/default-configs/riscv32-linux-user.mak b/default-configs/devic= es/riscv32-linux-user.mak similarity index 100% rename from default-configs/riscv32-linux-user.mak rename to default-configs/devices/riscv32-linux-user.mak diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/devices/= riscv32-softmmu.mak similarity index 100% rename from default-configs/riscv32-softmmu.mak rename to default-configs/devices/riscv32-softmmu.mak diff --git a/default-configs/riscv64-linux-user.mak b/default-configs/devic= es/riscv64-linux-user.mak similarity index 100% rename from default-configs/riscv64-linux-user.mak rename to default-configs/devices/riscv64-linux-user.mak diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/devices/= riscv64-softmmu.mak similarity index 100% rename from default-configs/riscv64-softmmu.mak rename to default-configs/devices/riscv64-softmmu.mak diff --git a/default-configs/rx-softmmu.mak b/default-configs/devices/rx-so= ftmmu.mak similarity index 100% rename from default-configs/rx-softmmu.mak rename to default-configs/devices/rx-softmmu.mak diff --git a/default-configs/s390x-linux-user.mak b/default-configs/devices= /s390x-linux-user.mak similarity index 100% rename from default-configs/s390x-linux-user.mak rename to default-configs/devices/s390x-linux-user.mak diff --git a/default-configs/s390x-softmmu.mak b/default-configs/devices/s3= 90x-softmmu.mak similarity index 100% rename from default-configs/s390x-softmmu.mak rename to default-configs/devices/s390x-softmmu.mak diff --git a/default-configs/sh4-linux-user.mak b/default-configs/devices/s= h4-linux-user.mak similarity index 100% rename from default-configs/sh4-linux-user.mak rename to default-configs/devices/sh4-linux-user.mak diff --git a/default-configs/sh4-softmmu.mak b/default-configs/devices/sh4-= softmmu.mak similarity index 100% rename from default-configs/sh4-softmmu.mak rename to default-configs/devices/sh4-softmmu.mak diff --git a/default-configs/sh4eb-linux-user.mak b/default-configs/devices= /sh4eb-linux-user.mak similarity index 100% rename from default-configs/sh4eb-linux-user.mak rename to default-configs/devices/sh4eb-linux-user.mak diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/devices/sh= 4eb-softmmu.mak similarity index 100% rename from default-configs/sh4eb-softmmu.mak rename to default-configs/devices/sh4eb-softmmu.mak diff --git a/default-configs/sparc-bsd-user.mak b/default-configs/devices/s= parc-bsd-user.mak similarity index 100% rename from default-configs/sparc-bsd-user.mak rename to default-configs/devices/sparc-bsd-user.mak diff --git a/default-configs/sparc-linux-user.mak b/default-configs/devices= /sparc-linux-user.mak similarity index 100% rename from default-configs/sparc-linux-user.mak rename to default-configs/devices/sparc-linux-user.mak diff --git a/default-configs/sparc-softmmu.mak b/default-configs/devices/sp= arc-softmmu.mak similarity index 100% rename from default-configs/sparc-softmmu.mak rename to default-configs/devices/sparc-softmmu.mak diff --git a/default-configs/sparc32plus-linux-user.mak b/default-configs/d= evices/sparc32plus-linux-user.mak similarity index 100% rename from default-configs/sparc32plus-linux-user.mak rename to default-configs/devices/sparc32plus-linux-user.mak diff --git a/default-configs/sparc64-bsd-user.mak b/default-configs/devices= /sparc64-bsd-user.mak similarity index 100% rename from default-configs/sparc64-bsd-user.mak rename to default-configs/devices/sparc64-bsd-user.mak diff --git a/default-configs/sparc64-linux-user.mak b/default-configs/devic= es/sparc64-linux-user.mak similarity index 100% rename from default-configs/sparc64-linux-user.mak rename to default-configs/devices/sparc64-linux-user.mak diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/devices/= sparc64-softmmu.mak similarity index 100% rename from default-configs/sparc64-softmmu.mak rename to default-configs/devices/sparc64-softmmu.mak diff --git a/default-configs/tilegx-linux-user.mak b/default-configs/device= s/tilegx-linux-user.mak similarity index 100% rename from default-configs/tilegx-linux-user.mak rename to default-configs/devices/tilegx-linux-user.mak diff --git a/default-configs/tricore-softmmu.mak b/default-configs/devices/= tricore-softmmu.mak similarity index 100% rename from default-configs/tricore-softmmu.mak rename to default-configs/devices/tricore-softmmu.mak diff --git a/default-configs/unicore32-softmmu.mak b/default-configs/device= s/unicore32-softmmu.mak similarity index 100% rename from default-configs/unicore32-softmmu.mak rename to default-configs/devices/unicore32-softmmu.mak diff --git a/default-configs/x86_64-bsd-user.mak b/default-configs/devices/= x86_64-bsd-user.mak similarity index 100% rename from default-configs/x86_64-bsd-user.mak rename to default-configs/devices/x86_64-bsd-user.mak diff --git a/default-configs/x86_64-linux-user.mak b/default-configs/device= s/x86_64-linux-user.mak similarity index 100% rename from default-configs/x86_64-linux-user.mak rename to default-configs/devices/x86_64-linux-user.mak diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/devices/x= 86_64-softmmu.mak similarity index 100% rename from default-configs/x86_64-softmmu.mak rename to default-configs/devices/x86_64-softmmu.mak diff --git a/default-configs/xtensa-linux-user.mak b/default-configs/device= s/xtensa-linux-user.mak similarity index 100% rename from default-configs/xtensa-linux-user.mak rename to default-configs/devices/xtensa-linux-user.mak diff --git a/default-configs/xtensa-softmmu.mak b/default-configs/devices/x= tensa-softmmu.mak similarity index 100% rename from default-configs/xtensa-softmmu.mak rename to default-configs/devices/xtensa-softmmu.mak diff --git a/default-configs/xtensaeb-linux-user.mak b/default-configs/devi= ces/xtensaeb-linux-user.mak similarity index 100% rename from default-configs/xtensaeb-linux-user.mak rename to default-configs/devices/xtensaeb-linux-user.mak diff --git a/default-configs/xtensaeb-softmmu.mak b/default-configs/devices= /xtensaeb-softmmu.mak similarity index 100% rename from default-configs/xtensaeb-softmmu.mak rename to default-configs/devices/xtensaeb-softmmu.mak diff --git a/meson.build b/meson.build index 4d6ef64adf..a12ad1fbff 100644 --- a/meson.build +++ b/meson.build @@ -699,7 +699,7 @@ foreach target : target_dirs =20 config_devices_mak =3D target + '-config-devices.mak' config_devices_mak =3D configure_file( - input: ['default-configs' / target + '.mak', 'Kconfig'], + input: ['default-configs/devices' / target + '.mak', 'Kconfig'], output: config_devices_mak, depfile: config_devices_mak + '.d', capture: true, --=20 2.26.2 From nobody Sun Nov 16 12:30:53 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=1600607403; cv=none; d=zohomail.com; s=zohoarc; b=iZOtfg6jJLTMRQeuC7SHdfyxIvBHmHzn1xbHUnXrW2zjEkRPgQ+osSyVipipiAeVjmaxzGYf60r3Xkvxcoye2Ip8UGZfNp5iAw5isubXNLR7r+VGABXhLKvQV5A00lYWGlqe8AToYq8cmiBmAf6Wmrujq7mF6eb1cBrHbg0NKic= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600607403; 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=WbGmsHGZz6bepiYgFYe4nZNm0yNXPsiaVozzOfjidtk=; b=TVeQHafGV1wtmzSJh8jV8eAtZuMomqw+cakW1poeTOGb+QnzXZmQh1A8/onrIqigoo7eE9cZ7Pq+82KZ5GjZWV/KvXQ2emJDdEeZ9Ro7HR/mPnbVpr6siFs40ViqoMgdW9OEumixYuSfbioTu+XsoFxKk3pfz0uTsEW7S19suiA= 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 1600607403626580.1262281062255; Sun, 20 Sep 2020 06:10:03 -0700 (PDT) Received: from localhost ([::1]:35450 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJz6Q-0000Ny-8j for importer@patchew.org; Sun, 20 Sep 2020 09:10:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60090) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJz3p-00068o-9f for qemu-devel@nongnu.org; Sun, 20 Sep 2020 09:07:21 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:41744) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kJz3k-00017U-D2 for qemu-devel@nongnu.org; Sun, 20 Sep 2020 09:07:20 -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-594-GnKWejeAOTaGuGIK5pxZVQ-1; Sun, 20 Sep 2020 09:07:10 -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 151EB801ADB for ; Sun, 20 Sep 2020 13:07:10 +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 D749160C47 for ; Sun, 20 Sep 2020 13:07:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600607232; 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=WbGmsHGZz6bepiYgFYe4nZNm0yNXPsiaVozzOfjidtk=; b=ec7vF8MTZ8jD3udxPm8D4QdL0+nY2WAARiS8fCW3kF9NqTZsp/6kfHo3tRitATHZ0Atro/ D7bhQi0SQJQafVeB2WR7+tht6+dCI3I8LnbwNRE2J7bI7EyQMAQAZHKxBrdEWWDuOesovy uz0fu8SOUXJUlRDu8lJRocePbG6FmH8= X-MC-Unique: GnKWejeAOTaGuGIK5pxZVQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 2/9] configure: convert accelerator variables to meson options Date: Sun, 20 Sep 2020 09:07:01 -0400 Message-Id: <20200920130708.1156310-3-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=63.128.21.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/20 07:54:59 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -45 X-Spam_score: -4.6 X-Spam_bar: ---- X-Spam_report: (-4.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_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, 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" Prepare for moving the tests to meson. For now they only have enabled/disabled as the possible values when meson is invoked, but "auto" will be a possibility later, when configure will only parse the command line options. Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson --- configure | 132 +++++++++++++++++++++++----------------------- meson_options.txt | 15 ++++++ 2 files changed, 82 insertions(+), 65 deletions(-) diff --git a/configure b/configure index bf55c24557..ade456b7af 100755 --- a/configure +++ b/configure @@ -221,7 +221,7 @@ glob() { } =20 supported_hax_target() { - test "$hax" =3D "yes" || return 1 + test "$hax" =3D "enabled" || return 1 glob "$1" "*-softmmu" || return 1 case "${1%-softmmu}" in i386|x86_64) @@ -232,7 +232,7 @@ supported_hax_target() { } =20 supported_kvm_target() { - test "$kvm" =3D "yes" || return 1 + test "$kvm" =3D "enabled" || return 1 glob "$1" "*-softmmu" || return 1 case "${1%-softmmu}:$cpu" in aarch64:aarch64 | \ @@ -248,7 +248,7 @@ supported_kvm_target() { } =20 supported_xen_target() { - test "$xen" =3D "yes" || return 1 + test "$xen" =3D "enabled" || return 1 glob "$1" "*-softmmu" || return 1 # Only i386 and x86_64 provide the xenpv machine. case "${1%-softmmu}" in @@ -260,7 +260,7 @@ supported_xen_target() { } =20 supported_hvf_target() { - test "$hvf" =3D "yes" || return 1 + test "$hvf" =3D "enabled" || return 1 glob "$1" "*-softmmu" || return 1 case "${1%-softmmu}" in x86_64) @@ -271,7 +271,7 @@ supported_hvf_target() { } =20 supported_whpx_target() { - test "$whpx" =3D "yes" || return 1 + test "$whpx" =3D "enabled" || return 1 glob "$1" "*-softmmu" || return 1 case "${1%-softmmu}" in i386|x86_64) @@ -302,7 +302,7 @@ supported_target() { return 1 ;; esac - test "$tcg" =3D "yes" && return 0 + test "$tcg" =3D "enabled" && return 0 supported_kvm_target "$1" && return 0 supported_xen_target "$1" && return 0 supported_hax_target "$1" && return 0 @@ -405,14 +405,14 @@ vnc_png=3D"auto" xkbcommon=3D"auto" xen=3D"" xen_ctrl_version=3D"" -xen_pci_passthrough=3D"" +xen_pci_passthrough=3D"auto" linux_aio=3D"" linux_io_uring=3D"" cap_ng=3D"" attr=3D"" libattr=3D"" xfs=3D"" -tcg=3D"yes" +tcg=3D"enabled" membarrier=3D"" vhost_net=3D"" vhost_crypto=3D"" @@ -420,10 +420,10 @@ vhost_scsi=3D"" vhost_vsock=3D"" vhost_user=3D"" vhost_user_fs=3D"" -kvm=3D"no" -hax=3D"no" -hvf=3D"no" -whpx=3D"no" +kvm=3D"disabled" +hax=3D"disabled" +hvf=3D"disabled" +whpx=3D"disabled" rdma=3D"" pvrdma=3D"" gprof=3D"no" @@ -814,8 +814,8 @@ HOST_VARIANT_DIR=3D"" case $targetos in MINGW32*) mingw32=3D"yes" - hax=3D"yes" - whpx=3D"" + hax=3D"enabled" + whpx=3D"auto" vhost_user=3D"no" audio_possible_drivers=3D"dsound sdl" if check_include dsound.h; then @@ -849,7 +849,7 @@ DragonFly) ;; NetBSD) bsd=3D"yes" - hax=3D"yes" + hax=3D"enabled" make=3D"${MAKE-gmake}" audio_drv_list=3D"oss try-sdl" audio_possible_drivers=3D"oss sdl" @@ -866,8 +866,8 @@ OpenBSD) Darwin) bsd=3D"yes" darwin=3D"yes" - hax=3D"yes" - hvf=3D"" + hax=3D"enabled" + hvf=3D"auto" if [ "$cpu" =3D "x86_64" ] ; then QEMU_CFLAGS=3D"-arch x86_64 $QEMU_CFLAGS" QEMU_LDFLAGS=3D"-arch x86_64 $QEMU_LDFLAGS" @@ -903,7 +903,7 @@ Linux) audio_possible_drivers=3D"oss alsa sdl pa" linux=3D"yes" linux_user=3D"yes" - kvm=3D"yes" + kvm=3D"enabled" QEMU_INCLUDES=3D"-isystem ${source_path}/linux-headers -Ilinux-headers $= QEMU_INCLUDES" ;; esac @@ -1185,33 +1185,33 @@ for opt do ;; --enable-netmap) netmap=3D"yes" ;; - --disable-xen) xen=3D"no" + --disable-xen) xen=3D"disabled" ;; - --enable-xen) xen=3D"yes" + --enable-xen) xen=3D"enabled" ;; - --disable-xen-pci-passthrough) xen_pci_passthrough=3D"no" + --disable-xen-pci-passthrough) xen_pci_passthrough=3D"disabled" ;; - --enable-xen-pci-passthrough) xen_pci_passthrough=3D"yes" + --enable-xen-pci-passthrough) xen_pci_passthrough=3D"enabled" ;; --disable-brlapi) brlapi=3D"no" ;; --enable-brlapi) brlapi=3D"yes" ;; - --disable-kvm) kvm=3D"no" + --disable-kvm) kvm=3D"disabled" ;; - --enable-kvm) kvm=3D"yes" + --enable-kvm) kvm=3D"enabled" ;; - --disable-hax) hax=3D"no" + --disable-hax) hax=3D"disabled" ;; - --enable-hax) hax=3D"yes" + --enable-hax) hax=3D"enabled" ;; - --disable-hvf) hvf=3D"no" + --disable-hvf) hvf=3D"disabled" ;; - --enable-hvf) hvf=3D"yes" + --enable-hvf) hvf=3D"enabled" ;; - --disable-whpx) whpx=3D"no" + --disable-whpx) whpx=3D"disabled" ;; - --enable-whpx) whpx=3D"yes" + --enable-whpx) whpx=3D"enabled" ;; --disable-tcg-interpreter) tcg_interpreter=3D"no" ;; @@ -1221,9 +1221,9 @@ for opt do ;; --enable-cap-ng) cap_ng=3D"yes" ;; - --disable-tcg) tcg=3D"no" + --disable-tcg) tcg=3D"disabled" ;; - --enable-tcg) tcg=3D"yes" + --enable-tcg) tcg=3D"enabled" ;; --disable-malloc-trim) malloc_trim=3D"disabled" ;; @@ -1708,7 +1708,7 @@ if [ "$ARCH" =3D "unknown" ]; then fi =20 if [ "$bsd_user" =3D "no" -a "$linux_user" =3D "no" -a "$softmmu" =3D "no"= ] ; then - tcg=3D"no" + tcg=3D"disabled" fi =20 default_target_list=3D"" @@ -2667,7 +2667,7 @@ fi ########################################## # xen probe =20 -if test "$xen" !=3D "no" ; then +if test "$xen" !=3D "disabled" ; then # Check whether Xen library path is specified via --extra-ldflags to avo= id # overriding this setting with pkg-config output. If not, try pkg-config # to obtain all needed flags. @@ -2676,7 +2676,7 @@ if test "$xen" !=3D "no" ; then $pkg_config --exists xencontrol ; then xen_ctrl_version=3D"$(printf '%d%02d%02d' \ $($pkg_config --modversion xencontrol | sed 's/\./ /g') )" - xen=3Dyes + xen=3Denabled xen_pc=3D"xencontrol xenstore xenguest xenforeignmemory xengnttab" xen_pc=3D"$xen_pc xenevtchn xendevicemodel" if $pkg_config --exists xentoolcore; then @@ -2702,10 +2702,10 @@ int main(void) { EOF if ! compile_prog "" "$xen_libs" ; then # Xen not found - if test "$xen" =3D "yes" ; then + if test "$xen" =3D "enabled" ; then feature_not_found "xen" "Install xen devel" fi - xen=3Dno + xen=3Ddisabled =20 # Xen unstable elif @@ -2731,7 +2731,7 @@ EOF then xen_stable_libs=3D"-lxendevicemodel $xen_stable_libs -lxentoolcore" xen_ctrl_version=3D41100 - xen=3Dyes + xen=3Denabled elif cat > $TMPC < $TMPC < $TMPC < $TMPC < $TMPC < $TMPC << EOF #include int main() { return 0;} EOF if ! compile_object ""; then - if test "$hvf" =3D "yes"; then + if test "$hvf" =3D "enabled"; then error_exit "Hypervisor.framework not available" fi - hvf=3D'no' + hvf=3D'disabled' else - hvf=3D'yes' + hvf=3D'enabled' fi fi =20 @@ -6202,7 +6202,7 @@ if test "$mingw32" =3D "yes" ; then fi =20 # Disable OpenBSD W^X if available -if test "$tcg" =3D "yes" && test "$targetos" =3D "OpenBSD"; then +if test "$tcg" =3D "enabled" && test "$targetos" =3D "OpenBSD"; then cat > $TMPC <> $config_host_mak echo "VIRGL_LIBS=3D$virgl_libs" >> $config_host_mak fi -if test "$xen" =3D "yes" ; then +if test "$xen" =3D "enabled" ; then echo "CONFIG_XEN_BACKEND=3Dy" >> $config_host_mak echo "CONFIG_XEN_CTRL_INTERFACE_VERSION=3D$xen_ctrl_version" >> $config_= host_mak echo "XEN_CFLAGS=3D$xen_cflags" >> $config_host_mak @@ -6833,7 +6833,7 @@ fi if test "$optreset" =3D "yes" ; then echo "HAVE_OPTRESET=3Dy" >> $config_host_mak fi -if test "$tcg" =3D "yes"; then +if test "$tcg" =3D "enabled"; then echo "CONFIG_TCG=3Dy" >> $config_host_mak if test "$tcg_interpreter" =3D "yes" ; then echo "CONFIG_TCG_INTERPRETER=3Dy" >> $config_host_mak @@ -7619,7 +7619,7 @@ fi =20 if supported_xen_target $target; then echo "CONFIG_XEN=3Dy" >> $config_target_mak - if test "$xen_pci_passthrough" =3D yes; then + if test "$xen_pci_passthrough" =3D enabled; then echo "CONFIG_XEN_PCI_PASSTHROUGH=3Dy" >> "$config_target_mak" fi fi @@ -7862,6 +7862,8 @@ NINJA=3D${ninja:-$PWD/ninjatool} $meson setup \ -Db_staticpic=3D$(if test "$pie" =3D yes; then echo true; else ech= o false; fi) \ -Db_coverage=3D$(if test "$gcov" =3D yes; then echo true; else ech= o false; fi) \ -Dmalloc=3D$malloc -Dmalloc_trim=3D$malloc_trim \ + -Dkvm=3D$kvm -Dhax=3D$hax -Dwhpx=3D$whpx -Dhvf=3D$hvf \ + -Dxen=3D$xen -Dxen_pci_passthrough=3D$xen_pci_passthrough -Dtcg=3D$tcg \ -Dcocoa=3D$cocoa -Dmpath=3D$mpath -Dsdl=3D$sdl -Dsdl_image=3D$sdl_image \ -Dvnc=3D$vnc -Dvnc_sasl=3D$vnc_sasl -Dvnc_jpeg=3D$vnc_jpeg -Dvnc_png=3D$v= nc_png \ -Dgettext=3D$gettext -Dxkbcommon=3D$xkbcommon -Du2f=3D$u2f\ diff --git a/meson_options.txt b/meson_options.txt index 46ea1d889a..05adc7a179 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -11,6 +11,21 @@ option('malloc_trim', type : 'feature', value : 'auto', option('malloc', type : 'combo', choices : ['system', 'tcmalloc', 'jemallo= c'], value: 'system', description: 'choose memory allocator to use') =20 +option('kvm', type: 'feature', value: 'auto', + description: 'KVM acceleration support') +option('hax', type: 'feature', value: 'auto', + description: 'HAX acceleration support') +option('whpx', type: 'feature', value: 'auto', + description: 'WHPX acceleration support') +option('hvf', type: 'feature', value: 'auto', + description: 'HVF acceleration support') +option('xen', type: 'feature', value: 'auto', + description: 'Xen backend support') +option('xen_pci_passthrough', type: 'feature', value: 'auto', + description: 'Xen PCI passthrough support') +option('tcg', type: 'feature', value: 'auto', + description: 'TCG support') + option('cocoa', type : 'feature', value : 'auto', description: 'Cocoa user interface (macOS only)') option('mpath', type : 'feature', value : 'auto', --=20 2.26.2 From nobody Sun Nov 16 12:30:53 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=1600607550; cv=none; d=zohomail.com; s=zohoarc; b=doO+U637igd5EiyBe13pkyoKjVkLkjMWAPbCLksUM1gu7ziIRgNdfUZrf3PoTB/dBVQnhlPvFMQ/MQSAzJ91Gc5qHnJA5VLKOg2i69bfI7rFotev2EZj9cPZ7r/KWl4TwKYXUHhiFGHi/83yT6p9hUAAsebsRN+4MIOoQSQ1e8I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600607550; 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=koaF4vwiRiino+Myf2s8wiU10e0a3K3aFmR+6h0MKKE=; b=ZucCUTgxU0EtImb0Dnuyfb/i4Cfu72p6SlLiaJ01lP1C7cxwtReeS3VhnVtox5FdfEwNFGS5NpmqdLsWAmZ+oo+xXu/aQ5WGXUQllxqvIwYMHFo3VrfmtQ50q8g6kV4xeFFQrx1Pnmvl06K2McSL+VGk7QKMSGXOdCJJ+2mvIe4= 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 1600607550951744.4329386420607; Sun, 20 Sep 2020 06:12:30 -0700 (PDT) Received: from localhost ([::1]:41502 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJz8n-0002ye-Lk for importer@patchew.org; Sun, 20 Sep 2020 09:12:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60096) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJz3p-00069Q-Nc for qemu-devel@nongnu.org; Sun, 20 Sep 2020 09:07:21 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:58739 helo=us-smtp-delivery-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-00017W-IE for qemu-devel@nongnu.org; Sun, 20 Sep 2020 09:07:21 -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-292--buYI9DbMEe7b07riSuL2Q-1; Sun, 20 Sep 2020 09:07:11 -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 6011556B56 for ; Sun, 20 Sep 2020 13:07:10 +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 2F03160C47 for ; Sun, 20 Sep 2020 13:07:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600607233; 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=koaF4vwiRiino+Myf2s8wiU10e0a3K3aFmR+6h0MKKE=; b=dsQMx7aQRj/o8qOIJeN6IZ78lRDoHZ4xsIjRAtXGNUZqDaPCcIs7riVQxnXHjxizwBTXge IuHBC+qkBkWm5OmZNzXpWd7IPXFZcrB9KUZZ13ldJLi8IjMyKrhDwtifR/UVYEr5dMQHrA o5BUECM4U7AXFNkm+AcQU2ceHQHhVtw= X-MC-Unique: -buYI9DbMEe7b07riSuL2Q-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 3/9] configure: rewrite accelerator defaults as tests Date: Sun, 20 Sep 2020 09:07:02 -0400 Message-Id: <20200920130708.1156310-4-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.61; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/20 09:07:13 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" Prepare to process "auto" in meson rather than configure: localize the code that changes "auto" to enabled/disabled, it will be moved to meson and removed from configure. Signed-off-by: Paolo Bonzini --- configure | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/configure b/configure index ade456b7af..00348c2342 100755 --- a/configure +++ b/configure @@ -420,7 +420,7 @@ vhost_scsi=3D"" vhost_vsock=3D"" vhost_user=3D"" vhost_user_fs=3D"" -kvm=3D"disabled" +kvm=3D"auto" hax=3D"disabled" hvf=3D"disabled" whpx=3D"disabled" @@ -814,7 +814,6 @@ HOST_VARIANT_DIR=3D"" case $targetos in MINGW32*) mingw32=3D"yes" - hax=3D"enabled" whpx=3D"auto" vhost_user=3D"no" audio_possible_drivers=3D"dsound sdl" @@ -849,7 +848,6 @@ DragonFly) ;; NetBSD) bsd=3D"yes" - hax=3D"enabled" make=3D"${MAKE-gmake}" audio_drv_list=3D"oss try-sdl" audio_possible_drivers=3D"oss sdl" @@ -866,7 +864,6 @@ OpenBSD) Darwin) bsd=3D"yes" darwin=3D"yes" - hax=3D"enabled" hvf=3D"auto" if [ "$cpu" =3D "x86_64" ] ; then QEMU_CFLAGS=3D"-arch x86_64 $QEMU_CFLAGS" @@ -903,7 +900,6 @@ Linux) audio_possible_drivers=3D"oss alsa sdl pa" linux=3D"yes" linux_user=3D"yes" - kvm=3D"enabled" QEMU_INCLUDES=3D"-isystem ${source_path}/linux-headers -Ilinux-headers $= QEMU_INCLUDES" ;; esac @@ -2664,6 +2660,28 @@ if test "$seccomp" !=3D "no" ; then seccomp=3D"no" fi fi + +########################################## +# 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 --=20 2.26.2 From nobody Sun Nov 16 12:30:53 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=1600607859; cv=none; d=zohomail.com; s=zohoarc; b=GaXuHo8t/a4UPWzyKNMf+SUxQbg/1QVUXMVr1Z6Hf+uy9lj5p6ncmdA5JSQldOk3BxUdU3yrXVSeRVhNa/64MQONp5tUkxfXI3vWknN8W7YSkf5f8OLHsNDD41TZ1pFa3QRqwoV+SuyA531fsfHhfDQi3gyGleqxTNBhcqUW7iQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600607859; 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=nMcvdfqtOEgYHKIYCXXhjbXmnQPG05HL43eMK6zTKHg=; b=hH6uv537vOKesv2kWn+Tmozu90PMuSLtex+cQnNQ0lFdSCKLhO4Cy8eqTIoLpA1hZYn6aSKqZ0BcAFqdEKq2wX3Z5wlUIut4guHi71QmY/zMfEF+sP1/hzr72n3l/rOEbdx6J8YrePEBEs1/Ev1sgiNJO6QYI8qSKMM+EGNYzHA= 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 1600607859163167.6050887580036; Sun, 20 Sep 2020 06:17:39 -0700 (PDT) Received: from localhost ([::1]:49890 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJzDl-0006cu-Ux for importer@patchew.org; Sun, 20 Sep 2020 09:17:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60144) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJz3x-0006Dv-Om for qemu-devel@nongnu.org; Sun, 20 Sep 2020 09:07:29 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:48164) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kJz3k-00017z-GA for qemu-devel@nongnu.org; Sun, 20 Sep 2020 09:07:28 -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-16-pcbwSmyaMFmbkQFPCRO2Ng-1; Sun, 20 Sep 2020 09:07:11 -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 ABA3A186DD3E for ; Sun, 20 Sep 2020 13:07:10 +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 7A441610F3 for ; Sun, 20 Sep 2020 13:07:10 +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=nMcvdfqtOEgYHKIYCXXhjbXmnQPG05HL43eMK6zTKHg=; b=IeusRG+sCoH2F3sXMgXhVIi9hd0JRDT+N3UQG7cHv6Lno1wharTMJsQLbVsUnJ15WR5VND 64ym4VNlSpRxBjfDByaPvDjeHa3mBr4shM64Wc2DVLsCv/bQRAhb0TEISOMUzRLT3OP1YP J2jC1d81mj3O3MVNghyDxhoeK8yTUcc= X-MC-Unique: pcbwSmyaMFmbkQFPCRO2Ng-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 4/9] configure: move accelerator logic to meson Date: Sun, 20 Sep 2020 09:07:03 -0400 Message-Id: <20200920130708.1156310-5-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=63.128.21.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/20 07:54:59 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -45 X-Spam_score: -4.6 X-Spam_bar: ---- X-Spam_report: (-4.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_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, 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" Move to meson the code to detect the presence of accelerators, and to define accelerator-specific config-target.h symbols. The logic for now is duplicated in configure because it is still in use to build the list of targets (which is in turn used to create the config-target.mak files). The next patches remove it. Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson --- configure | 19 ---------- meson.build | 104 ++++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 89 insertions(+), 34 deletions(-) diff --git a/configure b/configure index 00348c2342..ee5c4da54b 100755 --- a/configure +++ b/configure @@ -6852,7 +6852,6 @@ if test "$optreset" =3D "yes" ; then echo "HAVE_OPTRESET=3Dy" >> $config_host_mak fi if test "$tcg" =3D "enabled"; then - echo "CONFIG_TCG=3Dy" >> $config_host_mak if test "$tcg_interpreter" =3D "yes" ; then echo "CONFIG_TCG_INTERPRETER=3Dy" >> $config_host_mak fi @@ -7635,24 +7634,6 @@ if [ "$TARGET_SYSTBL_ABI" !=3D "" ]; then echo "TARGET_SYSTBL=3D$TARGET_SYSTBL" >> $config_target_mak fi =20 -if supported_xen_target $target; then - echo "CONFIG_XEN=3Dy" >> $config_target_mak - if test "$xen_pci_passthrough" =3D enabled; then - echo "CONFIG_XEN_PCI_PASSTHROUGH=3Dy" >> "$config_target_mak" - fi -fi -if supported_kvm_target $target; then - echo "CONFIG_KVM=3Dy" >> $config_target_mak -fi -if supported_hax_target $target; then - echo "CONFIG_HAX=3Dy" >> $config_target_mak -fi -if supported_hvf_target $target; then - echo "CONFIG_HVF=3Dy" >> $config_target_mak -fi -if supported_whpx_target $target; then - echo "CONFIG_WHPX=3Dy" >> $config_target_mak -fi if test "$target_aligned_only" =3D "yes" ; then echo "TARGET_ALIGNED_ONLY=3Dy" >> $config_target_mak fi diff --git a/meson.build b/meson.build index a12ad1fbff..7a5eced5f0 100644 --- a/meson.build +++ b/meson.build @@ -50,6 +50,28 @@ configure_file(input: files('scripts/ninjatool.py'), output: 'ninjatool', configuration: config_host) =20 +if cpu in ['x86', 'x86_64'] + kvm_targets =3D ['i386-softmmu', 'x86_64-softmmu'] +elif cpu =3D=3D 'aarch64' + kvm_targets =3D ['aarch64-softmmu'] +elif cpu =3D=3D 's390x' + kvm_targets =3D ['s390x-softmmu'] +elif cpu in ['ppc', 'ppc64'] + kvm_targets =3D ['ppc-softmmu', 'ppc64-softmmu'] +else + kvm_targets =3D [] +endif + +accelerator_targets =3D { 'CONFIG_KVM': kvm_targets } +if cpu in ['x86', 'x86_64'] + accelerator_targets +=3D { + 'CONFIG_HAX': ['i386-softmmu', 'x86_64-softmmu'], + 'CONFIG_XEN': ['i386-softmmu', 'x86_64-softmmu'], + 'CONFIG_HVF': ['x86_64-softmmu'], + 'CONFIG_WHPX': ['i386-softmmu', 'x86_64-softmmu'], + } +endif + ################## # Compiler flags # ################## @@ -102,7 +124,7 @@ version_res =3D [] coref =3D [] iokit =3D [] cocoa =3D not_found -hvf =3D [] +hvf =3D not_found if targetos =3D=3D 'windows' socket =3D cc.find_library('ws2_32') winmm =3D cc.find_library('winmm') @@ -115,7 +137,6 @@ elif targetos =3D=3D 'darwin' coref =3D dependency('appleframeworks', modules: 'CoreFoundation') iokit =3D dependency('appleframeworks', modules: 'IOKit') cocoa =3D dependency('appleframeworks', modules: 'Cocoa', required: get_= option('cocoa')) - hvf =3D dependency('appleframeworks', modules: 'Hypervisor') elif targetos =3D=3D 'sunos' socket =3D [cc.find_library('socket'), cc.find_library('nsl'), @@ -126,6 +147,59 @@ elif targetos =3D=3D 'haiku' cc.find_library('bsd')] endif =20 +accelerators =3D [] +if not get_option('kvm').disabled() and targetos =3D=3D 'linux' + accelerators +=3D 'CONFIG_KVM' +endif +if not get_option('xen').disabled() and 'CONFIG_XEN_BACKEND' in config_host + accelerators +=3D 'CONFIG_XEN' + have_xen_pci_passthrough =3D not get_option('xen_pci_passthrough').disab= led() and targetos =3D=3D 'linux' +else + have_xen_pci_passthrough =3D false +endif +if not get_option('whpx').disabled() and targetos =3D=3D 'windows' + if get_option('whpx').enabled() and cpu !=3D 'x86_64' + error('WHPX requires 64-bit host') + elif cc.has_header('WinHvPlatform.h', required: get_option('whpx')) and \ + cc.has_header('WinHvEmulation.h', required: get_option('whpx')) + accelerators +=3D 'CONFIG_WHPX' + endif +endif +if not get_option('hvf').disabled() + hvf =3D dependency('appleframeworks', modules: 'Hypervisor', + required: get_option('hvf')) + if hvf.found() + accelerators +=3D 'CONFIG_HVF' + endif +endif +if not get_option('hax').disabled() + if get_option('hax').enabled() or targetos in ['windows', 'darwin', 'net= bsd'] + accelerators +=3D 'CONFIG_HAX' + endif +endif +if not get_option('tcg').disabled() + if cpu not in supported_cpus + if 'CONFIG_TCG_INTERPRETER' in config_host + warning('Unsupported CPU @0@, will use TCG with TCI (experimental)'.= format(cpu)) + else + error('Unsupported CPU @0@, try --enable-tcg-interpreter'.format(cpu= )) + endif + endif + accelerators +=3D 'CONFIG_TCG' +endif + +if 'CONFIG_KVM' not in accelerators and get_option('kvm').enabled() + error('KVM not available on this platform') +endif +if 'CONFIG_HVF' not in accelerators and get_option('hvf').enabled() + error('HVF not available on this platform') +endif +if 'CONFIG_WHPX' not in accelerators and get_option('whpx').enabled() + error('WHPX not available on this platform') +endif +if not have_xen_pci_passthrough and get_option('xen_pci_passthrough').enab= led() + error('Xen PCI passthrough not available on this platform') +endif if not cocoa.found() and get_option('cocoa').enabled() error('Cocoa not available on this platform') endif @@ -645,17 +719,22 @@ kconfig_external_symbols =3D [ ] ignored =3D ['TARGET_XML_FILES', 'TARGET_ABI_DIR', 'TARGET_DIRS'] =20 -accel_symbols =3D [ - 'CONFIG_KVM', - 'CONFIG_HAX', - 'CONFIG_HVF', - 'CONFIG_TCG', - 'CONFIG_WHPX' -] - foreach target : target_dirs config_target =3D keyval.load(meson.current_build_dir() / target / 'conf= ig-target.mak') =20 + have_accel =3D false + foreach sym: accelerators + if sym =3D=3D 'CONFIG_TCG' or target in accelerator_targets[sym] + config_target +=3D { sym: 'y' } + config_all +=3D { sym: 'y' } + if sym =3D=3D 'CONFIG_XEN' and have_xen_pci_passthrough + config_target +=3D { 'CONFIG_XEN_PCI_PASSTHROUGH': 'y' } + endif + endif + have_accel =3D true + endforeach + assert(have_accel) + foreach k, v: disassemblers if config_host['ARCH'].startswith(k) or config_target['TARGET_BASE_ARC= H'].startswith(k) foreach sym: v @@ -681,11 +760,6 @@ foreach target : target_dirs config_target_data.set(k, v) endif endforeach - foreach sym: accel_symbols - if config_target.has_key(sym) - config_all +=3D { sym: 'y' } - endif - endforeach config_target_h +=3D {target: configure_file(output: target + '-config-t= arget.h', configuration: config_targe= t_data)} =20 --=20 2.26.2 From nobody Sun Nov 16 12:30:53 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=1600607364; cv=none; d=zohomail.com; s=zohoarc; b=m0n4+u5xplCnmsgjktwl9YeHH6u7wHM3LoCTHj7HNspmtPJ8RoXp4rYedn/IRYL7TNuoKKJ4fhUdj5JK762oi8qz3AjWZrTwk+47o2tqHUHI0teyn0M65YGqWqdeQTdY6wlzHItcGktSg1oeDSK4o6YqYcl8DtNBe81Hayc5OLo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600607364; 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=UHOXeaaNH7mO2Pxxop/1n3qru7dlsdRVvl4+1v0LLIU=; b=nv3KhWY5vu0JQUcIIi9Jv4dcSZvEKOvvqh/XBGqMnZC8NZlq0HIlhoSoyewFYWJyKLSfiNtgaP8u+1V9wBo+XVbZo18l0g7/9uq8J/oWWB3KFml1/sOlhSHP9Q6I+Co3b/ddJxnczfqX0Lk1D5aYo+dSp4eVMY+mCmwsAv/Z6hU= 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 1600607364235601.0322631295303; Sun, 20 Sep 2020 06:09:24 -0700 (PDT) Received: from localhost ([::1]:32874 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJz5m-0007kc-2r for importer@patchew.org; Sun, 20 Sep 2020 09:09:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60056) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJz3o-00067o-Dn for qemu-devel@nongnu.org; Sun, 20 Sep 2020 09:07:20 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:49677) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kJz3k-00017d-DG for qemu-devel@nongnu.org; Sun, 20 Sep 2020 09:07:19 -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-48-YPqjf2sDMFW4SFBrxa5Lgw-1; Sun, 20 Sep 2020 09:07:11 -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 053608030B8 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 C620161983 for ; Sun, 20 Sep 2020 13:07:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600607233; 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=UHOXeaaNH7mO2Pxxop/1n3qru7dlsdRVvl4+1v0LLIU=; b=h4ZCTnCscv+bMuQStmWXq8KNAypanxcF1/bt7h+YtMhe2fTQK3SJELuXJHscGe+gKfrw6B ySL4LuMsd07TFhoeCdA1h5b9JDIOu+dHL6osvK01donyJL/qJVTfBnEMRvtNQX5bIG3/63 eMirA7GEFQJmXJlFJZT+uLAAd1JmMAY= X-MC-Unique: YPqjf2sDMFW4SFBrxa5Lgw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 5/9] configure: remove dead variable Date: Sun, 20 Sep 2020 09:07:04 -0400 Message-Id: <20200920130708.1156310-6-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=63.128.21.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/20 07:54:59 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -45 X-Spam_score: -4.6 X-Spam_bar: ---- X-Spam_report: (-4.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_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, 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" Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson --- configure | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/configure b/configure index ee5c4da54b..df3b031b1c 100755 --- a/configure +++ b/configure @@ -808,9 +808,6 @@ fi =20 # OS specific =20 -# host *BSD for user mode -HOST_VARIANT_DIR=3D"" - case $targetos in MINGW32*) mingw32=3D"yes" @@ -837,14 +834,12 @@ FreeBSD) audio_possible_drivers=3D"oss sdl pa" # needed for kinfo_getvmmap(3) in libutil.h netmap=3D"" # enable netmap autodetect - HOST_VARIANT_DIR=3D"freebsd" ;; DragonFly) bsd=3D"yes" make=3D"${MAKE-gmake}" audio_drv_list=3D"oss try-sdl" audio_possible_drivers=3D"oss sdl pa" - HOST_VARIANT_DIR=3D"dragonfly" ;; NetBSD) bsd=3D"yes" @@ -852,14 +847,12 @@ NetBSD) audio_drv_list=3D"oss try-sdl" audio_possible_drivers=3D"oss sdl" oss_lib=3D"-lossaudio" - HOST_VARIANT_DIR=3D"netbsd" ;; OpenBSD) bsd=3D"yes" make=3D"${MAKE-gmake}" audio_drv_list=3D"try-sdl" audio_possible_drivers=3D"sdl" - HOST_VARIANT_DIR=3D"openbsd" ;; Darwin) bsd=3D"yes" @@ -876,7 +869,6 @@ Darwin) # Disable attempts to use ObjectiveC features in os/object.h since they # won't work when we're compiling with gcc as a C compiler. QEMU_CFLAGS=3D"-DOS_OBJECT_USE_OBJC=3D0 $QEMU_CFLAGS" - HOST_VARIANT_DIR=3D"darwin" ;; SunOS) solaris=3D"yes" @@ -7626,9 +7618,6 @@ 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 [ "$HOST_VARIANT_DIR" !=3D "" ]; then - echo "HOST_VARIANT_DIR=3D$HOST_VARIANT_DIR" >> $config_target_mak -fi 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 --=20 2.26.2 From nobody Sun Nov 16 12:30:53 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=1600607748; cv=none; d=zohomail.com; s=zohoarc; b=Mjuxnn8IUxTMjdZ3ddsPE0vf5ybRpI2YQN0IerRKTyR2fjaZsLBzDv4YBvDRltmQa6lXzEM2AsPue62iewwiomYbf3q/AUNXZ5Vmb+HlcCmxlLULuK7+BUzD+rNAJDpZ5xtme3JSOJEmvYVmkLlMC5fnGnYEbhCr0LfkccGelZo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600607748; 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=f4S4A0fo0iSnAxDrl2HyvBYPVZ7O12WHs5dRXT+y0/4=; b=BpkqOXEL3HQPITrp0IZQ4qmrCHKXM/kn7XAoHZtxsuuiTWti5if8IP9C5IuolkkFFcJYvXJTCjhayby0gYK4eE784dDrtRWFzdtJxurHveaLXZIocgkSOJqFIDtIJuJGXTaOJriTUE+BoHaEvyvmT3rCFdsJL03+E4nlJMdsqcI= 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 160060774818816.554618572868435; Sun, 20 Sep 2020 06:15:48 -0700 (PDT) Received: from localhost ([::1]:46130 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJzBy-0004vk-EH for importer@patchew.org; Sun, 20 Sep 2020 09:15:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60178) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJz42-0006Hk-7T for qemu-devel@nongnu.org; Sun, 20 Sep 2020 09:07:34 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:29055) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kJz3k-000188-Om for qemu-devel@nongnu.org; Sun, 20 Sep 2020 09:07:32 -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-104-hj3UFUcgOPSIXgwITR0_oQ-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 525778030BA 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 1F5BD60C84 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=1600607236; 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=f4S4A0fo0iSnAxDrl2HyvBYPVZ7O12WHs5dRXT+y0/4=; b=cKEzXChpLq/vEZTGn/XLL2oZ9NvAbemqdSOxWYw8v1jlfDl4EpIUA1Q4GFxx9vi5y8ltbq 2M/KlyTbhbm++kJc2tunCixuSME0JCwa3BkxgVQgIHeh8Xlzz9GiiaMUEMkyJsHF7DpYyd HSPyuf/DqRq/Z/6pXMntgIpfVgIFxLQ= X-MC-Unique: hj3UFUcgOPSIXgwITR0_oQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 6/9] configure: move CONFIG_* symbols to meson Date: Sun, 20 Sep 2020 09:07:05 -0400 Message-Id: <20200920130708.1156310-7-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=63.128.21.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/20 07:54:59 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -45 X-Spam_score: -4.6 X-Spam_bar: ---- X-Spam_report: (-4.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_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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" These symbols are easily computed from just the target name, so remove them from config-target.mak. Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson --- configure | 11 +---------- meson.build | 27 ++++++++++++++++++++++++--- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/configure b/configure index df3b031b1c..e64327e0f8 100755 --- a/configure +++ b/configure @@ -7612,7 +7612,6 @@ upper() { =20 target_arch_name=3D"$(upper $TARGET_ARCH)" echo "TARGET_$target_arch_name=3Dy" >> $config_target_mak -echo "TARGET_NAME=3D$target_name" >> $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 @@ -7630,21 +7629,15 @@ if test "$target_bigendian" =3D "yes" ; then echo "TARGET_WORDS_BIGENDIAN=3Dy" >> $config_target_mak fi if test "$target_softmmu" =3D "yes" ; then - echo "CONFIG_SOFTMMU=3Dy" >> $config_target_mak if test "$mttcg" =3D "yes" ; then echo "TARGET_SUPPORTS_MTTCG=3Dy" >> $config_target_mak fi fi if test "$target_user_only" =3D "yes" ; then - echo "CONFIG_USER_ONLY=3Dy" >> $config_target_mak - echo "CONFIG_QEMU_INTERP_PREFIX=3D\"$interp_prefix1\"" >> $config_target= _mak symlink "../qemu-$target_name" "$target_dir/qemu-$target_name" else symlink "../qemu-system-$target_name" "$target_dir/qemu-system-$target_n= ame" fi -if test "$target_linux_user" =3D "yes" ; then - echo "CONFIG_LINUX_USER=3Dy" >> $config_target_mak -fi list=3D"" if test ! -z "$gdb_xml_files" ; then for x in $gdb_xml_files; do @@ -7656,9 +7649,6 @@ fi if test "$target_user_only" =3D "yes" && test "$bflt" =3D "yes"; then echo "TARGET_HAS_BFLT=3Dy" >> $config_target_mak fi -if test "$target_bsd_user" =3D "yes" ; then - echo "CONFIG_BSD_USER=3Dy" >> $config_target_mak -fi =20 done # for target in $targets =20 @@ -7668,6 +7658,7 @@ fi if [ "$capstone" =3D "git" -o "$capstone" =3D "internal" ]; then subdirs=3D"$subdirs capstone" fi +echo "CONFIG_QEMU_INTERP_PREFIX=3D$interp_prefix" | sed 's/%M/@0@/' >> $co= nfig_host_mak echo "SUBDIRS=3D$subdirs" >> $config_host_mak if test -n "$LIBCAPSTONE"; then echo "LIBCAPSTONE=3D$LIBCAPSTONE" >> $config_host_mak diff --git a/meson.build b/meson.build index 7a5eced5f0..6863b9febf 100644 --- a/meson.build +++ b/meson.build @@ -639,12 +639,15 @@ config_host_data.set('QEMU_VERSION_MAJOR', meson.proj= ect_version().split('.')[0] config_host_data.set('QEMU_VERSION_MINOR', meson.project_version().split('= .')[1]) config_host_data.set('QEMU_VERSION_MICRO', meson.project_version().split('= .')[2]) =20 +ignored =3D ['CONFIG_QEMU_INTERP_PREFIX'] # actually per-target arrays =3D ['CONFIG_AUDIO_DRIVERS', 'CONFIG_BDRV_RW_WHITELIST', 'CONFIG_BD= RV_RO_WHITELIST'] strings =3D ['HOST_DSOSUF', 'CONFIG_IASL', 'bindir', 'prefix', 'qemu_confd= ir', 'qemu_datadir', 'qemu_moddir', 'qemu_localstatedir', 'qemu_helperdir', 'qemu_lo= caledir', 'qemu_icondir', 'qemu_desktopdir', 'qemu_firmwarepath', 'syscon= fdir'] foreach k, v: config_host - if arrays.contains(k) + if ignored.contains(k) + # do nothing + elif arrays.contains(k) if v !=3D '' v =3D '"' + '", "'.join(v.split()) + '", ' endif @@ -720,7 +723,23 @@ kconfig_external_symbols =3D [ ignored =3D ['TARGET_XML_FILES', 'TARGET_ABI_DIR', 'TARGET_DIRS'] =20 foreach target : target_dirs - config_target =3D keyval.load(meson.current_build_dir() / target / 'conf= ig-target.mak') + config_target =3D { 'TARGET_NAME': target.split('-')[0] } + if target.endswith('linux-user') + assert(targetos =3D=3D 'linux') + config_target +=3D { 'CONFIG_LINUX_USER': 'y' } + elif target.endswith('bsd-user') + assert('CONFIG_BSD' in config_host) + config_target +=3D { 'CONFIG_BSD_USER': 'y' } + elif target.endswith('softmmu') + config_target +=3D { 'CONFIG_SOFTMMU': 'y' } + endif + if target.endswith('-user') + config_target +=3D { + 'CONFIG_USER_ONLY': 'y', + 'CONFIG_QEMU_INTERP_PREFIX': + config_host['CONFIG_QEMU_INTERP_PREFIX'].format(config_target['TAR= GET_NAME']) + } + endif =20 have_accel =3D false foreach sym: accelerators @@ -735,6 +754,8 @@ foreach target : target_dirs endforeach assert(have_accel) =20 + config_target +=3D keyval.load('default-configs/targets' / target + '.ma= k') + foreach k, v: disassemblers if config_host['ARCH'].startswith(k) or config_target['TARGET_BASE_ARC= H'].startswith(k) foreach sym: v @@ -752,7 +773,7 @@ foreach target : target_dirs # do nothing elif k =3D=3D 'TARGET_BASE_ARCH' config_target_data.set('TARGET_' + v.to_upper(), 1) - elif k =3D=3D 'TARGET_NAME' + elif k =3D=3D 'TARGET_NAME' or k =3D=3D 'CONFIG_QEMU_INTERP_PREFIX' config_target_data.set_quoted(k, v) elif v =3D=3D 'y' config_target_data.set(k, 1) --=20 2.26.2 From nobody Sun Nov 16 12:30:53 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 From nobody Sun Nov 16 12:30:53 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=1600607375; cv=none; d=zohomail.com; s=zohoarc; b=Ugzn+vqrh99OFNcQhlGvsbtpgBIFrUMLYljZKD86xicF6cvhnkQdxEcvDKQaYXq973KKnBH17JGQhPslOD1DWhglhnJQwz0415Q707Df28uFPBnwyZz/lN7MyRi5ZIRwjkepTy3PRcRvwIAFWLh71dGNuddOsfLWKFWwbWz3iOI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600607375; 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=cTyfXW/fZyCgCKg2QYN7wd09oeGaOdP8sBIwFtpq6uI=; b=Xd3guSJPHxp+9wc4qFTImOuhLo2LFVPKms51C/ltExzLaYloEqAzW3JTZfPNXH2pxTG2nQ9uuEoJcGZPOG+wHVudSjZ7/mbNoZtfqCdNx8SJgH7SZmPRoMDhEVzpk9fZqHScyNcHg0Aj1PR41C6E5StjD07OizNewyu9+bnkyGs= 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 1600607375807230.662580296467; Sun, 20 Sep 2020 06:09:35 -0700 (PDT) Received: from localhost ([::1]:33302 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJz5y-0007vb-Eu for importer@patchew.org; Sun, 20 Sep 2020 09:09:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60154) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJz3y-0006Ex-LY for qemu-devel@nongnu.org; Sun, 20 Sep 2020 09:07:30 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:35179) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kJz3k-00017l-Ip for qemu-devel@nongnu.org; Sun, 20 Sep 2020 09:07:29 -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-416-XYynNgJPNlG8LR8nBVcoHw-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 06B8E186DD52 for ; Sun, 20 Sep 2020 13:07:12 +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 C9B0760C84 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=1600607234; 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=cTyfXW/fZyCgCKg2QYN7wd09oeGaOdP8sBIwFtpq6uI=; b=HKxaPZzWD9jIqOOtBw4GIS6VGvc07TaP4U7XA0a1yL9hd90LANwEmXrdipv06G0sNXTByG gOlu7NBBYwZSHuqkPdn4Oqv5TgvO0fxsqlrKkxAqEs6WwhPOiHds33ml9/ec2+fNlCUOGx nEVvycagOLF/f/mJ3KGFzNVhir/QW4Q= X-MC-Unique: XYynNgJPNlG8LR8nBVcoHw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 8/9] default-configs/targets: remove useless lines Date: Sun, 20 Sep 2020 09:07:07 -0400 Message-Id: <20200920130708.1156310-9-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=63.128.21.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/20 07:54:59 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -45 X-Spam_score: -4.6 X-Spam_bar: ---- X-Spam_report: (-4.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_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, 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" Some lines are only meaningful for user-mode targets, remove them. Signed-off-by: Paolo Bonzini --- default-configs/targets/aarch64-softmmu.mak | 1 - default-configs/targets/alpha-softmmu.mak | 3 --- default-configs/targets/arm-softmmu.mak | 3 --- default-configs/targets/avr-softmmu.mak | 1 - default-configs/targets/cris-softmmu.mak | 1 - default-configs/targets/hppa-softmmu.mak | 3 --- default-configs/targets/i386-bsd-user.mak | 2 -- default-configs/targets/i386-softmmu.mak | 3 --- default-configs/targets/lm32-softmmu.mak | 1 - default-configs/targets/m68k-softmmu.mak | 3 --- default-configs/targets/microblaze-softmmu.mak | 3 --- default-configs/targets/microblazeel-softmmu.mak | 3 --- default-configs/targets/mips-softmmu.mak | 3 --- default-configs/targets/mips64-softmmu.mak | 3 --- default-configs/targets/mips64el-softmmu.mak | 3 --- default-configs/targets/mipsel-softmmu.mak | 3 --- default-configs/targets/moxie-softmmu.mak | 1 - default-configs/targets/nios2-softmmu.mak | 1 - default-configs/targets/or1k-softmmu.mak | 1 - default-configs/targets/ppc-softmmu.mak | 3 --- default-configs/targets/ppc64-softmmu.mak | 3 --- default-configs/targets/riscv32-softmmu.mak | 1 - default-configs/targets/riscv64-softmmu.mak | 1 - default-configs/targets/rx-softmmu.mak | 1 - default-configs/targets/s390x-softmmu.mak | 3 --- default-configs/targets/sh4-softmmu.mak | 3 --- default-configs/targets/sh4eb-softmmu.mak | 3 --- default-configs/targets/sparc-bsd-user.mak | 2 -- default-configs/targets/sparc-softmmu.mak | 3 --- default-configs/targets/sparc64-bsd-user.mak | 2 -- default-configs/targets/sparc64-softmmu.mak | 3 --- default-configs/targets/tricore-softmmu.mak | 1 - default-configs/targets/unicore32-softmmu.mak | 1 - default-configs/targets/x86_64-bsd-user.mak | 2 -- default-configs/targets/x86_64-softmmu.mak | 3 --- default-configs/targets/xtensa-softmmu.mak | 3 --- default-configs/targets/xtensaeb-softmmu.mak | 3 --- 37 files changed, 83 deletions(-) diff --git a/default-configs/targets/aarch64-softmmu.mak b/default-configs/= targets/aarch64-softmmu.mak index 53f83ea81f..4eff428074 100644 --- a/default-configs/targets/aarch64-softmmu.mak +++ b/default-configs/targets/aarch64-softmmu.mak @@ -1,5 +1,4 @@ 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/alpha-softmmu.mak b/default-configs/ta= rgets/alpha-softmmu.mak index b78114b028..8a484c9775 100644 --- a/default-configs/targets/alpha-softmmu.mak +++ b/default-configs/targets/alpha-softmmu.mak @@ -1,7 +1,4 @@ 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-softmmu.mak b/default-configs/targ= ets/arm-softmmu.mak index d40b995f25..5923f9b203 100644 --- a/default-configs/targets/arm-softmmu.mak +++ b/default-configs/targets/arm-softmmu.mak @@ -1,7 +1,4 @@ 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/avr-softmmu.mak b/default-configs/targ= ets/avr-softmmu.mak index ecd292b2f7..46b6da717c 100644 --- a/default-configs/targets/avr-softmmu.mak +++ b/default-configs/targets/avr-softmmu.mak @@ -1,4 +1,3 @@ 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-softmmu.mak b/default-configs/tar= gets/cris-softmmu.mak index ba61135172..1f7b44114b 100644 --- a/default-configs/targets/cris-softmmu.mak +++ b/default-configs/targets/cris-softmmu.mak @@ -1,3 +1,2 @@ TARGET_CRIS=3Dy TARGET_BASE_ARCH=3Dcris -TARGET_ABI_DIR=3Dcris diff --git a/default-configs/targets/hppa-softmmu.mak b/default-configs/tar= gets/hppa-softmmu.mak index 617c6483c0..c4ee4e6c51 100644 --- a/default-configs/targets/hppa-softmmu.mak +++ b/default-configs/targets/hppa-softmmu.mak @@ -1,8 +1,5 @@ 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 index 34b52e9ee2..c58db819ae 100644 --- a/default-configs/targets/i386-bsd-user.mak +++ b/default-configs/targets/i386-bsd-user.mak @@ -1,6 +1,4 @@ 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 index be9198bb84..4e2eb9f369 100644 --- a/default-configs/targets/i386-softmmu.mak +++ b/default-configs/targets/i386-softmmu.mak @@ -1,7 +1,4 @@ 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 index c327d27d5f..2c4b8eab79 100644 --- a/default-configs/targets/lm32-softmmu.mak +++ b/default-configs/targets/lm32-softmmu.mak @@ -1,4 +1,3 @@ TARGET_LM32=3Dy TARGET_BASE_ARCH=3Dlm32 -TARGET_ABI_DIR=3Dlm32 TARGET_WORDS_BIGENDIAN=3Dy diff --git a/default-configs/targets/m68k-softmmu.mak b/default-configs/tar= gets/m68k-softmmu.mak index f8bf4fc5ac..991e626677 100644 --- a/default-configs/targets/m68k-softmmu.mak +++ b/default-configs/targets/m68k-softmmu.mak @@ -1,7 +1,4 @@ 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-softmmu.mak b/default-confi= gs/targets/microblaze-softmmu.mak index 1b0a76a61f..24594862bf 100644 --- a/default-configs/targets/microblaze-softmmu.mak +++ b/default-configs/targets/microblaze-softmmu.mak @@ -1,7 +1,4 @@ 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-softmmu.mak b/default-con= figs/targets/microblazeel-softmmu.mak index 3a2cf8be0f..5817a63755 100644 --- a/default-configs/targets/microblazeel-softmmu.mak +++ b/default-configs/targets/microblazeel-softmmu.mak @@ -1,6 +1,3 @@ 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-softmmu.mak b/default-configs/tar= gets/mips-softmmu.mak index 8ab9ff2ac9..ba58d6827e 100644 --- a/default-configs/targets/mips-softmmu.mak +++ b/default-configs/targets/mips-softmmu.mak @@ -1,9 +1,6 @@ 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-softmmu.mak b/default-configs/t= argets/mips64-softmmu.mak index c02c5460a7..4837a12cac 100644 --- a/default-configs/targets/mips64-softmmu.mak +++ b/default-configs/targets/mips64-softmmu.mak @@ -1,8 +1,5 @@ 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-softmmu.mak b/default-configs= /targets/mips64el-softmmu.mak index 8cbbc38e78..93e3f25903 100644 --- a/default-configs/targets/mips64el-softmmu.mak +++ b/default-configs/targets/mips64el-softmmu.mak @@ -1,7 +1,4 @@ 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-softmmu.mak b/default-configs/t= argets/mipsel-softmmu.mak index afa0851887..1528516b5d 100644 --- a/default-configs/targets/mipsel-softmmu.mak +++ b/default-configs/targets/mipsel-softmmu.mak @@ -1,8 +1,5 @@ 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/moxie-softmmu.mak b/default-configs/ta= rgets/moxie-softmmu.mak index da093f5b36..ada92a6b5b 100644 --- a/default-configs/targets/moxie-softmmu.mak +++ b/default-configs/targets/moxie-softmmu.mak @@ -1,4 +1,3 @@ TARGET_MOXIE=3Dy TARGET_BASE_ARCH=3Dmoxie -TARGET_ABI_DIR=3Dmoxie TARGET_WORDS_BIGENDIAN=3Dy diff --git a/default-configs/targets/nios2-softmmu.mak b/default-configs/ta= rgets/nios2-softmmu.mak index a2308a16aa..f10f08d0ca 100644 --- a/default-configs/targets/nios2-softmmu.mak +++ b/default-configs/targets/nios2-softmmu.mak @@ -1,3 +1,2 @@ TARGET_NIOS2=3Dy TARGET_BASE_ARCH=3Dnios2 -TARGET_ABI_DIR=3Dnios2 diff --git a/default-configs/targets/or1k-softmmu.mak b/default-configs/tar= gets/or1k-softmmu.mak index 2f5ff844df..a922266a98 100644 --- a/default-configs/targets/or1k-softmmu.mak +++ b/default-configs/targets/or1k-softmmu.mak @@ -1,4 +1,3 @@ TARGET_OPENRISC=3Dy TARGET_BASE_ARCH=3Dopenrisc -TARGET_ABI_DIR=3Dopenrisc TARGET_WORDS_BIGENDIAN=3Dy diff --git a/default-configs/targets/ppc-softmmu.mak b/default-configs/targ= ets/ppc-softmmu.mak index c4d912bfb1..1b6d091cfb 100644 --- a/default-configs/targets/ppc-softmmu.mak +++ b/default-configs/targets/ppc-softmmu.mak @@ -1,7 +1,4 @@ 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-softmmu.mak b/default-configs/ta= rgets/ppc64-softmmu.mak index a73211918a..e431feffeb 100644 --- a/default-configs/targets/ppc64-softmmu.mak +++ b/default-configs/targets/ppc64-softmmu.mak @@ -1,8 +1,5 @@ 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/riscv32-softmmu.mak b/default-configs/= targets/riscv32-softmmu.mak index 35e5b2fb85..caa5829af8 100644 --- a/default-configs/targets/riscv32-softmmu.mak +++ b/default-configs/targets/riscv32-softmmu.mak @@ -1,5 +1,4 @@ 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-softmmu.mak b/default-configs/= targets/riscv64-softmmu.mak index 4b9a61cd8f..e190c0363b 100644 --- a/default-configs/targets/riscv64-softmmu.mak +++ b/default-configs/targets/riscv64-softmmu.mak @@ -1,5 +1,4 @@ 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 index 52a8c0df10..37b365475f 100644 --- a/default-configs/targets/rx-softmmu.mak +++ b/default-configs/targets/rx-softmmu.mak @@ -1,4 +1,3 @@ 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-softmmu.mak b/default-configs/ta= rgets/s390x-softmmu.mak index f2a80d3208..f08d25d3c3 100644 --- a/default-configs/targets/s390x-softmmu.mak +++ b/default-configs/targets/s390x-softmmu.mak @@ -1,8 +1,5 @@ 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-softmmu.mak b/default-configs/targ= ets/sh4-softmmu.mak index e46bf0e278..8c7e9eaa7b 100644 --- a/default-configs/targets/sh4-softmmu.mak +++ b/default-configs/targets/sh4-softmmu.mak @@ -1,6 +1,3 @@ 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-softmmu.mak b/default-configs/ta= rgets/sh4eb-softmmu.mak index db4140ec32..f1848b89b6 100644 --- a/default-configs/targets/sh4eb-softmmu.mak +++ b/default-configs/targets/sh4eb-softmmu.mak @@ -1,7 +1,4 @@ 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 index 7f2fcba978..f478255591 100644 --- a/default-configs/targets/sparc-bsd-user.mak +++ b/default-configs/targets/sparc-bsd-user.mak @@ -1,7 +1,5 @@ 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 index 7f2fcba978..fb3dbb0d61 100644 --- a/default-configs/targets/sparc-softmmu.mak +++ b/default-configs/targets/sparc-softmmu.mak @@ -1,7 +1,4 @@ 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/sparc64-bsd-user.mak b/default-configs= /targets/sparc64-bsd-user.mak index 817529e587..0ae8ea5420 100644 --- a/default-configs/targets/sparc64-bsd-user.mak +++ b/default-configs/targets/sparc64-bsd-user.mak @@ -1,7 +1,5 @@ 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 index 817529e587..bc07bfdb0a 100644 --- a/default-configs/targets/sparc64-softmmu.mak +++ b/default-configs/targets/sparc64-softmmu.mak @@ -1,7 +1,4 @@ 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/tricore-softmmu.mak b/default-configs/= targets/tricore-softmmu.mak index 356e5d8669..a29aa2d6dd 100644 --- a/default-configs/targets/tricore-softmmu.mak +++ b/default-configs/targets/tricore-softmmu.mak @@ -1,3 +1,2 @@ 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 index d8c7860ac1..85f37dc88f 100644 --- a/default-configs/targets/unicore32-softmmu.mak +++ b/default-configs/targets/unicore32-softmmu.mak @@ -1,3 +1,2 @@ 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 index 6a9418f9ff..935b10e22c 100644 --- a/default-configs/targets/x86_64-bsd-user.mak +++ b/default-configs/targets/x86_64-bsd-user.mak @@ -1,6 +1,4 @@ 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 index 8b56e6e6da..377c63e823 100644 --- a/default-configs/targets/x86_64-softmmu.mak +++ b/default-configs/targets/x86_64-softmmu.mak @@ -1,7 +1,4 @@ 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-softmmu.mak b/default-configs/t= argets/xtensa-softmmu.mak index 2166f97738..96f892c4a8 100644 --- a/default-configs/targets/xtensa-softmmu.mak +++ b/default-configs/targets/xtensa-softmmu.mak @@ -1,7 +1,4 @@ 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-softmmu.mak b/default-configs= /targets/xtensaeb-softmmu.mak index 2372d22492..e6f53a1272 100644 --- a/default-configs/targets/xtensaeb-softmmu.mak +++ b/default-configs/targets/xtensaeb-softmmu.mak @@ -1,8 +1,5 @@ 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 --=20 2.26.2 From nobody Sun Nov 16 12:30:53 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=1600607874; cv=none; d=zohomail.com; s=zohoarc; b=Upg6wTrtlitIa0f6cAHV7bl1IkwNHWa+v2Lhw8pJ4J0xnC1UhuKajUslS+0DowHz6G7J9FsuwGpkERjfDPV9pCGallYCCheXMo77aXd7IQtFODrHCzinfDHzN8/ORcVyhSxPwBEwDVatYWSYk2o7oIPKX7TcI+TIf6byfYJc0GQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600607874; 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=PJzAwuafExGGEwX4LpN2r2QxcU8ZKrn0cGn4Bsj3ynA=; b=HyATapXrH8LYHbCQlqksV29Rd2Exgs86/9+SxqCXZ9QiYQd+mCkE6EaGRhaPFZWUY6mqtfN2Nl5FZnSddX0M8G7ngVJv4nOPi4Lg/KAKaFn2/luOcbCf/Pmd5QV2PA29uy9vuX7EoweF9NCCSaBtBGUOWWCuAfFiorKRMDJ5VX0= 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 1600607874211363.4952619412569; Sun, 20 Sep 2020 06:17:54 -0700 (PDT) Received: from localhost ([::1]:50326 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJzE0-0006oG-SS for importer@patchew.org; Sun, 20 Sep 2020 09:17:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60180) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJz42-0006Hl-8A for qemu-devel@nongnu.org; Sun, 20 Sep 2020 09:07:34 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:51582) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kJz3k-00017q-Kf for qemu-devel@nongnu.org; Sun, 20 Sep 2020 09:07:33 -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-574-r-IQZEpCOZ6NLX5I4PWxfw-1; Sun, 20 Sep 2020 09:07:13 -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 52BA11074647 for ; Sun, 20 Sep 2020 13:07:12 +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 21C5560C47 for ; Sun, 20 Sep 2020 13:07:12 +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=PJzAwuafExGGEwX4LpN2r2QxcU8ZKrn0cGn4Bsj3ynA=; b=OcygLCPRevbeu0+V+l2O5h8zjHIDy6+hQFHIYP8WN3YMcvdmqczFZ/7xIUiXI0jtubKHwN Weut3Dwg0y6yW0if/a6g1vLfqw5D/RMN4KKYr0xejFousY0d1qisXXApfjCeHISQ0ODjc1 ay87wwlXiae94NqC5v+rZZA11VYFb/8= X-MC-Unique: r-IQZEpCOZ6NLX5I4PWxfw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 9/9] default-configs: remove default-configs/devices for user-mode targets Date: Sun, 20 Sep 2020 09:07:08 -0400 Message-Id: <20200920130708.1156310-10-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=63.128.21.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/20 07:54:59 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -45 X-Spam_score: -4.6 X-Spam_bar: ---- X-Spam_report: (-4.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_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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" We no longer need dummy files to detect targets, since default-configs/targets/ exists. Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson --- configure | 6 +++--- default-configs/devices/aarch64-linux-user.mak | 1 - default-configs/devices/aarch64_be-linux-user.mak | 1 - default-configs/devices/alpha-linux-user.mak | 1 - default-configs/devices/arm-linux-user.mak | 1 - default-configs/devices/armeb-linux-user.mak | 1 - default-configs/devices/cris-linux-user.mak | 1 - default-configs/devices/hppa-linux-user.mak | 1 - default-configs/devices/i386-bsd-user.mak | 1 - default-configs/devices/i386-linux-user.mak | 1 - default-configs/devices/m68k-linux-user.mak | 1 - default-configs/devices/microblaze-linux-user.mak | 1 - default-configs/devices/microblazeel-linux-user.mak | 1 - default-configs/devices/mips-linux-user.mak | 1 - default-configs/devices/mips64-linux-user.mak | 1 - default-configs/devices/mips64el-linux-user.mak | 1 - default-configs/devices/mipsel-linux-user.mak | 1 - default-configs/devices/mipsn32-linux-user.mak | 1 - default-configs/devices/mipsn32el-linux-user.mak | 1 - default-configs/devices/nios2-linux-user.mak | 1 - default-configs/devices/or1k-linux-user.mak | 1 - default-configs/devices/ppc-linux-user.mak | 1 - default-configs/devices/ppc64-linux-user.mak | 1 - default-configs/devices/ppc64abi32-linux-user.mak | 1 - default-configs/devices/ppc64le-linux-user.mak | 1 - default-configs/devices/riscv32-linux-user.mak | 1 - default-configs/devices/riscv64-linux-user.mak | 1 - default-configs/devices/s390x-linux-user.mak | 1 - default-configs/devices/sh4-linux-user.mak | 1 - default-configs/devices/sh4eb-linux-user.mak | 1 - default-configs/devices/sparc-bsd-user.mak | 1 - default-configs/devices/sparc-linux-user.mak | 1 - default-configs/devices/sparc32plus-linux-user.mak | 1 - default-configs/devices/sparc64-bsd-user.mak | 1 - default-configs/devices/sparc64-linux-user.mak | 1 - default-configs/devices/tilegx-linux-user.mak | 1 - default-configs/devices/x86_64-bsd-user.mak | 1 - default-configs/devices/x86_64-linux-user.mak | 1 - default-configs/devices/xtensa-linux-user.mak | 1 - default-configs/devices/xtensaeb-linux-user.mak | 1 - 40 files changed, 3 insertions(+), 42 deletions(-) delete mode 100644 default-configs/devices/aarch64-linux-user.mak delete mode 100644 default-configs/devices/aarch64_be-linux-user.mak delete mode 100644 default-configs/devices/alpha-linux-user.mak delete mode 100644 default-configs/devices/arm-linux-user.mak delete mode 100644 default-configs/devices/armeb-linux-user.mak delete mode 100644 default-configs/devices/cris-linux-user.mak delete mode 100644 default-configs/devices/hppa-linux-user.mak delete mode 100644 default-configs/devices/i386-bsd-user.mak delete mode 100644 default-configs/devices/i386-linux-user.mak delete mode 100644 default-configs/devices/m68k-linux-user.mak delete mode 100644 default-configs/devices/microblaze-linux-user.mak delete mode 100644 default-configs/devices/microblazeel-linux-user.mak delete mode 100644 default-configs/devices/mips-linux-user.mak delete mode 100644 default-configs/devices/mips64-linux-user.mak delete mode 100644 default-configs/devices/mips64el-linux-user.mak delete mode 100644 default-configs/devices/mipsel-linux-user.mak delete mode 100644 default-configs/devices/mipsn32-linux-user.mak delete mode 100644 default-configs/devices/mipsn32el-linux-user.mak delete mode 100644 default-configs/devices/nios2-linux-user.mak delete mode 100644 default-configs/devices/or1k-linux-user.mak delete mode 100644 default-configs/devices/ppc-linux-user.mak delete mode 100644 default-configs/devices/ppc64-linux-user.mak delete mode 100644 default-configs/devices/ppc64abi32-linux-user.mak delete mode 100644 default-configs/devices/ppc64le-linux-user.mak delete mode 100644 default-configs/devices/riscv32-linux-user.mak delete mode 100644 default-configs/devices/riscv64-linux-user.mak delete mode 100644 default-configs/devices/s390x-linux-user.mak delete mode 100644 default-configs/devices/sh4-linux-user.mak delete mode 100644 default-configs/devices/sh4eb-linux-user.mak delete mode 100644 default-configs/devices/sparc-bsd-user.mak delete mode 100644 default-configs/devices/sparc-linux-user.mak delete mode 100644 default-configs/devices/sparc32plus-linux-user.mak delete mode 100644 default-configs/devices/sparc64-bsd-user.mak delete mode 100644 default-configs/devices/sparc64-linux-user.mak delete mode 100644 default-configs/devices/tilegx-linux-user.mak delete mode 100644 default-configs/devices/x86_64-bsd-user.mak delete mode 100644 default-configs/devices/x86_64-linux-user.mak delete mode 100644 default-configs/devices/xtensa-linux-user.mak delete mode 100644 default-configs/devices/xtensaeb-linux-user.mak diff --git a/configure b/configure index f6275d95fc..d672006df2 100755 --- a/configure +++ b/configure @@ -1611,13 +1611,13 @@ default_target_list=3D"" mak_wilds=3D"" =20 if [ "$softmmu" =3D "yes" ]; then - mak_wilds=3D"${mak_wilds} $source_path/default-configs/devices/*-softm= mu.mak" + mak_wilds=3D"${mak_wilds} $source_path/default-configs/targets/*-softm= mu.mak" fi if [ "$linux_user" =3D "yes" ]; then - mak_wilds=3D"${mak_wilds} $source_path/default-configs/devices/*-linux= -user.mak" + mak_wilds=3D"${mak_wilds} $source_path/default-configs/targets/*-linux= -user.mak" fi if [ "$bsd_user" =3D "yes" ]; then - mak_wilds=3D"${mak_wilds} $source_path/default-configs/devices/*-bsd-u= ser.mak" + mak_wilds=3D"${mak_wilds} $source_path/default-configs/targets/*-bsd-u= ser.mak" fi =20 if test -z "$target_list_exclude" -a -z "$target_list"; then diff --git a/default-configs/devices/aarch64-linux-user.mak b/default-confi= gs/devices/aarch64-linux-user.mak deleted file mode 100644 index 0a5b08a007..0000000000 --- a/default-configs/devices/aarch64-linux-user.mak +++ /dev/null @@ -1 +0,0 @@ -# Default configuration for aarch64-linux-user diff --git a/default-configs/devices/aarch64_be-linux-user.mak b/default-co= nfigs/devices/aarch64_be-linux-user.mak deleted file mode 100644 index a69d9d2e41..0000000000 --- a/default-configs/devices/aarch64_be-linux-user.mak +++ /dev/null @@ -1 +0,0 @@ -# Default configuration for aarch64_be-linux-user diff --git a/default-configs/devices/alpha-linux-user.mak b/default-configs= /devices/alpha-linux-user.mak deleted file mode 100644 index 7956e29898..0000000000 --- a/default-configs/devices/alpha-linux-user.mak +++ /dev/null @@ -1 +0,0 @@ -# Default configuration for alpha-linux-user diff --git a/default-configs/devices/arm-linux-user.mak b/default-configs/d= evices/arm-linux-user.mak deleted file mode 100644 index 413361a022..0000000000 --- a/default-configs/devices/arm-linux-user.mak +++ /dev/null @@ -1 +0,0 @@ -# Default configuration for arm-linux-user diff --git a/default-configs/devices/armeb-linux-user.mak b/default-configs= /devices/armeb-linux-user.mak deleted file mode 100644 index bf2ffe7038..0000000000 --- a/default-configs/devices/armeb-linux-user.mak +++ /dev/null @@ -1 +0,0 @@ -# Default configuration for armeb-linux-user diff --git a/default-configs/devices/cris-linux-user.mak b/default-configs/= devices/cris-linux-user.mak deleted file mode 100644 index e3aec7b864..0000000000 --- a/default-configs/devices/cris-linux-user.mak +++ /dev/null @@ -1 +0,0 @@ -# Default configuration for cris-linux-user diff --git a/default-configs/devices/hppa-linux-user.mak b/default-configs/= devices/hppa-linux-user.mak deleted file mode 100644 index 796393940b..0000000000 --- a/default-configs/devices/hppa-linux-user.mak +++ /dev/null @@ -1 +0,0 @@ -# Default configuration for hppa-linux-user diff --git a/default-configs/devices/i386-bsd-user.mak b/default-configs/de= vices/i386-bsd-user.mak deleted file mode 100644 index af1b31a59a..0000000000 --- a/default-configs/devices/i386-bsd-user.mak +++ /dev/null @@ -1 +0,0 @@ -# Default configuration for i386-bsd-user diff --git a/default-configs/devices/i386-linux-user.mak b/default-configs/= devices/i386-linux-user.mak deleted file mode 100644 index 8657e68627..0000000000 --- a/default-configs/devices/i386-linux-user.mak +++ /dev/null @@ -1 +0,0 @@ -# Default configuration for i386-linux-user diff --git a/default-configs/devices/m68k-linux-user.mak b/default-configs/= devices/m68k-linux-user.mak deleted file mode 100644 index 06cd5ed7ed..0000000000 --- a/default-configs/devices/m68k-linux-user.mak +++ /dev/null @@ -1 +0,0 @@ -# Default configuration for m68k-linux-user diff --git a/default-configs/devices/microblaze-linux-user.mak b/default-co= nfigs/devices/microblaze-linux-user.mak deleted file mode 100644 index 566fdc01c4..0000000000 --- a/default-configs/devices/microblaze-linux-user.mak +++ /dev/null @@ -1 +0,0 @@ -# Default configuration for microblaze-linux-user diff --git a/default-configs/devices/microblazeel-linux-user.mak b/default-= configs/devices/microblazeel-linux-user.mak deleted file mode 100644 index 378c6ddcb0..0000000000 --- a/default-configs/devices/microblazeel-linux-user.mak +++ /dev/null @@ -1 +0,0 @@ -# Default configuration for microblazeel-linux-user diff --git a/default-configs/devices/mips-linux-user.mak b/default-configs/= devices/mips-linux-user.mak deleted file mode 100644 index 31df57021e..0000000000 --- a/default-configs/devices/mips-linux-user.mak +++ /dev/null @@ -1 +0,0 @@ -# Default configuration for mips-linux-user diff --git a/default-configs/devices/mips64-linux-user.mak b/default-config= s/devices/mips64-linux-user.mak deleted file mode 100644 index 1598bfcf7d..0000000000 --- a/default-configs/devices/mips64-linux-user.mak +++ /dev/null @@ -1 +0,0 @@ -# Default configuration for mips64-linux-user diff --git a/default-configs/devices/mips64el-linux-user.mak b/default-conf= igs/devices/mips64el-linux-user.mak deleted file mode 100644 index 629f084086..0000000000 --- a/default-configs/devices/mips64el-linux-user.mak +++ /dev/null @@ -1 +0,0 @@ -# Default configuration for mips64el-linux-user diff --git a/default-configs/devices/mipsel-linux-user.mak b/default-config= s/devices/mipsel-linux-user.mak deleted file mode 100644 index 4d0e4afb69..0000000000 --- a/default-configs/devices/mipsel-linux-user.mak +++ /dev/null @@ -1 +0,0 @@ -# Default configuration for mipsel-linux-user diff --git a/default-configs/devices/mipsn32-linux-user.mak b/default-confi= gs/devices/mipsn32-linux-user.mak deleted file mode 100644 index 5b97919794..0000000000 --- a/default-configs/devices/mipsn32-linux-user.mak +++ /dev/null @@ -1 +0,0 @@ -# Default configuration for mipsn32-linux-user diff --git a/default-configs/devices/mipsn32el-linux-user.mak b/default-con= figs/devices/mipsn32el-linux-user.mak deleted file mode 100644 index d6367ff987..0000000000 --- a/default-configs/devices/mipsn32el-linux-user.mak +++ /dev/null @@ -1 +0,0 @@ -# Default configuration for mipsn32el-linux-user diff --git a/default-configs/devices/nios2-linux-user.mak b/default-configs= /devices/nios2-linux-user.mak deleted file mode 100644 index 5be3eb795d..0000000000 --- a/default-configs/devices/nios2-linux-user.mak +++ /dev/null @@ -1 +0,0 @@ -# Default configuration for nios2-linux-user diff --git a/default-configs/devices/or1k-linux-user.mak b/default-configs/= devices/or1k-linux-user.mak deleted file mode 100644 index 20e03c1317..0000000000 --- a/default-configs/devices/or1k-linux-user.mak +++ /dev/null @@ -1 +0,0 @@ -# Default configuration for or1k-linux-user diff --git a/default-configs/devices/ppc-linux-user.mak b/default-configs/d= evices/ppc-linux-user.mak deleted file mode 100644 index 6273df2930..0000000000 --- a/default-configs/devices/ppc-linux-user.mak +++ /dev/null @@ -1 +0,0 @@ -# Default configuration for ppc-linux-user diff --git a/default-configs/devices/ppc64-linux-user.mak b/default-configs= /devices/ppc64-linux-user.mak deleted file mode 100644 index 422d3fbaeb..0000000000 --- a/default-configs/devices/ppc64-linux-user.mak +++ /dev/null @@ -1 +0,0 @@ -# Default configuration for ppc64-linux-user diff --git a/default-configs/devices/ppc64abi32-linux-user.mak b/default-co= nfigs/devices/ppc64abi32-linux-user.mak deleted file mode 100644 index 1c657ec9bb..0000000000 --- a/default-configs/devices/ppc64abi32-linux-user.mak +++ /dev/null @@ -1 +0,0 @@ -# Default configuration for ppc64abi32-linux-user diff --git a/default-configs/devices/ppc64le-linux-user.mak b/default-confi= gs/devices/ppc64le-linux-user.mak deleted file mode 100644 index 63f4269023..0000000000 --- a/default-configs/devices/ppc64le-linux-user.mak +++ /dev/null @@ -1 +0,0 @@ -# Default configuration for ppc64le-linux-user diff --git a/default-configs/devices/riscv32-linux-user.mak b/default-confi= gs/devices/riscv32-linux-user.mak deleted file mode 100644 index 865b362f5a..0000000000 --- a/default-configs/devices/riscv32-linux-user.mak +++ /dev/null @@ -1 +0,0 @@ -# Default configuration for riscv-linux-user diff --git a/default-configs/devices/riscv64-linux-user.mak b/default-confi= gs/devices/riscv64-linux-user.mak deleted file mode 100644 index 865b362f5a..0000000000 --- a/default-configs/devices/riscv64-linux-user.mak +++ /dev/null @@ -1 +0,0 @@ -# Default configuration for riscv-linux-user diff --git a/default-configs/devices/s390x-linux-user.mak b/default-configs= /devices/s390x-linux-user.mak deleted file mode 100644 index a243c99874..0000000000 --- a/default-configs/devices/s390x-linux-user.mak +++ /dev/null @@ -1 +0,0 @@ -# Default configuration for s390x-linux-user diff --git a/default-configs/devices/sh4-linux-user.mak b/default-configs/d= evices/sh4-linux-user.mak deleted file mode 100644 index a469e19ac6..0000000000 --- a/default-configs/devices/sh4-linux-user.mak +++ /dev/null @@ -1 +0,0 @@ -# Default configuration for sh4-linux-user diff --git a/default-configs/devices/sh4eb-linux-user.mak b/default-configs= /devices/sh4eb-linux-user.mak deleted file mode 100644 index be08ca1002..0000000000 --- a/default-configs/devices/sh4eb-linux-user.mak +++ /dev/null @@ -1 +0,0 @@ -# Default configuration for sh4eb-linux-user diff --git a/default-configs/devices/sparc-bsd-user.mak b/default-configs/d= evices/sparc-bsd-user.mak deleted file mode 100644 index 21e09508d8..0000000000 --- a/default-configs/devices/sparc-bsd-user.mak +++ /dev/null @@ -1 +0,0 @@ -# Default configuration for sparc-bsd-user diff --git a/default-configs/devices/sparc-linux-user.mak b/default-configs= /devices/sparc-linux-user.mak deleted file mode 100644 index 9c716d1f92..0000000000 --- a/default-configs/devices/sparc-linux-user.mak +++ /dev/null @@ -1 +0,0 @@ -# Default configuration for sparc-linux-user diff --git a/default-configs/devices/sparc32plus-linux-user.mak b/default-c= onfigs/devices/sparc32plus-linux-user.mak deleted file mode 100644 index 432e88011e..0000000000 --- a/default-configs/devices/sparc32plus-linux-user.mak +++ /dev/null @@ -1 +0,0 @@ -# Default configuration for sparc32plus-linux-user diff --git a/default-configs/devices/sparc64-bsd-user.mak b/default-configs= /devices/sparc64-bsd-user.mak deleted file mode 100644 index b8b9eea7f6..0000000000 --- a/default-configs/devices/sparc64-bsd-user.mak +++ /dev/null @@ -1 +0,0 @@ -# Default configuration for sparc64-bsd-user diff --git a/default-configs/devices/sparc64-linux-user.mak b/default-confi= gs/devices/sparc64-linux-user.mak deleted file mode 100644 index bf1bdd6aa4..0000000000 --- a/default-configs/devices/sparc64-linux-user.mak +++ /dev/null @@ -1 +0,0 @@ -# Default configuration for sparc64-linux-user diff --git a/default-configs/devices/tilegx-linux-user.mak b/default-config= s/devices/tilegx-linux-user.mak deleted file mode 100644 index 3e47493af0..0000000000 --- a/default-configs/devices/tilegx-linux-user.mak +++ /dev/null @@ -1 +0,0 @@ -# Default configuration for tilegx-linux-user diff --git a/default-configs/devices/x86_64-bsd-user.mak b/default-configs/= devices/x86_64-bsd-user.mak deleted file mode 100644 index 73e5d34ec5..0000000000 --- a/default-configs/devices/x86_64-bsd-user.mak +++ /dev/null @@ -1 +0,0 @@ -# Default configuration for x86_64-bsd-user diff --git a/default-configs/devices/x86_64-linux-user.mak b/default-config= s/devices/x86_64-linux-user.mak deleted file mode 100644 index bec1d9e7c6..0000000000 --- a/default-configs/devices/x86_64-linux-user.mak +++ /dev/null @@ -1 +0,0 @@ -# Default configuration for x86_64-linux-user diff --git a/default-configs/devices/xtensa-linux-user.mak b/default-config= s/devices/xtensa-linux-user.mak deleted file mode 100644 index fd1d350ee9..0000000000 --- a/default-configs/devices/xtensa-linux-user.mak +++ /dev/null @@ -1 +0,0 @@ -# Default configuration for xtensa-linux-user diff --git a/default-configs/devices/xtensaeb-linux-user.mak b/default-conf= igs/devices/xtensaeb-linux-user.mak deleted file mode 100644 index fd1d350ee9..0000000000 --- a/default-configs/devices/xtensaeb-linux-user.mak +++ /dev/null @@ -1 +0,0 @@ -# Default configuration for xtensa-linux-user --=20 2.26.2