From nobody Sun Nov 16 14:04:13 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=1600852941; cv=none; d=zohomail.com; s=zohoarc; b=CCq0DLs2a9iC8olsFXTESvI5NIK1PnPAR634xgkahYpN3OSMRqe0V9YRJzg8awrFVse+axQNB/rvFl+1zTUgDG7bgXgdvmGLKqZD/V49YFr11pexqDs8G/iHf44M27F8TD1pc6kd9hOmWxRd5Fi7d+Ywmq6BOOEPaz+n239cgUY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600852941; h=Content-Type:Content-Transfer-Encoding:Cc: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=0wOGO/ltGBbQBSaNWqVHMmSsQRLrJuuk2JQz2s3rCbI=; b=SeoCX2GmkuLERRecyrQfLyNpvMjzrqDp8Az1yH5122WSUbO6suFd3cUUQyfQSGFhvQV4urisdKTaIGSng2zU/4USdTIM7sgEKC6xtj18Kq4RpeLjcrtu7r+cn96wFRZnktJRmMYAXuGs4trrqqN6CQXbDf13ybgWVe/h+e9UBL8= 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 1600852941964866.0974072669229; Wed, 23 Sep 2020 02:22:21 -0700 (PDT) Received: from localhost ([::1]:56540 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kL0yi-0006Za-Go for importer@patchew.org; Wed, 23 Sep 2020 05:22:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53158) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL0od-0001IN-BR for qemu-devel@nongnu.org; Wed, 23 Sep 2020 05:11:55 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:37013) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kL0oS-0002Mn-LK for qemu-devel@nongnu.org; Wed, 23 Sep 2020 05:11:54 -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-458-QEF4gCLuNee9kxjmgGjiZw-1; Wed, 23 Sep 2020 05:11:33 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EBD66801AEB; Wed, 23 Sep 2020 09:11:32 +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 902D15D9CC; Wed, 23 Sep 2020 09:11:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600852297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0wOGO/ltGBbQBSaNWqVHMmSsQRLrJuuk2JQz2s3rCbI=; b=gYFk/p2cUdrILfNiheyct05GLRUQMNY20kdCn2sSRm0MEHpOMlIAXkpy96sQ5VGRt7Comr OjWfuK4GB9U5wH3FWwMpxd3kqHYJn4/Oow2W4yY8wSlmsiQ9nOO1NqJwDZ3tdnh1xSM1Kz lt4YOnIKAD0XJmaUMaolcFGj/TKbggc= X-MC-Unique: QEF4gCLuNee9kxjmgGjiZw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 01/12] default-configs: move files to default-configs/devices/ Date: Wed, 23 Sep 2020 05:11:20 -0400 Message-Id: <20200923091131.1591563-2-pbonzini@redhat.com> In-Reply-To: <20200923091131.1591563-1-pbonzini@redhat.com> References: <20200923091131.1591563-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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/23 00:53:58 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.455, 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=0.001, RCVD_IN_MSPIKE_WL=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: , Cc: richard.henderson@linaro.org 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/ Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- 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 c2aa1885c3..a23364c30d 100755 --- a/configure +++ b/configure @@ -1723,13 +1723,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 the user doesn't explicitly specify a deprecated target we will 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 4c73f4093a..02593bc787 100644 --- a/meson.build +++ b/meson.build @@ -694,7 +694,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 14:04:13 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=1600852667; cv=none; d=zohomail.com; s=zohoarc; b=kuKDe59M4dQJClEIEJtmZjZgi05BRqebQHrtyPGrVHKxzgXIW9nQlsXwBcg619p4W+tw/cx1babt7jS52A/UUUuRQYLTlxjPmUXge8BLTIg3kPqsWihMLeIz25hqMdZodzpEHj4hpL1EfXQXDkAD1lP8jskJzhZ9CY7nf1w95rI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600852667; h=Content-Type:Content-Transfer-Encoding:Cc: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=V81aGMEyPdzfrtL3EWwHxyepc+0BJyOn6VXUjGQ6+Vo=; b=n2ubQcYbZHkDqttlKa1pMot06JFh1Yd7XsiDIja2BFV62/Rgt8A9psrVPfm5uH0AFB0mT6CB6wtnse/YtaqZcwfOfY3D8fc59JbvlCvy2cyLLwVd4nkbeVD3qSZ9sDW+jMnWkrDDZfolN/AZjLWNxcV3NIDxzaeWpUMO33YAp7g= 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 1600852667678120.7501211657991; Wed, 23 Sep 2020 02:17:47 -0700 (PDT) Received: from localhost ([::1]:43538 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kL0uH-0000zJ-VM for importer@patchew.org; Wed, 23 Sep 2020 05:17:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53048) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL0oS-0001AU-U0 for qemu-devel@nongnu.org; Wed, 23 Sep 2020 05:11:44 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:59464 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 1kL0oL-0002MW-6b for qemu-devel@nongnu.org; Wed, 23 Sep 2020 05:11:43 -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-413-atIk6GMgMQusmu1Tdlo0Ng-1; Wed, 23 Sep 2020 05:11:34 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 799AB801AE9; Wed, 23 Sep 2020 09:11:33 +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 1EBBF5D9CC; Wed, 23 Sep 2020 09:11:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600852296; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=V81aGMEyPdzfrtL3EWwHxyepc+0BJyOn6VXUjGQ6+Vo=; b=SD+75KZ3YeehMsYsMSAN6JIOKKJzyIwRziwtM8nnpzXieKPafGuNTM9qMQDTllzrsyu1lg dHRcoHUfKV3sdYnbwUa8PkLl3jI+31gomuc8CjIAVUz2yrN6cnZz6UT8Pj0JgLa7e8EoEv et/rpmcQsjSHSZVg+kf8bD6QmaGQXCY= X-MC-Unique: atIk6GMgMQusmu1Tdlo0Ng-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 02/12] configure: convert accelerator variables to meson options Date: Wed, 23 Sep 2020 05:11:21 -0400 Message-Id: <20200923091131.1591563-3-pbonzini@redhat.com> In-Reply-To: <20200923091131.1591563-1-pbonzini@redhat.com> References: <20200923091131.1591563-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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=207.211.31.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/23 05:08:50 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.455, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: , Cc: richard.henderson@linaro.org 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. Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- configure | 132 +++++++++++++++++++++++----------------------- meson_options.txt | 15 ++++++ 2 files changed, 82 insertions(+), 65 deletions(-) diff --git a/configure b/configure index a23364c30d..33bd3c4cb8 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) @@ -311,7 +311,7 @@ supported_target() { add_to deprecated_features $1 fi =20 - 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 @@ -414,14 +414,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"" @@ -429,10 +429,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" @@ -821,8 +821,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 @@ -856,7 +856,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" @@ -873,8 +873,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" @@ -910,7 +910,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 @@ -1192,33 +1192,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" ;; @@ -1228,9 +1228,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" ;; @@ -1715,7 +1715,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"" @@ -2671,7 +2671,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. @@ -2680,7 +2680,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 @@ -2706,10 +2706,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 @@ -2735,7 +2735,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 @@ -6213,7 +6213,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 @@ -6844,7 +6844,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 @@ -7629,7 +7629,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 @@ -7873,6 +7873,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 14:04:13 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=1600852582; cv=none; d=zohomail.com; s=zohoarc; b=FAxSlB6fUnJxUXKrwjMcQDAdwAH1p0dDJJWY/4PJs4ZJnNfiecp5QzxoFTaXXH3SmfTf7lJ+WNyAxWSeNQgZUkfKrcP8exMnGZwSVDsTBmmMYD28nIBFATa0qV7xqWtVF9zDIzJOsQJd8QBmTWiZ6IS+jtDKwa/2RLa9+th8YUc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600852582; h=Content-Type:Content-Transfer-Encoding:Cc: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=NmGhtkB1QB5kLHSLDrmo5u7rX3bh1zscfyeedYPRWx4=; b=ghFLeypI5anDcT7NUlON/K9J+akYECG/2T+PFnLY6l5SKnOmc2+9tr4gi5pKvf3ZK1M2Qv6DzDXY9bC2yZr8w9EH2RmZIHLKyOyHsgcIQPYxc19bHnPmM8nl8jxzx+apkaucgDzwNjYkD1eDYOTJrnOS/aXaCEyfku/S7ahMyNc= 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 1600852582404966.4343958120688; Wed, 23 Sep 2020 02:16:22 -0700 (PDT) Received: from localhost ([::1]:40320 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kL0sv-00084G-3p for importer@patchew.org; Wed, 23 Sep 2020 05:16:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53026) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL0oS-00019H-6L for qemu-devel@nongnu.org; Wed, 23 Sep 2020 05:11:44 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:59387) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kL0oL-0002Mb-FK for qemu-devel@nongnu.org; Wed, 23 Sep 2020 05:11:41 -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-342-07791cbYMxSbHCZovwdVtQ-1; Wed, 23 Sep 2020 05:11:35 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 07D6F107464E; Wed, 23 Sep 2020 09:11:34 +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 A0BF75D9CC; Wed, 23 Sep 2020 09:11:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600852296; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NmGhtkB1QB5kLHSLDrmo5u7rX3bh1zscfyeedYPRWx4=; b=ElHJ+OuE2mfdtm9aqcFwkYOnrO42O/+0x6DNO3r6wwurqYf4ixOclizJnVm6UpsErhd2WO I9qiZ2/vdi/IPdn1UyAXAFzp21xd1g7hJz3RHfzjAnYHgf0q4veLScUW1d95ahX7HgPfUY xNx9phCc+zFCmLLe1qBg90e3UQEcN2U= X-MC-Unique: 07791cbYMxSbHCZovwdVtQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 03/12] configure: rewrite accelerator defaults as tests Date: Wed, 23 Sep 2020 05:11:22 -0400 Message-Id: <20200923091131.1591563-4-pbonzini@redhat.com> In-Reply-To: <20200923091131.1591563-1-pbonzini@redhat.com> References: <20200923091131.1591563-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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/23 00:53:58 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.455, 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=0.001, RCVD_IN_MSPIKE_WL=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: , Cc: richard.henderson@linaro.org 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: standardize the shape of the code that changes "auto" to enabled/disabled, to ease the revi= ew when it will be moved to meson. Signed-off-by: Paolo Bonzini --- configure | 58 ++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 20 deletions(-) diff --git a/configure b/configure index 33bd3c4cb8..04cc25f7c8 100755 --- a/configure +++ b/configure @@ -429,10 +429,10 @@ vhost_scsi=3D"" vhost_vsock=3D"" vhost_user=3D"" vhost_user_fs=3D"" -kvm=3D"disabled" -hax=3D"disabled" -hvf=3D"disabled" -whpx=3D"disabled" +kvm=3D"auto" +hax=3D"auto" +hvf=3D"auto" +whpx=3D"auto" rdma=3D"" pvrdma=3D"" gprof=3D"no" @@ -821,8 +821,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" if check_include dsound.h; then @@ -856,7 +854,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" @@ -873,8 +870,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" QEMU_LDFLAGS=3D"-arch x86_64 $QEMU_LDFLAGS" @@ -910,7 +905,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 @@ -2668,6 +2662,29 @@ if test "$seccomp" !=3D "no" ; then seccomp=3D"no" fi fi + +########################################## +# simple accelerator probes + +if test "$kvm" !=3D "disabled" ; 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 + kvm=3Ddisabled + 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 @@ -2988,14 +3005,15 @@ 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" +if test "$whpx" !=3D "disabled"; then + if test "$mingw32" =3D yes && test "$ARCH" =3D "x86_64" && + check_include "WinHvPlatform.h" && check_include "WinHvEmulati= on.h"; then + whpx=3D"enabled" else - if test "$whpx" =3D "auto"; then + if test "$whpx" =3D "enabled"; then + if test "$ARCH" !=3D "x86_64"; then + error_exit "WHPX requires 64-bit host" + fi feature_not_found "WinHvPlatform" "WinHvEmulation is not insta= lled" fi whpx=3D"disabled" @@ -5831,13 +5849,13 @@ if [ "$hvf" !=3D "disabled" ] ; then #include int main() { return 0;} EOF - if ! compile_object ""; then + if test "$darwin" =3D yes && compile_object ""; then + hvf=3D'enabled' + else if test "$hvf" =3D "enabled"; then error_exit "Hypervisor.framework not available" fi hvf=3D'disabled' - else - hvf=3D'enabled' fi fi =20 --=20 2.26.2 From nobody Sun Nov 16 14:04:13 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=1600852845; cv=none; d=zohomail.com; s=zohoarc; b=jinwrouZj0Z5xVcm1/eZbFzW9VVm9R2FCqOWT0EU0/iTMn02zQYE+o+55xwv2HJAi0935QCV3LDtnlBXHDQfTzDEY+Ue8AMugArXHZKV9eaAAG+JAxEvZ9bf00TLg6dmACYkT5Oea0YaQE6otbgdqlDgpZljIx6wHQf4PfOURxA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600852845; h=Content-Type:Content-Transfer-Encoding:Cc: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=csQxNiFZcnC9TBP3b4tvHjusdp7fACDXz4/V7nvvILU=; b=ZDAiBV9Og6ckw2KPeZH0vEihjMSS4RhEyk1qvmCvrAaakB8nOlKGRMKWRCA3yYlirltax1dO8mVbIIshSfeEtlB/+9tH1Kilb8Ov11ji7hmUf9+OddE3TJSuIsqwLNG08yQBdLh+rWQ7m1Grm2XZEQC8n4TU4weIAphVld+nXyA= 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 1600852845951805.2788380212972; Wed, 23 Sep 2020 02:20:45 -0700 (PDT) Received: from localhost ([::1]:51990 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kL0xA-0004Wg-Hw for importer@patchew.org; Wed, 23 Sep 2020 05:20:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53090) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL0oW-0001Bt-Fn for qemu-devel@nongnu.org; Wed, 23 Sep 2020 05:11:48 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:20534) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kL0oP-0002Ml-DM for qemu-devel@nongnu.org; Wed, 23 Sep 2020 05:11:48 -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-354-7wHGC4N5MKC1zuZ_z7hQhA-1; Wed, 23 Sep 2020 05:11:35 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 89EBC1005E76; Wed, 23 Sep 2020 09:11:34 +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 2F0805D9CC; Wed, 23 Sep 2020 09:11:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600852297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=csQxNiFZcnC9TBP3b4tvHjusdp7fACDXz4/V7nvvILU=; b=UO8ZcUCrqEqJIMRRlwu+rxf15oPD/c7TS0MdTq7vCEfwXZlk3s+unKpJF4Ymce3rWY2VkX uMm6rQKNNs/cuMuqOrCiprTu3iFJbjc88DR6NUEm7lDPnK0ZGN/oL6kUu93Go4AkARxYhq 9brGTM2BGHW4AGEbBgjslp481cQxIVI= X-MC-Unique: 7wHGC4N5MKC1zuZ_z7hQhA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 04/12] configure: move accelerator logic to meson Date: Wed, 23 Sep 2020 05:11:23 -0400 Message-Id: <20200923091131.1591563-5-pbonzini@redhat.com> In-Reply-To: <20200923091131.1591563-1-pbonzini@redhat.com> References: <20200923091131.1591563-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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/23 00:53:58 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.455, 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=0.001, RCVD_IN_MSPIKE_WL=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: , Cc: richard.henderson@linaro.org 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 | 108 ++++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 93 insertions(+), 34 deletions(-) diff --git a/configure b/configure index 04cc25f7c8..5df58c4b89 100755 --- a/configure +++ b/configure @@ -6863,7 +6863,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 @@ -7645,24 +7644,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 02593bc787..641378c1d9 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 # ################## @@ -103,7 +125,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') @@ -116,7 +138,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'), @@ -127,6 +148,63 @@ 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() + if 'CONFIG_XEN' in accelerators + error('Xen PCI passthrough not available on this platform') + else + error('Xen PCI passthrough requested but Xen not enabled') + endif +endif if not cocoa.found() and get_option('cocoa').enabled() error('Cocoa not available on this platform') endif @@ -640,17 +718,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 @@ -676,11 +759,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 14:04:13 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=1600852787; cv=none; d=zohomail.com; s=zohoarc; b=TUFG/WawrvCMB5wavd32h7do7y+Dc2fUvCo7pkHFY4MZgXsI0pn+adLKy8MD5rYbQHF/t37v5ptZ5e2uolpicK90o/Vp9CZeNDpL5rZiAwsGwDm3qIgEshLN+KWh544NRlCvO5fxh7bXA7LOWrDuapVlTyd0qhU/h/3UkjG6HqA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600852787; h=Content-Type:Content-Transfer-Encoding:Cc: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=I6zjfb7zTAVAZEhd3+8dg8NOErW64r6KoxREtM366l8=; b=IbozFw9Nb7YHVbquqgFEgBnGwr345u5uzo0IWTkF9ZL5xK2igsBcHHybM0wHouyKnKMWk3YqZgNbKKf76KkO8G9qsNA+gFSBNGN4GsOfouADBhCm3PQ+Srf7mPDCYOqHX3XdmokJxHecC9R5fpGBaTQq5xTNI5xwjf5UIdz2f9k= 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 160085278751854.12856236105779; Wed, 23 Sep 2020 02:19:47 -0700 (PDT) Received: from localhost ([::1]:49688 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kL0wE-0003Xf-4S for importer@patchew.org; Wed, 23 Sep 2020 05:19:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53110) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL0oZ-0001Dj-Fi for qemu-devel@nongnu.org; Wed, 23 Sep 2020 05:11:51 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:44837) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kL0oR-0002Mt-Vj for qemu-devel@nongnu.org; Wed, 23 Sep 2020 05:11:51 -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-ZOBUWsh7MAGuzeV9ucEPLg-1; Wed, 23 Sep 2020 05:11:36 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 171061005E66; Wed, 23 Sep 2020 09:11:35 +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 B14B65D9CC; Wed, 23 Sep 2020 09:11:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600852297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=I6zjfb7zTAVAZEhd3+8dg8NOErW64r6KoxREtM366l8=; b=HAyrc7DhDronk4TaVMVn2UqQlbXgmV+FjfRoMU3yq84489qDocE6QvzINRBfoxaTJj7pQE 5RAu0thMT85s/62BoRih2lzK2hrKcaS6eKliPTnDyde6m3QhqUypH4zSdffsycmguiMwAo qEgB5ReCN6dM8+LQYiJV8EKFChuqyuE= X-MC-Unique: ZOBUWsh7MAGuzeV9ucEPLg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 05/12] configure: remove dead variable Date: Wed, 23 Sep 2020 05:11:24 -0400 Message-Id: <20200923091131.1591563-6-pbonzini@redhat.com> In-Reply-To: <20200923091131.1591563-1-pbonzini@redhat.com> References: <20200923091131.1591563-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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/23 00:53:58 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.455, 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=0.001, RCVD_IN_MSPIKE_WL=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: , Cc: richard.henderson@linaro.org 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" Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- configure | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/configure b/configure index 5df58c4b89..903bbcbc46 100755 --- a/configure +++ b/configure @@ -815,9 +815,6 @@ fi =20 # OS specific =20 -# host *BSD for user mode -HOST_VARIANT_DIR=3D"" - case $targetos in MINGW32*) mingw32=3D"yes" @@ -843,14 +840,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" @@ -858,14 +853,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" @@ -881,7 +874,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" @@ -7636,9 +7628,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 14:04:13 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=1600853206; cv=none; d=zohomail.com; s=zohoarc; b=NFUz6eEYFwhRMlOUKx+P5CeQvtFW+Bd+vhxvC8D2EwARVJKz0t3NPWoorDPpjxUTjG2BxSpTkqWA1wK72B27ZUIWOokiibNAzyXlFhLTJeYmaY5n5qnlq7U2m7JNmMuHvlpm2uMnn+QeTYidGLuARuGB/JACDxSyN24/Simxnug= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600853206; h=Content-Type:Content-Transfer-Encoding:Cc: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=qRuenM6xg1JBEEE11oXj+Vx3RalsCmbiYZ8kHQa3v2A=; b=arVrNHuphOlXY2E31z76bSnCbNLG7EjC48+UZ+htBztb1P8yahTTFnxZ8Rxtafk82lM8XOQbZ3VOy/VvFehHR4j14f4tG+M+k1iUnE2IVG4WDySMXkfUNXwRXYxH7UssNH7BvwYdSPOOHi/AwefyPxddnwnErvKMFJYyH/V18/k= 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 1600853206746749.791490037814; Wed, 23 Sep 2020 02:26:46 -0700 (PDT) Received: from localhost ([::1]:37490 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kL12z-0002DG-DX for importer@patchew.org; Wed, 23 Sep 2020 05:26:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53150) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL0oc-0001G0-HP for qemu-devel@nongnu.org; Wed, 23 Sep 2020 05:11:54 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:28563) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kL0oS-0002N9-K2 for qemu-devel@nongnu.org; Wed, 23 Sep 2020 05:11:54 -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-404-RDL2NQNfOiWn7dgtffhP1Q-1; Wed, 23 Sep 2020 05:11:36 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9A1441074641; Wed, 23 Sep 2020 09:11:35 +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 3F3945D9CC; Wed, 23 Sep 2020 09:11:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600852300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qRuenM6xg1JBEEE11oXj+Vx3RalsCmbiYZ8kHQa3v2A=; b=N/pXmZHn/oEFxdOKIeRrh7XgVZ5s5EPx9P37RjsttfambsfXVDZcJAUgx2/UfF4xlYj4R3 v46acubBFsiJQDO7gMB+WqcEploKlLEejtB9LejmUKLlLqiaWzp8hPtoGKPs9/NKOfiy1L awSzHgwTLQs9mdNeaDwVI+2sQ/a3Kik= X-MC-Unique: RDL2NQNfOiWn7dgtffhP1Q-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 06/12] configure: compute derivatives of target name in meson Date: Wed, 23 Sep 2020 05:11:25 -0400 Message-Id: <20200923091131.1591563-7-pbonzini@redhat.com> In-Reply-To: <20200923091131.1591563-1-pbonzini@redhat.com> References: <20200923091131.1591563-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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/23 00:53:58 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.455, 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=0.001, RCVD_IN_MSPIKE_WL=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: , Cc: richard.henderson@linaro.org 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" Several CONFIG_* symbols in config-target.mak are easily computed from just the target name. We do not need them in config-target.mak, and can instead place them in the config_target dictionary only. 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 903bbcbc46..2bd4336369 100755 --- a/configure +++ b/configure @@ -7622,7 +7622,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 @@ -7640,21 +7639,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 @@ -7666,9 +7659,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 @@ -7678,6 +7668,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 641378c1d9..3bd8cbacb7 100644 --- a/meson.build +++ b/meson.build @@ -638,12 +638,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 @@ -719,7 +722,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 @@ -734,6 +753,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 @@ -751,7 +772,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 14:04:13 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=1600853355; cv=none; d=zohomail.com; s=zohoarc; b=f3gu0HxXqA61fe6EDYUusOKgAM4C1a/7B4JxZ60+pG5WX2bx+dzBHwD1eN7DNnI82fJWA6eodQ17d1eMcjuVAuZxZS1/ZJ+2DthDAYkBJGrLsYvGa2w1UdEy7N9dJ2FGDdo1txutcqaAqsgMZh8Rp9w11huefmD8aX9PBafWt44= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600853355; h=Content-Type:Content-Transfer-Encoding:Cc: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=bL7nD+JNaHuk7WyiSDhOoHjSV8am1jrl2EWBBD/pkBU=; b=eGunxmXUOeAok6tyJ/1Bp0XGgDDckbvHpjZU3fYadz9cYtgm8UrDJ8jMh/M4L9qU/c2vDcMU7BFbbj5bauNJc3JVDuzY6J35cyBVktt/w2+1O/appJY7EGSB65nSzBIRNRIAls9RAFViIEAzUhB7EYYBUDaY9jYzYgAjw1ioQHs= 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 1600853355621460.2842176349395; Wed, 23 Sep 2020 02:29:15 -0700 (PDT) Received: from localhost ([::1]:46194 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kL15O-000650-8n for importer@patchew.org; Wed, 23 Sep 2020 05:29:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53162) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL0od-0001Is-IK for qemu-devel@nongnu.org; Wed, 23 Sep 2020 05:11:55 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:32110 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 1kL0oS-0002N2-KV for qemu-devel@nongnu.org; Wed, 23 Sep 2020 05:11:55 -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-436-L3mylkq7O3attLlMYHC5pA-1; Wed, 23 Sep 2020 05:11:37 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 28781107465A; Wed, 23 Sep 2020 09:11:36 +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 C22C45D9CC; Wed, 23 Sep 2020 09:11:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600852299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bL7nD+JNaHuk7WyiSDhOoHjSV8am1jrl2EWBBD/pkBU=; b=Sj6yQQSHPp9x09IoeO7TIEqa6SIwFn/UygkEAJ7VGVn4emNs/pTIt6HNYM//bhKpvMegCH RA1eIzaNB6jo29ThNWXaWLxQOJsv/njPUo+POanhER2OS+I+H6t3aGNIj37XQoKbQNkOkI ECEtkxxr7rljpWmfw90LKUe6vkcPYBo= X-MC-Unique: L3mylkq7O3attLlMYHC5pA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 07/12] configure: remove useless config-target.mak symbols Date: Wed, 23 Sep 2020 05:11:26 -0400 Message-Id: <20200923091131.1591563-8-pbonzini@redhat.com> In-Reply-To: <20200923091131.1591563-1-pbonzini@redhat.com> References: <20200923091131.1591563-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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/23 05:11:39 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.455, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: , Cc: richard.henderson@linaro.org 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" Omit symbols that are not needed by softmmu or bsd-user targets, in preparation for moving the generated config-target.mak files into the source tree. Signed-off-by: Paolo Bonzini --- configure | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/configure b/configure index 2bd4336369..5e15b5e1ad 100755 --- a/configure +++ b/configure @@ -7494,7 +7494,7 @@ case "$target_name" in mips|mipsel) mttcg=3D"yes" TARGET_ARCH=3Dmips - echo "TARGET_ABI_MIPSO32=3Dy" >> $config_target_mak + test "$target_user_only" =3D yes && echo "TARGET_ABI_MIPSO32=3Dy" >> $= config_target_mak TARGET_SYSTBL_ABI=3Do32 TARGET_SYSTBL=3Dsyscall_o32.tbl ;; @@ -7502,8 +7502,8 @@ case "$target_name" in 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 + test "$target_user_only" =3D yes && echo "TARGET_ABI_MIPSN32=3Dy" >> $= config_target_mak + test "$target_user_only" =3D yes && echo "TARGET_ABI32=3Dy" >> $config= _target_mak TARGET_SYSTBL_ABI=3Dn32 TARGET_SYSTBL=3Dsyscall_n32.tbl ;; @@ -7511,7 +7511,7 @@ case "$target_name" in mttcg=3D"no" TARGET_ARCH=3Dmips64 TARGET_BASE_ARCH=3Dmips - echo "TARGET_ABI_MIPSN64=3Dy" >> $config_target_mak + test "$target_user_only" =3D yes && echo "TARGET_ABI_MIPSN64=3Dy" >> $= config_target_mak TARGET_SYSTBL_ABI=3Dn64 TARGET_SYSTBL=3Dsyscall_n64.tbl ;; @@ -7547,7 +7547,7 @@ case "$target_name" in TARGET_BASE_ARCH=3Dppc TARGET_ABI_DIR=3Dppc TARGET_SYSTBL_ABI=3Dcommon,nospu,32 - echo "TARGET_ABI32=3Dy" >> $config_target_mak + test "$target_user_only" =3D yes && 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" ;; riscv32) @@ -7585,7 +7585,7 @@ case "$target_name" in TARGET_BASE_ARCH=3Dsparc TARGET_ABI_DIR=3Dsparc TARGET_SYSTBL_ABI=3Dcommon,32 - echo "TARGET_ABI32=3Dy" >> $config_target_mak + test "$target_user_only" =3D yes && echo "TARGET_ABI32=3Dy" >> $config= _target_mak ;; s390x) TARGET_SYSTBL_ABI=3Dcommon,64 @@ -7623,15 +7623,18 @@ upper() { 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 +if test "$target_user_only" =3D "yes" ; then + if [ "$TARGET_ABI_DIR" =3D "" ]; then + TARGET_ABI_DIR=3D$TARGET_ARCH + fi + echo "TARGET_ABI_DIR=3D$TARGET_ABI_DIR" >> $config_target_mak fi -echo "TARGET_ABI_DIR=3D$TARGET_ABI_DIR" >> $config_target_mak -if [ "$TARGET_SYSTBL_ABI" !=3D "" ]; then +if test "$target_linux_user" =3D "yes" ; then + 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 fi - if test "$target_aligned_only" =3D "yes" ; then echo "TARGET_ALIGNED_ONLY=3Dy" >> $config_target_mak fi --=20 2.26.2 From nobody Sun Nov 16 14:04:13 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=1600852604; cv=none; d=zohomail.com; s=zohoarc; b=V6kT6ZVWZY/Z8ftqB4rD/jEyk7JGXj2rIVne+fp/UaOwHhr13v9/wHVlHfkIjabprGSSk97iK5yp8DD0DIiR7lui+ZjACSvtQyH/F7sk80s4X0SbNGrbBHltR04RVDKUxOi4K2lXCjnz1ley3uR8j14Jnuc0497qQ9L/tlouI9M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600852604; h=Content-Type:Content-Transfer-Encoding:Cc: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=ncc0cq1dLrcOLr92X5kR8wiR2zrnTvEdvBDIV8FF3A8=; b=WKZxvDwX7u7OEtQ2UE/FgNxp5OIFGQuATSMiHo6HKVefITWh4wwUfGZHlUsD2+TkMBNDvBLkjmzwfe6u4Gs0fH4vDdUn2RhMLewdkIwrxd35biMHIfJQKFETYulmaDBpHBaiWKydXpzFVgTZdvhU9MrHKCoo82D7xKoXB+Pcu78= 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 1600852604173736.021070809999; Wed, 23 Sep 2020 02:16:44 -0700 (PDT) Received: from localhost ([::1]:41006 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kL0tG-0008LV-I8 for importer@patchew.org; Wed, 23 Sep 2020 05:16:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53100) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL0oY-0001D3-OI for qemu-devel@nongnu.org; Wed, 23 Sep 2020 05:11:51 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:24782) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kL0oR-0002N6-Vu for qemu-devel@nongnu.org; Wed, 23 Sep 2020 05:11:50 -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-366-QD9vAuhkPkaUyPVvOot4tg-1; Wed, 23 Sep 2020 05:11:37 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C17241005E76; Wed, 23 Sep 2020 09:11:36 +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 50F895D9CC; Wed, 23 Sep 2020 09:11:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600852300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ncc0cq1dLrcOLr92X5kR8wiR2zrnTvEdvBDIV8FF3A8=; b=GfD+6XIQy5QbewEBgZsdTK3nis3rRi9qil1oWG90FrFv78tT3I8iB5/FPlf4cTDpQ6zQjv t+RO1KQf15uJAGEMI5o1lNoZJAB474d2p42BmP6n89qB/k1HUhXFKDUWRLVrTBMVFIR9TC /wyHaSIFH2pobdYQpJaLoU5j4NGNqLU= X-MC-Unique: QD9vAuhkPkaUyPVvOot4tg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 08/12] configure: remove target configuration Date: Wed, 23 Sep 2020 05:11:27 -0400 Message-Id: <20200923091131.1591563-9-pbonzini@redhat.com> In-Reply-To: <20200923091131.1591563-1-pbonzini@redhat.com> References: <20200923091131.1591563-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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/23 00:53:58 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.455, 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=0.001, RCVD_IN_MSPIKE_WL=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: , Cc: richard.henderson@linaro.org 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 a pretty large part of the configure script, including the whole logic to detect which accelerators are supported by each target. Signed-off-by: Paolo Bonzini --- configure | 457 +----------------- .../targets/aarch64-linux-user.mak | 5 + default-configs/targets/aarch64-softmmu.mak | 4 + .../targets/aarch64_be-linux-user.mak | 6 + default-configs/targets/alpha-linux-user.mak | 6 + default-configs/targets/alpha-softmmu.mak | 4 + default-configs/targets/arm-linux-user.mak | 7 + default-configs/targets/arm-softmmu.mak | 4 + default-configs/targets/armeb-linux-user.mak | 8 + default-configs/targets/avr-softmmu.mak | 3 + default-configs/targets/cris-linux-user.mak | 3 + default-configs/targets/cris-softmmu.mak | 2 + default-configs/targets/hppa-linux-user.mak | 7 + default-configs/targets/hppa-softmmu.mak | 5 + default-configs/targets/i386-bsd-user.mak | 4 + default-configs/targets/i386-linux-user.mak | 6 + default-configs/targets/i386-softmmu.mak | 4 + default-configs/targets/lm32-softmmu.mak | 3 + default-configs/targets/m68k-linux-user.mak | 8 + default-configs/targets/m68k-softmmu.mak | 4 + .../targets/microblaze-linux-user.mak | 7 + .../targets/microblaze-softmmu.mak | 4 + .../targets/microblazeel-linux-user.mak | 6 + .../targets/microblazeel-softmmu.mak | 3 + default-configs/targets/mips-linux-user.mak | 8 + default-configs/targets/mips-softmmu.mak | 5 + default-configs/targets/mips64-linux-user.mak | 8 + default-configs/targets/mips64-softmmu.mak | 4 + .../targets/mips64el-linux-user.mak | 7 + default-configs/targets/mips64el-softmmu.mak | 3 + default-configs/targets/mipsel-linux-user.mak | 7 + default-configs/targets/mipsel-softmmu.mak | 4 + .../targets/mipsn32-linux-user.mak | 9 + .../targets/mipsn32el-linux-user.mak | 8 + default-configs/targets/moxie-softmmu.mak | 3 + default-configs/targets/nios2-linux-user.mak | 3 + default-configs/targets/nios2-softmmu.mak | 2 + default-configs/targets/or1k-linux-user.mak | 4 + default-configs/targets/or1k-softmmu.mak | 3 + default-configs/targets/ppc-linux-user.mak | 7 + default-configs/targets/ppc-softmmu.mak | 4 + default-configs/targets/ppc64-linux-user.mak | 7 + default-configs/targets/ppc64-softmmu.mak | 5 + .../targets/ppc64abi32-linux-user.mak | 8 + .../targets/ppc64le-linux-user.mak | 6 + .../targets/riscv32-linux-user.mak | 4 + default-configs/targets/riscv32-softmmu.mak | 4 + .../targets/riscv64-linux-user.mak | 4 + default-configs/targets/riscv64-softmmu.mak | 4 + default-configs/targets/rx-softmmu.mak | 3 + default-configs/targets/s390x-linux-user.mak | 7 + default-configs/targets/s390x-softmmu.mak | 5 + default-configs/targets/sh4-linux-user.mak | 7 + default-configs/targets/sh4-softmmu.mak | 3 + default-configs/targets/sh4eb-linux-user.mak | 8 + default-configs/targets/sh4eb-softmmu.mak | 4 + default-configs/targets/sparc-bsd-user.mak | 5 + default-configs/targets/sparc-linux-user.mak | 7 + default-configs/targets/sparc-softmmu.mak | 4 + .../targets/sparc32plus-linux-user.mak | 8 + default-configs/targets/sparc64-bsd-user.mak | 5 + .../targets/sparc64-linux-user.mak | 7 + default-configs/targets/sparc64-softmmu.mak | 4 + default-configs/targets/tilegx-linux-user.mak | 3 + default-configs/targets/tricore-softmmu.mak | 2 + default-configs/targets/unicore32-softmmu.mak | 2 + default-configs/targets/x86_64-bsd-user.mak | 4 + default-configs/targets/x86_64-linux-user.mak | 6 + default-configs/targets/x86_64-softmmu.mak | 4 + default-configs/targets/xtensa-linux-user.mak | 7 + default-configs/targets/xtensa-softmmu.mak | 4 + .../targets/xtensaeb-linux-user.mak | 8 + default-configs/targets/xtensaeb-softmmu.mak | 5 + meson.build | 27 +- 74 files changed, 404 insertions(+), 446 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 5e15b5e1ad..7cff5c0b7a 100755 --- a/configure +++ b/configure @@ -220,108 +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 -} - -deprecated_targets_list=3Dppc64abi32-linux-user,tilegx-linux-user,lm32-sof= tmmu,unicore32-softmmu -deprecated_features=3D"" - -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 - - # if a deprecated target is enabled we note it here - if echo "$deprecated_targets_list" | grep -q "$1"; then - add_to deprecated_features $1 - fi - - 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 } @@ -1705,7 +1603,8 @@ if [ "$bsd_user" =3D "no" -a "$linux_user" =3D "no" -= a "$softmmu" =3D "no" ] ; then fi =20 default_target_list=3D"" - +deprecated_targets_list=3Dppc64abi32-linux-user,tilegx-linux-user,lm32-sof= tmmu,unicore32-softmmu +deprecated_features=3D"" mak_wilds=3D"" =20 if [ "$softmmu" =3D "yes" ]; then @@ -2033,16 +1932,6 @@ if ! compile_prog ; then error_exit "\"$cc\" cannot build an executable (is your linker broken?= )" fi =20 -# Now we have handled --enable-tcg-interpreter and know we're not just -# printing the help message, bail out if the host CPU isn't supported. -if test "$ARCH" =3D "unknown"; then - if test "$tcg_interpreter" =3D "yes" ; then - echo "Unsupported CPU =3D $cpu, will use TCG with TCI (experimenta= l)" - else - error_exit "Unsupported CPU =3D $cpu, try --enable-tcg-interpreter" - fi -fi - # Consult white-list to determine whether to enable werror # by default. Only enable by default for git builds if test -z "$werror" ; then @@ -2294,12 +2183,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 @@ -2311,10 +2201,16 @@ else error_exit "Unknown target name '$target'" ;; esac - supported_target $target || exit 1 done fi =20 +for target in $target_list; do + # if a deprecated target is enabled we note it here + if echo "$deprecated_targets_list" | grep -q "$target"; then + add_to deprecated_features $target + fi +done + # see if system emulation was really requested case " $target_list " in *"-softmmu "*) softmmu=3Dyes @@ -2655,28 +2551,6 @@ if test "$seccomp" !=3D "no" ; then fi fi =20 -########################################## -# simple accelerator probes - -if test "$kvm" !=3D "disabled" ; 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 - kvm=3Ddisabled - 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 @@ -2995,23 +2869,6 @@ if test "$xen_pci_passthrough" !=3D "disabled"; then fi fi =20 -########################################## -# Windows Hypervisor Platform accelerator (WHPX) check -if test "$whpx" !=3D "disabled"; then - if test "$mingw32" =3D yes && test "$ARCH" =3D "x86_64" && - check_include "WinHvPlatform.h" && check_include "WinHvEmulati= on.h"; then - whpx=3D"enabled" - else - if test "$whpx" =3D "enabled"; then - if test "$ARCH" !=3D "x86_64"; then - error_exit "WHPX requires 64-bit host" - fi - feature_not_found "WinHvPlatform" "WinHvEmulation is not insta= lled" - fi - whpx=3D"disabled" - fi -fi - ########################################## # gettext probe if test "$gettext" !=3D "false" ; then @@ -5835,23 +5692,6 @@ fi =20 =20 ################################################# -# Check to see if we have the Hypervisor framework -if [ "$hvf" !=3D "disabled" ] ; then - cat > $TMPC << EOF -#include -int main() { return 0;} -EOF - if test "$darwin" =3D yes && compile_object ""; then - hvf=3D'enabled' - else - if test "$hvf" =3D "enabled"; then - error_exit "Hypervisor.framework not available" - fi - hvf=3D'disabled' - fi -fi - -########################################## # check for sysmacros.h =20 have_sysmacros=3Dno @@ -7386,283 +7226,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 - test "$target_user_only" =3D yes && 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 - test "$target_user_only" =3D yes && echo "TARGET_ABI_MIPSN32=3Dy" >> $= config_target_mak - test "$target_user_only" =3D yes && 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 - test "$target_user_only" =3D yes && 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 - test "$target_user_only" =3D yes && 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" - ;; - 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 - test "$target_user_only" =3D yes && 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 test "$target_user_only" =3D "yes" ; then - if [ "$TARGET_ABI_DIR" =3D "" ]; then - TARGET_ABI_DIR=3D$TARGET_ARCH - fi - echo "TARGET_ABI_DIR=3D$TARGET_ABI_DIR" >> $config_target_mak -fi -if test "$target_linux_user" =3D "yes" ; then - 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 -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 @@ -7672,6 +7242,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..4eff428074 --- /dev/null +++ b/default-configs/targets/aarch64-softmmu.mak @@ -0,0 +1,4 @@ +TARGET_AARCH64=3Dy +TARGET_BASE_ARCH=3Darm +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..8a484c9775 --- /dev/null +++ b/default-configs/targets/alpha-softmmu.mak @@ -0,0 +1,4 @@ +TARGET_ALPHA=3Dy +TARGET_BASE_ARCH=3Dalpha +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..5923f9b203 --- /dev/null +++ b/default-configs/targets/arm-softmmu.mak @@ -0,0 +1,4 @@ +TARGET_ARM=3Dy +TARGET_BASE_ARCH=3Darm +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..46b6da717c --- /dev/null +++ b/default-configs/targets/avr-softmmu.mak @@ -0,0 +1,3 @@ +TARGET_AVR=3Dy +TARGET_BASE_ARCH=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..1f7b44114b --- /dev/null +++ b/default-configs/targets/cris-softmmu.mak @@ -0,0 +1,2 @@ +TARGET_CRIS=3Dy +TARGET_BASE_ARCH=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..c4ee4e6c51 --- /dev/null +++ b/default-configs/targets/hppa-softmmu.mak @@ -0,0 +1,5 @@ +TARGET_HPPA=3Dy +TARGET_BASE_ARCH=3Dhppa +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..c58db819ae --- /dev/null +++ b/default-configs/targets/i386-bsd-user.mak @@ -0,0 +1,4 @@ +TARGET_I386=3Dy +TARGET_BASE_ARCH=3Di386 +TARGET_ABI_DIR=3Di386 +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..4e2eb9f369 --- /dev/null +++ b/default-configs/targets/i386-softmmu.mak @@ -0,0 +1,4 @@ +TARGET_I386=3Dy +TARGET_BASE_ARCH=3Di386 +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..2c4b8eab79 --- /dev/null +++ b/default-configs/targets/lm32-softmmu.mak @@ -0,0 +1,3 @@ +TARGET_LM32=3Dy +TARGET_BASE_ARCH=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..991e626677 --- /dev/null +++ b/default-configs/targets/m68k-softmmu.mak @@ -0,0 +1,4 @@ +TARGET_M68K=3Dy +TARGET_BASE_ARCH=3Dm68k +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..24594862bf --- /dev/null +++ b/default-configs/targets/microblaze-softmmu.mak @@ -0,0 +1,4 @@ +TARGET_MICROBLAZE=3Dy +TARGET_BASE_ARCH=3Dmicroblaze +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..5817a63755 --- /dev/null +++ b/default-configs/targets/microblazeel-softmmu.mak @@ -0,0 +1,3 @@ +TARGET_MICROBLAZE=3Dy +TARGET_BASE_ARCH=3Dmicroblaze +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..1b4bba6e3b --- /dev/null +++ b/default-configs/targets/mips-softmmu.mak @@ -0,0 +1,5 @@ +TARGET_MIPS=3Dy +TARGET_BASE_ARCH=3Dmips +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..736586f01b --- /dev/null +++ b/default-configs/targets/mips64-softmmu.mak @@ -0,0 +1,4 @@ +TARGET_MIPS64=3Dy +TARGET_BASE_ARCH=3Dmips +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..aed4fe89b0 --- /dev/null +++ b/default-configs/targets/mips64el-softmmu.mak @@ -0,0 +1,3 @@ +TARGET_MIPS64=3Dy +TARGET_BASE_ARCH=3Dmips +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..ca95b39d29 --- /dev/null +++ b/default-configs/targets/mipsel-softmmu.mak @@ -0,0 +1,4 @@ +TARGET_MIPS=3Dy +TARGET_BASE_ARCH=3Dmips +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..ada92a6b5b --- /dev/null +++ b/default-configs/targets/moxie-softmmu.mak @@ -0,0 +1,3 @@ +TARGET_MOXIE=3Dy +TARGET_BASE_ARCH=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..f10f08d0ca --- /dev/null +++ b/default-configs/targets/nios2-softmmu.mak @@ -0,0 +1,2 @@ +TARGET_NIOS2=3Dy +TARGET_BASE_ARCH=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..a922266a98 --- /dev/null +++ b/default-configs/targets/or1k-softmmu.mak @@ -0,0 +1,3 @@ +TARGET_OPENRISC=3Dy +TARGET_BASE_ARCH=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..1b6d091cfb --- /dev/null +++ b/default-configs/targets/ppc-softmmu.mak @@ -0,0 +1,4 @@ +TARGET_PPC=3Dy +TARGET_BASE_ARCH=3Dppc +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..e431feffeb --- /dev/null +++ b/default-configs/targets/ppc64-softmmu.mak @@ -0,0 +1,5 @@ +TARGET_PPC64=3Dy +TARGET_BASE_ARCH=3Dppc +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..caa5829af8 --- /dev/null +++ b/default-configs/targets/riscv32-softmmu.mak @@ -0,0 +1,4 @@ +TARGET_RISCV32=3Dy +TARGET_BASE_ARCH=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..e190c0363b --- /dev/null +++ b/default-configs/targets/riscv64-softmmu.mak @@ -0,0 +1,4 @@ +TARGET_RISCV64=3Dy +TARGET_BASE_ARCH=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..37b365475f --- /dev/null +++ b/default-configs/targets/rx-softmmu.mak @@ -0,0 +1,3 @@ +TARGET_RX=3Dy +TARGET_BASE_ARCH=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..f08d25d3c3 --- /dev/null +++ b/default-configs/targets/s390x-softmmu.mak @@ -0,0 +1,5 @@ +TARGET_S390X=3Dy +TARGET_BASE_ARCH=3Ds390x +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..8c7e9eaa7b --- /dev/null +++ b/default-configs/targets/sh4-softmmu.mak @@ -0,0 +1,3 @@ +TARGET_SH4=3Dy +TARGET_BASE_ARCH=3Dsh4 +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..f1848b89b6 --- /dev/null +++ b/default-configs/targets/sh4eb-softmmu.mak @@ -0,0 +1,4 @@ +TARGET_SH4=3Dy +TARGET_BASE_ARCH=3Dsh4 +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..f478255591 --- /dev/null +++ b/default-configs/targets/sparc-bsd-user.mak @@ -0,0 +1,5 @@ +TARGET_SPARC=3Dy +TARGET_BASE_ARCH=3Dsparc +TARGET_ABI_DIR=3Dsparc +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..fb3dbb0d61 --- /dev/null +++ b/default-configs/targets/sparc-softmmu.mak @@ -0,0 +1,4 @@ +TARGET_SPARC=3Dy +TARGET_BASE_ARCH=3Dsparc +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..0ae8ea5420 --- /dev/null +++ b/default-configs/targets/sparc64-bsd-user.mak @@ -0,0 +1,5 @@ +TARGET_SPARC64=3Dy +TARGET_BASE_ARCH=3Dsparc +TARGET_ABI_DIR=3Dsparc64 +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..bc07bfdb0a --- /dev/null +++ b/default-configs/targets/sparc64-softmmu.mak @@ -0,0 +1,4 @@ +TARGET_SPARC64=3Dy +TARGET_BASE_ARCH=3Dsparc +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..a29aa2d6dd --- /dev/null +++ b/default-configs/targets/tricore-softmmu.mak @@ -0,0 +1,2 @@ +TARGET_TRICORE=3Dy +TARGET_BASE_ARCH=3Dtricore diff --git a/default-configs/targets/unicore32-softmmu.mak b/default-config= s/targets/unicore32-softmmu.mak new file mode 100644 index 0000000000..85f37dc88f --- /dev/null +++ b/default-configs/targets/unicore32-softmmu.mak @@ -0,0 +1,2 @@ +TARGET_UNICORE32=3Dy +TARGET_BASE_ARCH=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..935b10e22c --- /dev/null +++ b/default-configs/targets/x86_64-bsd-user.mak @@ -0,0 +1,4 @@ +TARGET_X86_64=3Dy +TARGET_BASE_ARCH=3Di386 +TARGET_ABI_DIR=3Dx86_64 +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..377c63e823 --- /dev/null +++ b/default-configs/targets/x86_64-softmmu.mak @@ -0,0 +1,4 @@ +TARGET_X86_64=3Dy +TARGET_BASE_ARCH=3Di386 +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..96f892c4a8 --- /dev/null +++ b/default-configs/targets/xtensa-softmmu.mak @@ -0,0 +1,4 @@ +TARGET_XTENSA=3Dy +TARGET_BASE_ARCH=3Dxtensa +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..e6f53a1272 --- /dev/null +++ b/default-configs/targets/xtensaeb-softmmu.mak @@ -0,0 +1,5 @@ +TARGET_XTENSA=3Dy +TARGET_BASE_ARCH=3Dxtensa +TARGET_ALIGNED_ONLY=3Dy +TARGET_WORDS_BIGENDIAN=3Dy +TARGET_SUPPORTS_MTTCG=3Dy diff --git a/meson.build b/meson.build index 3bd8cbacb7..d25ead3ad5 100644 --- a/meson.build +++ b/meson.build @@ -721,13 +721,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' } @@ -751,8 +763,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 @@ -814,6 +832,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" @@ -1599,7 +1618,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 14:04:13 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=1600853352; cv=none; d=zohomail.com; s=zohoarc; b=OOWAOYnzBo249bqfbBQXXosioIkNgTL/BwBuCTAc5QAYa7veYEfwclap0RNOW4tm3msbXrWM0ag+J+0Li6nXjfu8IdUrHdrEDyYNegLS5WBZWgcmExP+JJV06FKeEI/nMi781OMgicsSDhK9DYmsf0apB2mDCl5AjZwaBoBP5Xw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600853352; h=Content-Type:Content-Transfer-Encoding:Cc: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=lRy78wi81e0HPyZlG/dvMzciMCmxQ8c5hhqoGOEyqJI=; b=QeKTVqRwwMFRrEDgJJgbsiwV4Al5Ie7S+EUkDRN+B0VY54oii9uRS4X8dNQ7RjNoNqdaPbMlhLWLCj2T6iHfQbCv72dw2CPmrg1vJazIMWwS+ZwrM577a+MztJNhdUR0ZPXxOqYhmLFkd9LUu//nJAjT9XfjvwJ302VMXtLxW3M= 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 1600853352951741.7639965997017; Wed, 23 Sep 2020 02:29:12 -0700 (PDT) Received: from localhost ([::1]:45846 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kL15L-0005w9-BJ for importer@patchew.org; Wed, 23 Sep 2020 05:29:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53152) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL0od-0001HW-2h for qemu-devel@nongnu.org; Wed, 23 Sep 2020 05:11:55 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:56490) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kL0oS-0002N7-Im for qemu-devel@nongnu.org; Wed, 23 Sep 2020 05:11:54 -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-327-ad-jg7YYPQiNU-ptmVv_rQ-1; Wed, 23 Sep 2020 05:11:38 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5133A425EE; Wed, 23 Sep 2020 09:11:37 +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 E96C05D9CC; Wed, 23 Sep 2020 09:11:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600852300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lRy78wi81e0HPyZlG/dvMzciMCmxQ8c5hhqoGOEyqJI=; b=ANy0jQFgOrgIKasnPGALcM7jWP7frrD5VLCibgmbgiENcmLEewQYwuX3FjZrJUBj1jmP9C 5XPx++MSJ1ZWmOJoqUFT5eKwCnWp2vFWxjYtEz0ZovzPkP2JMGV6jcwdXGT/2sDkwb+FtR xcflkzLZFMPpumcv4rkx6SmNGFs0ymo= X-MC-Unique: ad-jg7YYPQiNU-ptmVv_rQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 09/12] default-configs: remove default-configs/devices for user-mode targets Date: Wed, 23 Sep 2020 05:11:28 -0400 Message-Id: <20200923091131.1591563-10-pbonzini@redhat.com> In-Reply-To: <20200923091131.1591563-1-pbonzini@redhat.com> References: <20200923091131.1591563-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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=216.205.24.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/22 23:02:20 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.455, 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=0.001, RCVD_IN_MSPIKE_WL=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: , Cc: richard.henderson@linaro.org 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 7cff5c0b7a..6e60de3e07 100755 --- a/configure +++ b/configure @@ -1608,13 +1608,13 @@ deprecated_features=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 the user doesn't explicitly specify a deprecated target we will 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 From nobody Sun Nov 16 14:04:13 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=1600853008; cv=none; d=zohomail.com; s=zohoarc; b=aHieOLW8or9Ntkmv6hKpXb9NGUggudO4oNvFYZetvR/5jY47LxyZWcF/1shGZUL5T5qomvd8M0GWcf54bplONkEcCYrz2XYkFzJT3VRhU6QelPJrsdwo14ZbOkabboJe/qN9wc3AVejYGskkU4rts5+ZgSWpCRvLRJzsACy3GX0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600853008; h=Content-Type:Content-Transfer-Encoding:Cc: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=Zol1UWcSpKQ8U9Job7N6WZnjxvZkufjGjnAueQatn84=; b=PiJssfd8OJN/3SOr97F9MCug37NCoqPTv7VVdXNblPcyJ7hZTFOTlO0nRt2a2YUl0T25VZwDD1QR9ChQunAu0+rcHkKxi6vkdDFQnASvmkJgbtP0aNm4GSoWfaAMNpMzTRGpDHbtXf9wUPcSHtM30fD6WikE3S77NlUk1L3+Yco= 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 1600853008343678.2819790934442; Wed, 23 Sep 2020 02:23:28 -0700 (PDT) Received: from localhost ([::1]:58922 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kL0zm-0007dH-0b for importer@patchew.org; Wed, 23 Sep 2020 05:23:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53134) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL0ob-0001FZ-RQ for qemu-devel@nongnu.org; Wed, 23 Sep 2020 05:11:54 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:59617) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kL0oS-0002NK-Jz for qemu-devel@nongnu.org; Wed, 23 Sep 2020 05:11:53 -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-422-11yM0X-1NKCTnXLYL3MXNw-1; Wed, 23 Sep 2020 05:11:39 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 217331005E72; Wed, 23 Sep 2020 09:11:38 +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 C5A0919D61; Wed, 23 Sep 2020 09:11:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600852300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Zol1UWcSpKQ8U9Job7N6WZnjxvZkufjGjnAueQatn84=; b=OPqVuKMCwrxSAKZLluDReOokuAU9sdzGiZfXPHETV+pbtBqfA0wpKg+tfg4a+8zlzymJK9 hGxytBEFCpKTzl+I0WkHm8BY7uG1K5kRaS2UVgXmPGHaSEcfz39Hz8RyLik0TadNiIcUPn uKS+wiyKAHmOwlZtbtBWLliivPcWCr4= X-MC-Unique: 11yM0X-1NKCTnXLYL3MXNw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 10/12] configure: move OpenBSD W^X test to meson Date: Wed, 23 Sep 2020 05:11:29 -0400 Message-Id: <20200923091131.1591563-11-pbonzini@redhat.com> In-Reply-To: <20200923091131.1591563-1-pbonzini@redhat.com> References: <20200923091131.1591563-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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/23 00:53:58 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.455, 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=0.001, RCVD_IN_MSPIKE_WL=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: , Cc: richard.henderson@linaro.org 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 TCG option is now passed through to Meson. Signed-off-by: Paolo Bonzini --- configure | 15 --------------- meson.build | 8 +++++++- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/configure b/configure index 6e60de3e07..fb450858ff 100755 --- a/configure +++ b/configure @@ -1598,10 +1598,6 @@ if [ "$ARCH" =3D "unknown" ]; then linux_user=3D"no" fi =20 -if [ "$bsd_user" =3D "no" -a "$linux_user" =3D "no" -a "$softmmu" =3D "no"= ] ; then - tcg=3D"disabled" -fi - default_target_list=3D"" deprecated_targets_list=3Dppc64abi32-linux-user,tilegx-linux-user,lm32-sof= tmmu,unicore32-softmmu deprecated_features=3D"" @@ -6062,17 +6058,6 @@ if test "$mingw32" =3D "yes" ; then done fi =20 -# Disable OpenBSD W^X if available -if test "$tcg" =3D "enabled" && test "$targetos" =3D "OpenBSD"; then - cat > $TMPC < 0 + # Disable OpenBSD W^X if available + emulator_link_args =3D cc.get_supported_link_arguments('-Wl,-z,wxneede= d') + endif endif =20 accelerators =3D [] @@ -1231,7 +1237,7 @@ foreach target : target_dirs c_args =3D ['-DNEED_CPU_H', '-DCONFIG_TARGET=3D"@0@-config-target.h"'.format(target), '-DCONFIG_DEVICES=3D"@0@-config-devices.h"'.format(target)] - link_args =3D [] + link_args =3D emulator_link_args =20 config_target +=3D config_host target_inc =3D [include_directories('target' / config_target['TARGET_BAS= E_ARCH'])] --=20 2.26.2 From nobody Sun Nov 16 14:04:13 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=1600852942; cv=none; d=zohomail.com; s=zohoarc; b=MoCApHu9H3MLkMrpxwzItdbMjRFHvjR+6zGLKqrw4wzVGv9vW2qc7ZiNP9RXQOH6jFSW+4ZEdyok4uImsXKYd1D6I1jzWCsYWkiKGp7mIX/3odIIwktA9TeEpZCoyaXDW9guOh4PLwzsMX2XqGCxlOl5hjuonVu7Za0vssAv6tk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600852942; h=Content-Type:Content-Transfer-Encoding:Cc: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=Jkd5ktT5EpvNd2Ga6GP928W6rEReNskIsAszNfkSxzo=; b=dT4DQjTcNgjR/TCMpLZa76nP9LGv1CKoQmd7XhT8lq6gzAMPyBQ68OA7fpxz3HvfX+VWsicKxZJtJi0B54aKSB/GUYTsM1E+SEOdER+jYw2G9w0N6ePUmtBJ1SD4nQ0I8/QdVieHyConHtFk7A9E5Jm3gu4Xoe+3TBwnDmo48xM= 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 1600852942550675.7349044601881; Wed, 23 Sep 2020 02:22:22 -0700 (PDT) Received: from localhost ([::1]:56594 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kL0yj-0006b5-1B for importer@patchew.org; Wed, 23 Sep 2020 05:22:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53112) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL0oZ-0001Dt-RL for qemu-devel@nongnu.org; Wed, 23 Sep 2020 05:11:51 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:56613) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kL0oR-0002NS-Vq for qemu-devel@nongnu.org; Wed, 23 Sep 2020 05:11:51 -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-78-M-cCxhibOVCpcEfrdZErIA-1; Wed, 23 Sep 2020 05:11:39 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A995A192AB65; Wed, 23 Sep 2020 09:11:38 +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 4475E19C4F; Wed, 23 Sep 2020 09:11:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600852302; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Jkd5ktT5EpvNd2Ga6GP928W6rEReNskIsAszNfkSxzo=; b=Loqc++zQnuLAVVZBQdCjfcJCqJ9QJn9dh8Hgos6B2OyAYoK+lJ1Fd7OL5qvXxvVJW6bIMb j3CjKeAfedqCfyV6uKSJJ5riXNcOLeo/Wzxp1+AIVSjVmThVUrU/vpOcwdAQNeHeJHQzjF tBE39q+QcjZVYFd2F2kjng+fPq7vDkQ= X-MC-Unique: M-cCxhibOVCpcEfrdZErIA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 11/12] default-configs: use TARGET_ARCH key Date: Wed, 23 Sep 2020 05:11:30 -0400 Message-Id: <20200923091131.1591563-12-pbonzini@redhat.com> In-Reply-To: <20200923091131.1591563-1-pbonzini@redhat.com> References: <20200923091131.1591563-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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/23 00:53:58 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.455, 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=0.001, RCVD_IN_MSPIKE_WL=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: , Cc: richard.henderson@linaro.org 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" Replace the individual TARGET_*=3Dy lines with TARGET_ARCH, similar to how TARGET_BASE_ARCH is handled already. Signed-off-by: Paolo Bonzini --- default-configs/targets/aarch64-linux-user.mak | 2 +- default-configs/targets/aarch64-softmmu.mak | 2 +- default-configs/targets/aarch64_be-linux-user.mak | 2 +- default-configs/targets/alpha-linux-user.mak | 2 +- default-configs/targets/alpha-softmmu.mak | 2 +- default-configs/targets/arm-linux-user.mak | 2 +- default-configs/targets/arm-softmmu.mak | 2 +- default-configs/targets/armeb-linux-user.mak | 2 +- default-configs/targets/avr-softmmu.mak | 2 +- default-configs/targets/cris-linux-user.mak | 2 +- default-configs/targets/cris-softmmu.mak | 2 +- default-configs/targets/hppa-linux-user.mak | 2 +- default-configs/targets/hppa-softmmu.mak | 2 +- default-configs/targets/i386-bsd-user.mak | 2 +- default-configs/targets/i386-linux-user.mak | 2 +- default-configs/targets/i386-softmmu.mak | 2 +- default-configs/targets/lm32-softmmu.mak | 2 +- default-configs/targets/m68k-linux-user.mak | 2 +- default-configs/targets/m68k-softmmu.mak | 2 +- default-configs/targets/microblaze-linux-user.mak | 2 +- default-configs/targets/microblaze-softmmu.mak | 2 +- default-configs/targets/microblazeel-linux-user.mak | 2 +- default-configs/targets/microblazeel-softmmu.mak | 2 +- default-configs/targets/mips-linux-user.mak | 2 +- default-configs/targets/mips-softmmu.mak | 2 +- default-configs/targets/mips64-linux-user.mak | 2 +- default-configs/targets/mips64-softmmu.mak | 2 +- default-configs/targets/mips64el-linux-user.mak | 2 +- default-configs/targets/mips64el-softmmu.mak | 2 +- default-configs/targets/mipsel-linux-user.mak | 2 +- default-configs/targets/mipsel-softmmu.mak | 2 +- default-configs/targets/mipsn32-linux-user.mak | 2 +- default-configs/targets/mipsn32el-linux-user.mak | 2 +- default-configs/targets/moxie-softmmu.mak | 2 +- default-configs/targets/nios2-linux-user.mak | 2 +- default-configs/targets/nios2-softmmu.mak | 2 +- default-configs/targets/or1k-linux-user.mak | 2 +- default-configs/targets/or1k-softmmu.mak | 2 +- default-configs/targets/ppc-linux-user.mak | 2 +- default-configs/targets/ppc-softmmu.mak | 2 +- default-configs/targets/ppc64-linux-user.mak | 2 +- default-configs/targets/ppc64-softmmu.mak | 2 +- default-configs/targets/ppc64abi32-linux-user.mak | 2 +- default-configs/targets/ppc64le-linux-user.mak | 2 +- default-configs/targets/riscv32-linux-user.mak | 2 +- default-configs/targets/riscv32-softmmu.mak | 2 +- default-configs/targets/riscv64-linux-user.mak | 2 +- default-configs/targets/riscv64-softmmu.mak | 2 +- default-configs/targets/rx-softmmu.mak | 2 +- default-configs/targets/s390x-linux-user.mak | 2 +- default-configs/targets/s390x-softmmu.mak | 2 +- default-configs/targets/sh4-linux-user.mak | 2 +- default-configs/targets/sh4-softmmu.mak | 2 +- default-configs/targets/sh4eb-linux-user.mak | 2 +- default-configs/targets/sh4eb-softmmu.mak | 2 +- default-configs/targets/sparc-bsd-user.mak | 2 +- default-configs/targets/sparc-linux-user.mak | 2 +- default-configs/targets/sparc-softmmu.mak | 2 +- default-configs/targets/sparc32plus-linux-user.mak | 2 +- default-configs/targets/sparc64-bsd-user.mak | 2 +- default-configs/targets/sparc64-linux-user.mak | 2 +- default-configs/targets/sparc64-softmmu.mak | 2 +- default-configs/targets/tilegx-linux-user.mak | 2 +- default-configs/targets/tricore-softmmu.mak | 2 +- default-configs/targets/unicore32-softmmu.mak | 2 +- default-configs/targets/x86_64-bsd-user.mak | 2 +- default-configs/targets/x86_64-linux-user.mak | 2 +- default-configs/targets/x86_64-softmmu.mak | 2 +- default-configs/targets/xtensa-linux-user.mak | 2 +- default-configs/targets/xtensa-softmmu.mak | 2 +- default-configs/targets/xtensaeb-linux-user.mak | 2 +- default-configs/targets/xtensaeb-softmmu.mak | 2 +- meson.build | 9 ++++++--- 73 files changed, 78 insertions(+), 75 deletions(-) diff --git a/default-configs/targets/aarch64-linux-user.mak b/default-confi= gs/targets/aarch64-linux-user.mak index 4495e86509..d6c4a35c39 100644 --- a/default-configs/targets/aarch64-linux-user.mak +++ b/default-configs/targets/aarch64-linux-user.mak @@ -1,4 +1,4 @@ -TARGET_AARCH64=3Dy +TARGET_ARCH=3Daarch64 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 diff --git a/default-configs/targets/aarch64-softmmu.mak b/default-configs/= targets/aarch64-softmmu.mak index 4eff428074..a8c0174fc3 100644 --- a/default-configs/targets/aarch64-softmmu.mak +++ b/default-configs/targets/aarch64-softmmu.mak @@ -1,4 +1,4 @@ -TARGET_AARCH64=3Dy +TARGET_ARCH=3Daarch64 TARGET_BASE_ARCH=3Darm 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 index da13693d3d..5e2d615c11 100644 --- a/default-configs/targets/aarch64_be-linux-user.mak +++ b/default-configs/targets/aarch64_be-linux-user.mak @@ -1,4 +1,4 @@ -TARGET_AARCH64=3Dy +TARGET_ARCH=3Daarch64 TARGET_BASE_ARCH=3Darm TARGET_ABI_DIR=3Daarch64 TARGET_WORDS_BIGENDIAN=3Dy diff --git a/default-configs/targets/alpha-linux-user.mak b/default-configs= /targets/alpha-linux-user.mak index 5ff89f5d48..e21f7cdefd 100644 --- a/default-configs/targets/alpha-linux-user.mak +++ b/default-configs/targets/alpha-linux-user.mak @@ -1,4 +1,4 @@ -TARGET_ALPHA=3Dy +TARGET_ARCH=3Dalpha TARGET_BASE_ARCH=3Dalpha TARGET_ABI_DIR=3Dalpha TARGET_SYSTBL_ABI=3Dcommon diff --git a/default-configs/targets/alpha-softmmu.mak b/default-configs/ta= rgets/alpha-softmmu.mak index 8a484c9775..8ba1b4e403 100644 --- a/default-configs/targets/alpha-softmmu.mak +++ b/default-configs/targets/alpha-softmmu.mak @@ -1,4 +1,4 @@ -TARGET_ALPHA=3Dy +TARGET_ARCH=3Dalpha TARGET_BASE_ARCH=3Dalpha 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 index 7c54c3c2a2..1b9bac9d3a 100644 --- a/default-configs/targets/arm-linux-user.mak +++ b/default-configs/targets/arm-linux-user.mak @@ -1,4 +1,4 @@ -TARGET_ARM=3Dy +TARGET_ARCH=3Darm TARGET_BASE_ARCH=3Darm TARGET_ABI_DIR=3Darm TARGET_SYSTBL_ABI=3Dcommon,oabi diff --git a/default-configs/targets/arm-softmmu.mak b/default-configs/targ= ets/arm-softmmu.mak index 5923f9b203..8af1d3ee1d 100644 --- a/default-configs/targets/arm-softmmu.mak +++ b/default-configs/targets/arm-softmmu.mak @@ -1,4 +1,4 @@ -TARGET_ARM=3Dy +TARGET_ARCH=3Darm TARGET_BASE_ARCH=3Darm 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 index 1882aa472d..d2b0d9e26e 100644 --- a/default-configs/targets/armeb-linux-user.mak +++ b/default-configs/targets/armeb-linux-user.mak @@ -1,4 +1,4 @@ -TARGET_ARM=3Dy +TARGET_ARCH=3Darm TARGET_BASE_ARCH=3Darm TARGET_ABI_DIR=3Darm TARGET_SYSTBL_ABI=3Dcommon,oabi diff --git a/default-configs/targets/avr-softmmu.mak b/default-configs/targ= ets/avr-softmmu.mak index 46b6da717c..547c2986b6 100644 --- a/default-configs/targets/avr-softmmu.mak +++ b/default-configs/targets/avr-softmmu.mak @@ -1,3 +1,3 @@ -TARGET_AVR=3Dy +TARGET_ARCH=3Davr TARGET_BASE_ARCH=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 index ba61135172..7d3f6eb36d 100644 --- a/default-configs/targets/cris-linux-user.mak +++ b/default-configs/targets/cris-linux-user.mak @@ -1,3 +1,3 @@ -TARGET_CRIS=3Dy +TARGET_ARCH=3Dcris 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 index 1f7b44114b..a132cec8d9 100644 --- a/default-configs/targets/cris-softmmu.mak +++ b/default-configs/targets/cris-softmmu.mak @@ -1,2 +1,2 @@ -TARGET_CRIS=3Dy +TARGET_ARCH=3Dcris TARGET_BASE_ARCH=3Dcris diff --git a/default-configs/targets/hppa-linux-user.mak b/default-configs/= targets/hppa-linux-user.mak index 94222e8fc6..05ef4568ad 100644 --- a/default-configs/targets/hppa-linux-user.mak +++ b/default-configs/targets/hppa-linux-user.mak @@ -1,4 +1,4 @@ -TARGET_HPPA=3Dy +TARGET_ARCH=3Dhppa TARGET_BASE_ARCH=3Dhppa TARGET_ABI_DIR=3Dhppa TARGET_SYSTBL_ABI=3Dcommon,32 diff --git a/default-configs/targets/hppa-softmmu.mak b/default-configs/tar= gets/hppa-softmmu.mak index c4ee4e6c51..bd7eaaf9a5 100644 --- a/default-configs/targets/hppa-softmmu.mak +++ b/default-configs/targets/hppa-softmmu.mak @@ -1,4 +1,4 @@ -TARGET_HPPA=3Dy +TARGET_ARCH=3Dhppa TARGET_BASE_ARCH=3Dhppa TARGET_ALIGNED_ONLY=3Dy TARGET_WORDS_BIGENDIAN=3Dy diff --git a/default-configs/targets/i386-bsd-user.mak b/default-configs/ta= rgets/i386-bsd-user.mak index c58db819ae..aa4d8c55e1 100644 --- a/default-configs/targets/i386-bsd-user.mak +++ b/default-configs/targets/i386-bsd-user.mak @@ -1,4 +1,4 @@ -TARGET_I386=3Dy +TARGET_ARCH=3Di386 TARGET_BASE_ARCH=3Di386 TARGET_ABI_DIR=3Di386 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 index 34b52e9ee2..5117f59222 100644 --- a/default-configs/targets/i386-linux-user.mak +++ b/default-configs/targets/i386-linux-user.mak @@ -1,4 +1,4 @@ -TARGET_I386=3Dy +TARGET_ARCH=3Di386 TARGET_BASE_ARCH=3Di386 TARGET_ABI_DIR=3Di386 TARGET_SYSTBL_ABI=3Di386 diff --git a/default-configs/targets/i386-softmmu.mak b/default-configs/tar= gets/i386-softmmu.mak index 4e2eb9f369..7371e87982 100644 --- a/default-configs/targets/i386-softmmu.mak +++ b/default-configs/targets/i386-softmmu.mak @@ -1,4 +1,4 @@ -TARGET_I386=3Dy +TARGET_ARCH=3Di386 TARGET_BASE_ARCH=3Di386 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 2c4b8eab79..6e55873788 100644 --- a/default-configs/targets/lm32-softmmu.mak +++ b/default-configs/targets/lm32-softmmu.mak @@ -1,3 +1,3 @@ -TARGET_LM32=3Dy +TARGET_ARCH=3Dlm32 TARGET_BASE_ARCH=3Dlm32 TARGET_WORDS_BIGENDIAN=3Dy diff --git a/default-configs/targets/m68k-linux-user.mak b/default-configs/= targets/m68k-linux-user.mak index e7c0af5881..186d1117cf 100644 --- a/default-configs/targets/m68k-linux-user.mak +++ b/default-configs/targets/m68k-linux-user.mak @@ -1,4 +1,4 @@ -TARGET_M68K=3Dy +TARGET_ARCH=3Dm68k TARGET_BASE_ARCH=3Dm68k TARGET_ABI_DIR=3Dm68k TARGET_SYSTBL_ABI=3Dcommon diff --git a/default-configs/targets/m68k-softmmu.mak b/default-configs/tar= gets/m68k-softmmu.mak index 991e626677..fd8975978c 100644 --- a/default-configs/targets/m68k-softmmu.mak +++ b/default-configs/targets/m68k-softmmu.mak @@ -1,4 +1,4 @@ -TARGET_M68K=3Dy +TARGET_ARCH=3Dm68k TARGET_BASE_ARCH=3Dm68k 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 index 809819424d..249a22295a 100644 --- a/default-configs/targets/microblaze-linux-user.mak +++ b/default-configs/targets/microblaze-linux-user.mak @@ -1,4 +1,4 @@ -TARGET_MICROBLAZE=3Dy +TARGET_ARCH=3Dmicroblaze TARGET_BASE_ARCH=3Dmicroblaze TARGET_ABI_DIR=3Dmicroblaze TARGET_SYSTBL_ABI=3Dcommon diff --git a/default-configs/targets/microblaze-softmmu.mak b/default-confi= gs/targets/microblaze-softmmu.mak index 24594862bf..8e5126f0f1 100644 --- a/default-configs/targets/microblaze-softmmu.mak +++ b/default-configs/targets/microblaze-softmmu.mak @@ -1,4 +1,4 @@ -TARGET_MICROBLAZE=3Dy +TARGET_ARCH=3Dmicroblaze TARGET_BASE_ARCH=3Dmicroblaze 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 index 416b42eeb6..f59156c63b 100644 --- a/default-configs/targets/microblazeel-linux-user.mak +++ b/default-configs/targets/microblazeel-linux-user.mak @@ -1,4 +1,4 @@ -TARGET_MICROBLAZE=3Dy +TARGET_ARCH=3Dmicroblaze TARGET_BASE_ARCH=3Dmicroblaze TARGET_ABI_DIR=3Dmicroblaze TARGET_SYSTBL_ABI=3Dcommon diff --git a/default-configs/targets/microblazeel-softmmu.mak b/default-con= figs/targets/microblazeel-softmmu.mak index 5817a63755..2d465cf6b4 100644 --- a/default-configs/targets/microblazeel-softmmu.mak +++ b/default-configs/targets/microblazeel-softmmu.mak @@ -1,3 +1,3 @@ -TARGET_MICROBLAZE=3Dy +TARGET_ARCH=3Dmicroblaze TARGET_BASE_ARCH=3Dmicroblaze TARGET_SUPPORTS_MTTCG=3Dy diff --git a/default-configs/targets/mips-linux-user.mak b/default-configs/= targets/mips-linux-user.mak index bcfff16a7b..5b8000dfb0 100644 --- a/default-configs/targets/mips-linux-user.mak +++ b/default-configs/targets/mips-linux-user.mak @@ -1,5 +1,5 @@ +TARGET_ARCH=3Dmips TARGET_ABI_MIPSO32=3Dy -TARGET_MIPS=3Dy TARGET_BASE_ARCH=3Dmips TARGET_ABI_DIR=3Dmips TARGET_SYSTBL_ABI=3Do32 diff --git a/default-configs/targets/mips-softmmu.mak b/default-configs/tar= gets/mips-softmmu.mak index 1b4bba6e3b..e391801a0e 100644 --- a/default-configs/targets/mips-softmmu.mak +++ b/default-configs/targets/mips-softmmu.mak @@ -1,4 +1,4 @@ -TARGET_MIPS=3Dy +TARGET_ARCH=3Dmips TARGET_BASE_ARCH=3Dmips TARGET_ALIGNED_ONLY=3Dy TARGET_WORDS_BIGENDIAN=3Dy diff --git a/default-configs/targets/mips64-linux-user.mak b/default-config= s/targets/mips64-linux-user.mak index c02c5460a7..811df35427 100644 --- a/default-configs/targets/mips64-linux-user.mak +++ b/default-configs/targets/mips64-linux-user.mak @@ -1,5 +1,5 @@ +TARGET_ARCH=3Dmips64 TARGET_ABI_MIPSN64=3Dy -TARGET_MIPS64=3Dy TARGET_BASE_ARCH=3Dmips TARGET_ABI_DIR=3Dmips64 TARGET_SYSTBL_ABI=3Dn64 diff --git a/default-configs/targets/mips64-softmmu.mak b/default-configs/t= argets/mips64-softmmu.mak index 736586f01b..ece25b9624 100644 --- a/default-configs/targets/mips64-softmmu.mak +++ b/default-configs/targets/mips64-softmmu.mak @@ -1,4 +1,4 @@ -TARGET_MIPS64=3Dy +TARGET_ARCH=3Dmips64 TARGET_BASE_ARCH=3Dmips 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 index 8cbbc38e78..f9de5d7857 100644 --- a/default-configs/targets/mips64el-linux-user.mak +++ b/default-configs/targets/mips64el-linux-user.mak @@ -1,5 +1,5 @@ +TARGET_ARCH=3Dmips64 TARGET_ABI_MIPSN64=3Dy -TARGET_MIPS64=3Dy TARGET_BASE_ARCH=3Dmips TARGET_ABI_DIR=3Dmips64 TARGET_SYSTBL_ABI=3Dn64 diff --git a/default-configs/targets/mips64el-softmmu.mak b/default-configs= /targets/mips64el-softmmu.mak index aed4fe89b0..b751ae1bcf 100644 --- a/default-configs/targets/mips64el-softmmu.mak +++ b/default-configs/targets/mips64el-softmmu.mak @@ -1,3 +1,3 @@ -TARGET_MIPS64=3Dy +TARGET_ARCH=3Dmips64 TARGET_BASE_ARCH=3Dmips TARGET_ALIGNED_ONLY=3Dy diff --git a/default-configs/targets/mipsel-linux-user.mak b/default-config= s/targets/mipsel-linux-user.mak index 26aa9c8279..11c3556665 100644 --- a/default-configs/targets/mipsel-linux-user.mak +++ b/default-configs/targets/mipsel-linux-user.mak @@ -1,5 +1,5 @@ +TARGET_ARCH=3Dmips TARGET_ABI_MIPSO32=3Dy -TARGET_MIPS=3Dy TARGET_BASE_ARCH=3Dmips TARGET_ABI_DIR=3Dmips TARGET_SYSTBL_ABI=3Do32 diff --git a/default-configs/targets/mipsel-softmmu.mak b/default-configs/t= argets/mipsel-softmmu.mak index ca95b39d29..a9fc3b2647 100644 --- a/default-configs/targets/mipsel-softmmu.mak +++ b/default-configs/targets/mipsel-softmmu.mak @@ -1,4 +1,4 @@ -TARGET_MIPS=3Dy +TARGET_ARCH=3Dmips TARGET_BASE_ARCH=3Dmips 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 index 81d548e699..040022ce87 100644 --- a/default-configs/targets/mipsn32-linux-user.mak +++ b/default-configs/targets/mipsn32-linux-user.mak @@ -1,6 +1,6 @@ +TARGET_ARCH=3Dmips64 TARGET_ABI_MIPSN32=3Dy TARGET_ABI32=3Dy -TARGET_MIPS64=3Dy TARGET_BASE_ARCH=3Dmips TARGET_ABI_DIR=3Dmips64 TARGET_SYSTBL_ABI=3Dn32 diff --git a/default-configs/targets/mipsn32el-linux-user.mak b/default-con= figs/targets/mipsn32el-linux-user.mak index 6de47f2a79..faeca7752e 100644 --- a/default-configs/targets/mipsn32el-linux-user.mak +++ b/default-configs/targets/mipsn32el-linux-user.mak @@ -1,6 +1,6 @@ +TARGET_ARCH=3Dmips64 TARGET_ABI_MIPSN32=3Dy TARGET_ABI32=3Dy -TARGET_MIPS64=3Dy TARGET_BASE_ARCH=3Dmips TARGET_ABI_DIR=3Dmips64 TARGET_SYSTBL_ABI=3Dn32 diff --git a/default-configs/targets/moxie-softmmu.mak b/default-configs/ta= rgets/moxie-softmmu.mak index ada92a6b5b..b9d8d97031 100644 --- a/default-configs/targets/moxie-softmmu.mak +++ b/default-configs/targets/moxie-softmmu.mak @@ -1,3 +1,3 @@ -TARGET_MOXIE=3Dy +TARGET_ARCH=3Dmoxie TARGET_BASE_ARCH=3Dmoxie TARGET_WORDS_BIGENDIAN=3Dy diff --git a/default-configs/targets/nios2-linux-user.mak b/default-configs= /targets/nios2-linux-user.mak index a2308a16aa..57ddc32838 100644 --- a/default-configs/targets/nios2-linux-user.mak +++ b/default-configs/targets/nios2-linux-user.mak @@ -1,3 +1,3 @@ -TARGET_NIOS2=3Dy +TARGET_ARCH=3Dnios2 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 index f10f08d0ca..787d1d1be1 100644 --- a/default-configs/targets/nios2-softmmu.mak +++ b/default-configs/targets/nios2-softmmu.mak @@ -1,2 +1,2 @@ -TARGET_NIOS2=3Dy +TARGET_ARCH=3Dnios2 TARGET_BASE_ARCH=3Dnios2 diff --git a/default-configs/targets/or1k-linux-user.mak b/default-configs/= targets/or1k-linux-user.mak index 2f5ff844df..88175f039b 100644 --- a/default-configs/targets/or1k-linux-user.mak +++ b/default-configs/targets/or1k-linux-user.mak @@ -1,4 +1,4 @@ -TARGET_OPENRISC=3Dy +TARGET_ARCH=3Dopenrisc 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 index a922266a98..4c0c4165aa 100644 --- a/default-configs/targets/or1k-softmmu.mak +++ b/default-configs/targets/or1k-softmmu.mak @@ -1,3 +1,3 @@ -TARGET_OPENRISC=3Dy +TARGET_ARCH=3Dopenrisc TARGET_BASE_ARCH=3Dopenrisc TARGET_WORDS_BIGENDIAN=3Dy diff --git a/default-configs/targets/ppc-linux-user.mak b/default-configs/t= argets/ppc-linux-user.mak index c4d912bfb1..dda377508b 100644 --- a/default-configs/targets/ppc-linux-user.mak +++ b/default-configs/targets/ppc-linux-user.mak @@ -1,4 +1,4 @@ -TARGET_PPC=3Dy +TARGET_ARCH=3Dppc TARGET_BASE_ARCH=3Dppc TARGET_ABI_DIR=3Dppc TARGET_SYSTBL_ABI=3Dcommon,nospu,32 diff --git a/default-configs/targets/ppc-softmmu.mak b/default-configs/targ= ets/ppc-softmmu.mak index 1b6d091cfb..b02f1fe51a 100644 --- a/default-configs/targets/ppc-softmmu.mak +++ b/default-configs/targets/ppc-softmmu.mak @@ -1,4 +1,4 @@ -TARGET_PPC=3Dy +TARGET_ARCH=3Dppc TARGET_BASE_ARCH=3Dppc 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 index 7f96ab7e9d..3133346676 100644 --- a/default-configs/targets/ppc64-linux-user.mak +++ b/default-configs/targets/ppc64-linux-user.mak @@ -1,4 +1,4 @@ -TARGET_PPC64=3Dy +TARGET_ARCH=3Dppc64 TARGET_BASE_ARCH=3Dppc TARGET_ABI_DIR=3Dppc TARGET_SYSTBL_ABI=3Dcommon,nospu,64 diff --git a/default-configs/targets/ppc64-softmmu.mak b/default-configs/ta= rgets/ppc64-softmmu.mak index e431feffeb..0fde2d02b9 100644 --- a/default-configs/targets/ppc64-softmmu.mak +++ b/default-configs/targets/ppc64-softmmu.mak @@ -1,4 +1,4 @@ -TARGET_PPC64=3Dy +TARGET_ARCH=3Dppc64 TARGET_BASE_ARCH=3Dppc TARGET_WORDS_BIGENDIAN=3Dy TARGET_SUPPORTS_MTTCG=3Dy diff --git a/default-configs/targets/ppc64abi32-linux-user.mak b/default-co= nfigs/targets/ppc64abi32-linux-user.mak index 13a02700aa..0945451081 100644 --- a/default-configs/targets/ppc64abi32-linux-user.mak +++ b/default-configs/targets/ppc64abi32-linux-user.mak @@ -1,5 +1,5 @@ +TARGET_ARCH=3Dppc64 TARGET_ABI32=3Dy -TARGET_PPC64=3Dy TARGET_BASE_ARCH=3Dppc TARGET_ABI_DIR=3Dppc TARGET_SYSTBL_ABI=3Dcommon,nospu,32 diff --git a/default-configs/targets/ppc64le-linux-user.mak b/default-confi= gs/targets/ppc64le-linux-user.mak index 3dd54b894c..426d5a28d6 100644 --- a/default-configs/targets/ppc64le-linux-user.mak +++ b/default-configs/targets/ppc64le-linux-user.mak @@ -1,4 +1,4 @@ -TARGET_PPC64=3Dy +TARGET_ARCH=3Dppc64 TARGET_BASE_ARCH=3Dppc TARGET_ABI_DIR=3Dppc TARGET_SYSTBL_ABI=3Dcommon,nospu,64 diff --git a/default-configs/targets/riscv32-linux-user.mak b/default-confi= gs/targets/riscv32-linux-user.mak index 91d72a46b0..dfb259e8aa 100644 --- a/default-configs/targets/riscv32-linux-user.mak +++ b/default-configs/targets/riscv32-linux-user.mak @@ -1,4 +1,4 @@ -TARGET_RISCV32=3Dy +TARGET_ARCH=3Driscv32 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 index caa5829af8..4544e1ae9a 100644 --- a/default-configs/targets/riscv32-softmmu.mak +++ b/default-configs/targets/riscv32-softmmu.mak @@ -1,4 +1,4 @@ -TARGET_RISCV32=3Dy +TARGET_ARCH=3Driscv32 TARGET_BASE_ARCH=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 index 9e53193cdb..b13895f3b0 100644 --- a/default-configs/targets/riscv64-linux-user.mak +++ b/default-configs/targets/riscv64-linux-user.mak @@ -1,4 +1,4 @@ -TARGET_RISCV64=3Dy +TARGET_ARCH=3Driscv64 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 index e190c0363b..6ce0b283cf 100644 --- a/default-configs/targets/riscv64-softmmu.mak +++ b/default-configs/targets/riscv64-softmmu.mak @@ -1,4 +1,4 @@ -TARGET_RISCV64=3Dy +TARGET_ARCH=3Driscv64 TARGET_BASE_ARCH=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 37b365475f..07abc5cd55 100644 --- a/default-configs/targets/rx-softmmu.mak +++ b/default-configs/targets/rx-softmmu.mak @@ -1,3 +1,3 @@ -TARGET_RX=3Dy +TARGET_ARCH=3Drx TARGET_BASE_ARCH=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 index 77ebec769f..f7e4244f43 100644 --- a/default-configs/targets/s390x-linux-user.mak +++ b/default-configs/targets/s390x-linux-user.mak @@ -1,4 +1,4 @@ -TARGET_S390X=3Dy +TARGET_ARCH=3Ds390x TARGET_BASE_ARCH=3Ds390x TARGET_ABI_DIR=3Ds390x TARGET_SYSTBL_ABI=3Dcommon,64 diff --git a/default-configs/targets/s390x-softmmu.mak b/default-configs/ta= rgets/s390x-softmmu.mak index f08d25d3c3..080682f07b 100644 --- a/default-configs/targets/s390x-softmmu.mak +++ b/default-configs/targets/s390x-softmmu.mak @@ -1,4 +1,4 @@ -TARGET_S390X=3Dy +TARGET_ARCH=3Ds390x TARGET_BASE_ARCH=3Ds390x TARGET_WORDS_BIGENDIAN=3Dy TARGET_SUPPORTS_MTTCG=3Dy diff --git a/default-configs/targets/sh4-linux-user.mak b/default-configs/t= argets/sh4-linux-user.mak index 4292dd6128..db395a4886 100644 --- a/default-configs/targets/sh4-linux-user.mak +++ b/default-configs/targets/sh4-linux-user.mak @@ -1,4 +1,4 @@ -TARGET_SH4=3Dy +TARGET_ARCH=3Dsh4 TARGET_BASE_ARCH=3Dsh4 TARGET_ABI_DIR=3Dsh4 TARGET_SYSTBL_ABI=3Dcommon diff --git a/default-configs/targets/sh4-softmmu.mak b/default-configs/targ= ets/sh4-softmmu.mak index 8c7e9eaa7b..037cdac1d2 100644 --- a/default-configs/targets/sh4-softmmu.mak +++ b/default-configs/targets/sh4-softmmu.mak @@ -1,3 +1,3 @@ -TARGET_SH4=3Dy +TARGET_ARCH=3Dsh4 TARGET_BASE_ARCH=3Dsh4 TARGET_ALIGNED_ONLY=3Dy diff --git a/default-configs/targets/sh4eb-linux-user.mak b/default-configs= /targets/sh4eb-linux-user.mak index cf9178f4ea..b498e99ac2 100644 --- a/default-configs/targets/sh4eb-linux-user.mak +++ b/default-configs/targets/sh4eb-linux-user.mak @@ -1,4 +1,4 @@ -TARGET_SH4=3Dy +TARGET_ARCH=3Dsh4 TARGET_BASE_ARCH=3Dsh4 TARGET_ABI_DIR=3Dsh4 TARGET_SYSTBL_ABI=3Dcommon diff --git a/default-configs/targets/sh4eb-softmmu.mak b/default-configs/ta= rgets/sh4eb-softmmu.mak index f1848b89b6..e0fc9715e0 100644 --- a/default-configs/targets/sh4eb-softmmu.mak +++ b/default-configs/targets/sh4eb-softmmu.mak @@ -1,4 +1,4 @@ -TARGET_SH4=3Dy +TARGET_ARCH=3Dsh4 TARGET_BASE_ARCH=3Dsh4 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 f478255591..bb83a268b6 100644 --- a/default-configs/targets/sparc-bsd-user.mak +++ b/default-configs/targets/sparc-bsd-user.mak @@ -1,4 +1,4 @@ -TARGET_SPARC=3Dy +TARGET_ARCH=3Dsparc TARGET_BASE_ARCH=3Dsparc TARGET_ABI_DIR=3Dsparc TARGET_ALIGNED_ONLY=3Dy diff --git a/default-configs/targets/sparc-linux-user.mak b/default-configs= /targets/sparc-linux-user.mak index 7f2fcba978..72a4a90219 100644 --- a/default-configs/targets/sparc-linux-user.mak +++ b/default-configs/targets/sparc-linux-user.mak @@ -1,4 +1,4 @@ -TARGET_SPARC=3Dy +TARGET_ARCH=3Dsparc TARGET_BASE_ARCH=3Dsparc TARGET_ABI_DIR=3Dsparc TARGET_SYSTBL_ABI=3Dcommon,32 diff --git a/default-configs/targets/sparc-softmmu.mak b/default-configs/ta= rgets/sparc-softmmu.mak index fb3dbb0d61..dab69263bb 100644 --- a/default-configs/targets/sparc-softmmu.mak +++ b/default-configs/targets/sparc-softmmu.mak @@ -1,4 +1,4 @@ -TARGET_SPARC=3Dy +TARGET_ARCH=3Dsparc TARGET_BASE_ARCH=3Dsparc 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 index f5fcb7879e..e4c51df3dc 100644 --- a/default-configs/targets/sparc32plus-linux-user.mak +++ b/default-configs/targets/sparc32plus-linux-user.mak @@ -1,5 +1,5 @@ +TARGET_ARCH=3Dsparc64 TARGET_ABI32=3Dy -TARGET_SPARC64=3Dy TARGET_BASE_ARCH=3Dsparc TARGET_ABI_DIR=3Dsparc TARGET_SYSTBL_ABI=3Dcommon,32 diff --git a/default-configs/targets/sparc64-bsd-user.mak b/default-configs= /targets/sparc64-bsd-user.mak index 0ae8ea5420..3202825dc3 100644 --- a/default-configs/targets/sparc64-bsd-user.mak +++ b/default-configs/targets/sparc64-bsd-user.mak @@ -1,4 +1,4 @@ -TARGET_SPARC64=3Dy +TARGET_ARCH=3Dsparc64 TARGET_BASE_ARCH=3Dsparc TARGET_ABI_DIR=3Dsparc64 TARGET_ALIGNED_ONLY=3Dy diff --git a/default-configs/targets/sparc64-linux-user.mak b/default-confi= gs/targets/sparc64-linux-user.mak index 817529e587..87d880032e 100644 --- a/default-configs/targets/sparc64-linux-user.mak +++ b/default-configs/targets/sparc64-linux-user.mak @@ -1,4 +1,4 @@ -TARGET_SPARC64=3Dy +TARGET_ARCH=3Dsparc64 TARGET_BASE_ARCH=3Dsparc TARGET_ABI_DIR=3Dsparc64 TARGET_SYSTBL_ABI=3Dcommon,64 diff --git a/default-configs/targets/sparc64-softmmu.mak b/default-configs/= targets/sparc64-softmmu.mak index bc07bfdb0a..8dd3217800 100644 --- a/default-configs/targets/sparc64-softmmu.mak +++ b/default-configs/targets/sparc64-softmmu.mak @@ -1,4 +1,4 @@ -TARGET_SPARC64=3Dy +TARGET_ARCH=3Dsparc64 TARGET_BASE_ARCH=3Dsparc 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 index 064d3320d7..dfa00f4327 100644 --- a/default-configs/targets/tilegx-linux-user.mak +++ b/default-configs/targets/tilegx-linux-user.mak @@ -1,3 +1,3 @@ -TARGET_TILEGX=3Dy +TARGET_ARCH=3Dtilegx TARGET_BASE_ARCH=3Dtilegx TARGET_ABI_DIR=3Dtilegx diff --git a/default-configs/targets/tricore-softmmu.mak b/default-configs/= targets/tricore-softmmu.mak index a29aa2d6dd..6f4193717f 100644 --- a/default-configs/targets/tricore-softmmu.mak +++ b/default-configs/targets/tricore-softmmu.mak @@ -1,2 +1,2 @@ -TARGET_TRICORE=3Dy +TARGET_ARCH=3Dtricore TARGET_BASE_ARCH=3Dtricore diff --git a/default-configs/targets/unicore32-softmmu.mak b/default-config= s/targets/unicore32-softmmu.mak index 85f37dc88f..23d02da953 100644 --- a/default-configs/targets/unicore32-softmmu.mak +++ b/default-configs/targets/unicore32-softmmu.mak @@ -1,2 +1,2 @@ -TARGET_UNICORE32=3Dy +TARGET_ARCH=3Dunicore32 TARGET_BASE_ARCH=3Dunicore32 diff --git a/default-configs/targets/x86_64-bsd-user.mak b/default-configs/= targets/x86_64-bsd-user.mak index 935b10e22c..83ac877606 100644 --- a/default-configs/targets/x86_64-bsd-user.mak +++ b/default-configs/targets/x86_64-bsd-user.mak @@ -1,4 +1,4 @@ -TARGET_X86_64=3Dy +TARGET_ARCH=3Dx86_64 TARGET_BASE_ARCH=3Di386 TARGET_ABI_DIR=3Dx86_64 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 index 6a9418f9ff..6ccc10597b 100644 --- a/default-configs/targets/x86_64-linux-user.mak +++ b/default-configs/targets/x86_64-linux-user.mak @@ -1,4 +1,4 @@ -TARGET_X86_64=3Dy +TARGET_ARCH=3Dx86_64 TARGET_BASE_ARCH=3Di386 TARGET_ABI_DIR=3Dx86_64 TARGET_SYSTBL_ABI=3Dcommon,64 diff --git a/default-configs/targets/x86_64-softmmu.mak b/default-configs/t= argets/x86_64-softmmu.mak index 377c63e823..75e42bc840 100644 --- a/default-configs/targets/x86_64-softmmu.mak +++ b/default-configs/targets/x86_64-softmmu.mak @@ -1,4 +1,4 @@ -TARGET_X86_64=3Dy +TARGET_ARCH=3Dx86_64 TARGET_BASE_ARCH=3Di386 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 index 63d9cff69f..83ac59dbc9 100644 --- a/default-configs/targets/xtensa-linux-user.mak +++ b/default-configs/targets/xtensa-linux-user.mak @@ -1,4 +1,4 @@ -TARGET_XTENSA=3Dy +TARGET_ARCH=3Dxtensa TARGET_BASE_ARCH=3Dxtensa TARGET_ABI_DIR=3Dxtensa TARGET_SYSTBL_ABI=3Dcommon diff --git a/default-configs/targets/xtensa-softmmu.mak b/default-configs/t= argets/xtensa-softmmu.mak index 96f892c4a8..7ea404f8be 100644 --- a/default-configs/targets/xtensa-softmmu.mak +++ b/default-configs/targets/xtensa-softmmu.mak @@ -1,4 +1,4 @@ -TARGET_XTENSA=3Dy +TARGET_ARCH=3Dxtensa TARGET_BASE_ARCH=3Dxtensa 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 index e66b7dd0e3..954e798fbe 100644 --- a/default-configs/targets/xtensaeb-linux-user.mak +++ b/default-configs/targets/xtensaeb-linux-user.mak @@ -1,4 +1,4 @@ -TARGET_XTENSA=3Dy +TARGET_ARCH=3Dxtensa TARGET_BASE_ARCH=3Dxtensa TARGET_ABI_DIR=3Dxtensa TARGET_SYSTBL_ABI=3Dcommon diff --git a/default-configs/targets/xtensaeb-softmmu.mak b/default-configs= /targets/xtensaeb-softmmu.mak index e6f53a1272..c22832d236 100644 --- a/default-configs/targets/xtensaeb-softmmu.mak +++ b/default-configs/targets/xtensaeb-softmmu.mak @@ -1,4 +1,4 @@ -TARGET_XTENSA=3Dy +TARGET_ARCH=3Dxtensa TARGET_BASE_ARCH=3Dxtensa TARGET_ALIGNED_ONLY=3Dy TARGET_WORDS_BIGENDIAN=3Dy diff --git a/meson.build b/meson.build index c66bc19e07..444610a258 100644 --- a/meson.build +++ b/meson.build @@ -725,7 +725,7 @@ kconfig_external_symbols =3D [ 'CONFIG_LINUX', 'CONFIG_PVRDMA', ] -ignored =3D ['TARGET_XML_FILES', 'TARGET_ABI_DIR', 'TARGET_DIRS'] +ignored =3D [ 'TARGET_XML_FILES', 'TARGET_ABI_DIR', 'TARGET_ARCH' ] =20 default_targets =3D 'CONFIG_DEFAULT_TARGETS' in config_host actual_target_dirs =3D [] @@ -778,6 +778,7 @@ foreach target : target_dirs =20 actual_target_dirs +=3D target config_target +=3D keyval.load('default-configs/targets' / target + '.ma= k') + config_target +=3D { 'TARGET_' + config_target['TARGET_ARCH'].to_upper()= : 'y' } =20 foreach k, v: disassemblers if config_host['ARCH'].startswith(k) or config_target['TARGET_BASE_ARC= H'].startswith(k) @@ -794,6 +795,8 @@ foreach target : target_dirs elif ignored.contains(k) # do nothing elif k =3D=3D 'TARGET_BASE_ARCH' + # Note that TARGET_BASE_ARCH ends up in config-target.h but it is + # not used to select files from sourcesets. config_target_data.set('TARGET_' + v.to_upper(), 1) elif k =3D=3D 'TARGET_NAME' or k =3D=3D 'CONFIG_QEMU_INTERP_PREFIX' config_target_data.set_quoted(k, v) --=20 2.26.2 From nobody Sun Nov 16 14:04:13 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=1600853120; cv=none; d=zohomail.com; s=zohoarc; b=nhzazl/Xft6O/YRYKqAPDRWxRW7gkwwyHUIkN7GCHERU2c3w9zWv31srvkMafwasEngOtP0EgW7GVKNEEBmSQL7KNIAoghsjXMcVLYtCA6XX1hEft6Is8GQYKYeB/4x7YNuufaclYGCF9lP/Iwc2LcBVmMvoWoi/tY9d03HJqAk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600853120; h=Content-Type:Content-Transfer-Encoding:Cc: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=94X5PSzSwL05xf1B2MpSeV/8KqUGx6cAUA43T+vor3E=; b=cefIdAeYD5M4oD/aCkeg2rTcItO9BCw2nthI8eOeRNei+a7TY3x144M6E6sR3Kwtgf9bUtO2QFBR+4Jp95d4jOGhFt82WfDBfoDjW1kruZOvB1WTrQa6mRENn27cHrjB+y1MU0xlZ4fI1aIdxKla1z3HIn9EDU/Gsbm3mkcEvME= 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 160085312013152.83327218678312; Wed, 23 Sep 2020 02:25:20 -0700 (PDT) Received: from localhost ([::1]:34718 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kL11a-0000x8-4t for importer@patchew.org; Wed, 23 Sep 2020 05:25:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53128) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL0oa-0001F1-FA for qemu-devel@nongnu.org; Wed, 23 Sep 2020 05:11:54 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:33802) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kL0oS-0002NU-IZ for qemu-devel@nongnu.org; Wed, 23 Sep 2020 05:11:51 -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-268-M00J1RNxPg21HdatwveCxQ-1; Wed, 23 Sep 2020 05:11:40 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2BA5E1005E77; Wed, 23 Sep 2020 09:11:39 +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 CC5BF19C4F; Wed, 23 Sep 2020 09:11:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600852302; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=94X5PSzSwL05xf1B2MpSeV/8KqUGx6cAUA43T+vor3E=; b=G2lTo6IZSyFUyqsMCHbr17EKkh80RZU2lu6JWjcArherKk4KDzTBnqEZH53ApvMte04S+F y5NK8jmQgQAPiFi27mTDbmk0KDyX1xqknYjM9x0Jes8pe/hCEqaOvoPSx7J6O7VIXvRUWP ezGscLVtl8bp4oetE8NnD7M0uLbO77o= X-MC-Unique: M00J1RNxPg21HdatwveCxQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 12/12] default-configs: remove redundant keys Date: Wed, 23 Sep 2020 05:11:31 -0400 Message-Id: <20200923091131.1591563-13-pbonzini@redhat.com> In-Reply-To: <20200923091131.1591563-1-pbonzini@redhat.com> References: <20200923091131.1591563-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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/23 00:53:58 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.455, 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=0.001, RCVD_IN_MSPIKE_WL=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: , Cc: richard.henderson@linaro.org 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" TARGET_BASE_ARCH and TARGET_ABI_DIR are 99% of the time the same as TARGET_ARCH, remove them if so. Signed-off-by: Paolo Bonzini --- default-configs/targets/aarch64-linux-user.mak | 1 - default-configs/targets/aarch64_be-linux-user.mak | 1 - default-configs/targets/alpha-linux-user.mak | 2 -- default-configs/targets/alpha-softmmu.mak | 1 - default-configs/targets/arm-linux-user.mak | 2 -- default-configs/targets/arm-softmmu.mak | 1 - default-configs/targets/armeb-linux-user.mak | 2 -- default-configs/targets/avr-softmmu.mak | 1 - default-configs/targets/cris-linux-user.mak | 2 -- default-configs/targets/cris-softmmu.mak | 1 - default-configs/targets/hppa-linux-user.mak | 2 -- default-configs/targets/hppa-softmmu.mak | 1 - default-configs/targets/i386-bsd-user.mak | 2 -- default-configs/targets/i386-linux-user.mak | 2 -- default-configs/targets/i386-softmmu.mak | 1 - default-configs/targets/lm32-softmmu.mak | 1 - default-configs/targets/m68k-linux-user.mak | 2 -- default-configs/targets/m68k-softmmu.mak | 1 - default-configs/targets/microblaze-linux-user.mak | 2 -- default-configs/targets/microblaze-softmmu.mak | 1 - default-configs/targets/microblazeel-linux-user.mak | 2 -- default-configs/targets/microblazeel-softmmu.mak | 1 - default-configs/targets/mips-linux-user.mak | 2 -- default-configs/targets/mips-softmmu.mak | 1 - default-configs/targets/mips64-linux-user.mak | 1 - default-configs/targets/mips64el-linux-user.mak | 1 - default-configs/targets/mipsel-linux-user.mak | 2 -- default-configs/targets/mipsel-softmmu.mak | 1 - default-configs/targets/mipsn32-linux-user.mak | 1 - default-configs/targets/mipsn32el-linux-user.mak | 1 - default-configs/targets/moxie-softmmu.mak | 1 - default-configs/targets/nios2-linux-user.mak | 2 -- default-configs/targets/nios2-softmmu.mak | 1 - default-configs/targets/or1k-linux-user.mak | 2 -- default-configs/targets/or1k-softmmu.mak | 1 - default-configs/targets/ppc-linux-user.mak | 2 -- default-configs/targets/ppc-softmmu.mak | 1 - default-configs/targets/rx-softmmu.mak | 1 - default-configs/targets/s390x-linux-user.mak | 2 -- default-configs/targets/s390x-softmmu.mak | 1 - default-configs/targets/sh4-linux-user.mak | 2 -- default-configs/targets/sh4-softmmu.mak | 1 - default-configs/targets/sh4eb-linux-user.mak | 2 -- default-configs/targets/sh4eb-softmmu.mak | 1 - default-configs/targets/sparc-bsd-user.mak | 2 -- default-configs/targets/sparc-linux-user.mak | 2 -- default-configs/targets/sparc-softmmu.mak | 1 - default-configs/targets/sparc64-bsd-user.mak | 1 - default-configs/targets/sparc64-linux-user.mak | 1 - default-configs/targets/tilegx-linux-user.mak | 2 -- default-configs/targets/tricore-softmmu.mak | 1 - default-configs/targets/unicore32-softmmu.mak | 1 - default-configs/targets/x86_64-bsd-user.mak | 1 - default-configs/targets/x86_64-linux-user.mak | 1 - default-configs/targets/xtensa-linux-user.mak | 2 -- default-configs/targets/xtensa-softmmu.mak | 1 - default-configs/targets/xtensaeb-linux-user.mak | 2 -- default-configs/targets/xtensaeb-softmmu.mak | 1 - meson.build | 8 ++++++++ 59 files changed, 8 insertions(+), 81 deletions(-) diff --git a/default-configs/targets/aarch64-linux-user.mak b/default-confi= gs/targets/aarch64-linux-user.mak index d6c4a35c39..163c9209f4 100644 --- a/default-configs/targets/aarch64-linux-user.mak +++ b/default-configs/targets/aarch64-linux-user.mak @@ -1,5 +1,4 @@ TARGET_ARCH=3Daarch64 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_be-linux-user.mak b/default-co= nfigs/targets/aarch64_be-linux-user.mak index 5e2d615c11..4c953cf8c5 100644 --- a/default-configs/targets/aarch64_be-linux-user.mak +++ b/default-configs/targets/aarch64_be-linux-user.mak @@ -1,6 +1,5 @@ TARGET_ARCH=3Daarch64 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 index e21f7cdefd..7e62fd796a 100644 --- a/default-configs/targets/alpha-linux-user.mak +++ b/default-configs/targets/alpha-linux-user.mak @@ -1,6 +1,4 @@ TARGET_ARCH=3Dalpha -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 index 8ba1b4e403..e4b874a19e 100644 --- a/default-configs/targets/alpha-softmmu.mak +++ b/default-configs/targets/alpha-softmmu.mak @@ -1,4 +1,3 @@ TARGET_ARCH=3Dalpha -TARGET_BASE_ARCH=3Dalpha 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 index 1b9bac9d3a..c7cd872e86 100644 --- a/default-configs/targets/arm-linux-user.mak +++ b/default-configs/targets/arm-linux-user.mak @@ -1,6 +1,4 @@ TARGET_ARCH=3Darm -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 diff --git a/default-configs/targets/arm-softmmu.mak b/default-configs/targ= ets/arm-softmmu.mak index 8af1d3ee1d..9b1a7f37c6 100644 --- a/default-configs/targets/arm-softmmu.mak +++ b/default-configs/targets/arm-softmmu.mak @@ -1,4 +1,3 @@ TARGET_ARCH=3Darm -TARGET_BASE_ARCH=3Darm 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 index d2b0d9e26e..79bf10e99b 100644 --- a/default-configs/targets/armeb-linux-user.mak +++ b/default-configs/targets/armeb-linux-user.mak @@ -1,6 +1,4 @@ TARGET_ARCH=3Darm -TARGET_BASE_ARCH=3Darm -TARGET_ABI_DIR=3Darm TARGET_SYSTBL_ABI=3Dcommon,oabi TARGET_SYSTBL=3Dsyscall.tbl TARGET_WORDS_BIGENDIAN=3Dy diff --git a/default-configs/targets/avr-softmmu.mak b/default-configs/targ= ets/avr-softmmu.mak index 547c2986b6..e3f921c019 100644 --- a/default-configs/targets/avr-softmmu.mak +++ b/default-configs/targets/avr-softmmu.mak @@ -1,3 +1,2 @@ TARGET_ARCH=3Davr -TARGET_BASE_ARCH=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 index 7d3f6eb36d..e483c42066 100644 --- a/default-configs/targets/cris-linux-user.mak +++ b/default-configs/targets/cris-linux-user.mak @@ -1,3 +1 @@ TARGET_ARCH=3Dcris -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 index a132cec8d9..e483c42066 100644 --- a/default-configs/targets/cris-softmmu.mak +++ b/default-configs/targets/cris-softmmu.mak @@ -1,2 +1 @@ TARGET_ARCH=3Dcris -TARGET_BASE_ARCH=3Dcris diff --git a/default-configs/targets/hppa-linux-user.mak b/default-configs/= targets/hppa-linux-user.mak index 05ef4568ad..f01e0a7b9e 100644 --- a/default-configs/targets/hppa-linux-user.mak +++ b/default-configs/targets/hppa-linux-user.mak @@ -1,6 +1,4 @@ TARGET_ARCH=3Dhppa -TARGET_BASE_ARCH=3Dhppa -TARGET_ABI_DIR=3Dhppa TARGET_SYSTBL_ABI=3Dcommon,32 TARGET_SYSTBL=3Dsyscall.tbl TARGET_ALIGNED_ONLY=3Dy diff --git a/default-configs/targets/hppa-softmmu.mak b/default-configs/tar= gets/hppa-softmmu.mak index bd7eaaf9a5..e3e71eb21b 100644 --- a/default-configs/targets/hppa-softmmu.mak +++ b/default-configs/targets/hppa-softmmu.mak @@ -1,5 +1,4 @@ TARGET_ARCH=3Dhppa -TARGET_BASE_ARCH=3Dhppa 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 aa4d8c55e1..0283bb62a0 100644 --- a/default-configs/targets/i386-bsd-user.mak +++ b/default-configs/targets/i386-bsd-user.mak @@ -1,4 +1,2 @@ TARGET_ARCH=3Di386 -TARGET_BASE_ARCH=3Di386 -TARGET_ABI_DIR=3Di386 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 index 5117f59222..5b2546a430 100644 --- a/default-configs/targets/i386-linux-user.mak +++ b/default-configs/targets/i386-linux-user.mak @@ -1,6 +1,4 @@ TARGET_ARCH=3Di386 -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 7371e87982..5babf71895 100644 --- a/default-configs/targets/i386-softmmu.mak +++ b/default-configs/targets/i386-softmmu.mak @@ -1,4 +1,3 @@ TARGET_ARCH=3Di386 -TARGET_BASE_ARCH=3Di386 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 6e55873788..55e7184a3d 100644 --- a/default-configs/targets/lm32-softmmu.mak +++ b/default-configs/targets/lm32-softmmu.mak @@ -1,3 +1,2 @@ TARGET_ARCH=3Dlm32 -TARGET_BASE_ARCH=3Dlm32 TARGET_WORDS_BIGENDIAN=3Dy diff --git a/default-configs/targets/m68k-linux-user.mak b/default-configs/= targets/m68k-linux-user.mak index 186d1117cf..805d16c6ab 100644 --- a/default-configs/targets/m68k-linux-user.mak +++ b/default-configs/targets/m68k-linux-user.mak @@ -1,6 +1,4 @@ TARGET_ARCH=3Dm68k -TARGET_BASE_ARCH=3Dm68k -TARGET_ABI_DIR=3Dm68k TARGET_SYSTBL_ABI=3Dcommon TARGET_SYSTBL=3Dsyscall.tbl TARGET_WORDS_BIGENDIAN=3Dy diff --git a/default-configs/targets/m68k-softmmu.mak b/default-configs/tar= gets/m68k-softmmu.mak index fd8975978c..5df1a2b7d7 100644 --- a/default-configs/targets/m68k-softmmu.mak +++ b/default-configs/targets/m68k-softmmu.mak @@ -1,4 +1,3 @@ TARGET_ARCH=3Dm68k -TARGET_BASE_ARCH=3Dm68k 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 index 249a22295a..2a25bf2fa3 100644 --- a/default-configs/targets/microblaze-linux-user.mak +++ b/default-configs/targets/microblaze-linux-user.mak @@ -1,6 +1,4 @@ TARGET_ARCH=3Dmicroblaze -TARGET_BASE_ARCH=3Dmicroblaze -TARGET_ABI_DIR=3Dmicroblaze TARGET_SYSTBL_ABI=3Dcommon TARGET_SYSTBL=3Dsyscall.tbl TARGET_WORDS_BIGENDIAN=3Dy diff --git a/default-configs/targets/microblaze-softmmu.mak b/default-confi= gs/targets/microblaze-softmmu.mak index 8e5126f0f1..0b5c78ef00 100644 --- a/default-configs/targets/microblaze-softmmu.mak +++ b/default-configs/targets/microblaze-softmmu.mak @@ -1,4 +1,3 @@ TARGET_ARCH=3Dmicroblaze -TARGET_BASE_ARCH=3Dmicroblaze 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 index f59156c63b..d0e775d840 100644 --- a/default-configs/targets/microblazeel-linux-user.mak +++ b/default-configs/targets/microblazeel-linux-user.mak @@ -1,6 +1,4 @@ TARGET_ARCH=3Dmicroblaze -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 index 2d465cf6b4..dc822219d8 100644 --- a/default-configs/targets/microblazeel-softmmu.mak +++ b/default-configs/targets/microblazeel-softmmu.mak @@ -1,3 +1,2 @@ TARGET_ARCH=3Dmicroblaze -TARGET_BASE_ARCH=3Dmicroblaze TARGET_SUPPORTS_MTTCG=3Dy diff --git a/default-configs/targets/mips-linux-user.mak b/default-configs/= targets/mips-linux-user.mak index 5b8000dfb0..19f5779831 100644 --- a/default-configs/targets/mips-linux-user.mak +++ b/default-configs/targets/mips-linux-user.mak @@ -1,7 +1,5 @@ TARGET_ARCH=3Dmips TARGET_ABI_MIPSO32=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/mips-softmmu.mak b/default-configs/tar= gets/mips-softmmu.mak index e391801a0e..8a49999a47 100644 --- a/default-configs/targets/mips-softmmu.mak +++ b/default-configs/targets/mips-softmmu.mak @@ -1,5 +1,4 @@ TARGET_ARCH=3Dmips -TARGET_BASE_ARCH=3Dmips 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 index 811df35427..32fd1acdf2 100644 --- a/default-configs/targets/mips64-linux-user.mak +++ b/default-configs/targets/mips64-linux-user.mak @@ -1,7 +1,6 @@ TARGET_ARCH=3Dmips64 TARGET_ABI_MIPSN64=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-linux-user.mak b/default-conf= igs/targets/mips64el-linux-user.mak index f9de5d7857..f348f35997 100644 --- a/default-configs/targets/mips64el-linux-user.mak +++ b/default-configs/targets/mips64el-linux-user.mak @@ -1,7 +1,6 @@ TARGET_ARCH=3Dmips64 TARGET_ABI_MIPSN64=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 index 11c3556665..e23793070c 100644 --- a/default-configs/targets/mipsel-linux-user.mak +++ b/default-configs/targets/mipsel-linux-user.mak @@ -1,7 +1,5 @@ TARGET_ARCH=3Dmips TARGET_ABI_MIPSO32=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 index a9fc3b2647..c7c41f4fb7 100644 --- a/default-configs/targets/mipsel-softmmu.mak +++ b/default-configs/targets/mipsel-softmmu.mak @@ -1,4 +1,3 @@ TARGET_ARCH=3Dmips -TARGET_BASE_ARCH=3Dmips 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 index 040022ce87..b8c2441ad0 100644 --- a/default-configs/targets/mipsn32-linux-user.mak +++ b/default-configs/targets/mipsn32-linux-user.mak @@ -2,7 +2,6 @@ TARGET_ARCH=3Dmips64 TARGET_ABI_MIPSN32=3Dy TARGET_ABI32=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/mipsn32el-linux-user.mak b/default-con= figs/targets/mipsn32el-linux-user.mak index faeca7752e..f31a9c394b 100644 --- a/default-configs/targets/mipsn32el-linux-user.mak +++ b/default-configs/targets/mipsn32el-linux-user.mak @@ -2,7 +2,6 @@ TARGET_ARCH=3Dmips64 TARGET_ABI_MIPSN32=3Dy TARGET_ABI32=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 index b9d8d97031..183e6b0ebd 100644 --- a/default-configs/targets/moxie-softmmu.mak +++ b/default-configs/targets/moxie-softmmu.mak @@ -1,3 +1,2 @@ TARGET_ARCH=3Dmoxie -TARGET_BASE_ARCH=3Dmoxie TARGET_WORDS_BIGENDIAN=3Dy diff --git a/default-configs/targets/nios2-linux-user.mak b/default-configs= /targets/nios2-linux-user.mak index 57ddc32838..9a372f0717 100644 --- a/default-configs/targets/nios2-linux-user.mak +++ b/default-configs/targets/nios2-linux-user.mak @@ -1,3 +1 @@ TARGET_ARCH=3Dnios2 -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 index 787d1d1be1..9a372f0717 100644 --- a/default-configs/targets/nios2-softmmu.mak +++ b/default-configs/targets/nios2-softmmu.mak @@ -1,2 +1 @@ TARGET_ARCH=3Dnios2 -TARGET_BASE_ARCH=3Dnios2 diff --git a/default-configs/targets/or1k-linux-user.mak b/default-configs/= targets/or1k-linux-user.mak index 88175f039b..1dfb93e46d 100644 --- a/default-configs/targets/or1k-linux-user.mak +++ b/default-configs/targets/or1k-linux-user.mak @@ -1,4 +1,2 @@ TARGET_ARCH=3Dopenrisc -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 index 4c0c4165aa..1dfb93e46d 100644 --- a/default-configs/targets/or1k-softmmu.mak +++ b/default-configs/targets/or1k-softmmu.mak @@ -1,3 +1,2 @@ TARGET_ARCH=3Dopenrisc -TARGET_BASE_ARCH=3Dopenrisc TARGET_WORDS_BIGENDIAN=3Dy diff --git a/default-configs/targets/ppc-linux-user.mak b/default-configs/t= argets/ppc-linux-user.mak index dda377508b..ca4187e4aa 100644 --- a/default-configs/targets/ppc-linux-user.mak +++ b/default-configs/targets/ppc-linux-user.mak @@ -1,6 +1,4 @@ TARGET_ARCH=3Dppc -TARGET_BASE_ARCH=3Dppc -TARGET_ABI_DIR=3Dppc TARGET_SYSTBL_ABI=3Dcommon,nospu,32 TARGET_SYSTBL=3Dsyscall.tbl TARGET_WORDS_BIGENDIAN=3Dy diff --git a/default-configs/targets/ppc-softmmu.mak b/default-configs/targ= ets/ppc-softmmu.mak index b02f1fe51a..ef69037a2c 100644 --- a/default-configs/targets/ppc-softmmu.mak +++ b/default-configs/targets/ppc-softmmu.mak @@ -1,4 +1,3 @@ TARGET_ARCH=3Dppc -TARGET_BASE_ARCH=3Dppc 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/rx-softmmu.mak b/default-configs/targe= ts/rx-softmmu.mak index 07abc5cd55..2d410e0b0c 100644 --- a/default-configs/targets/rx-softmmu.mak +++ b/default-configs/targets/rx-softmmu.mak @@ -1,3 +1,2 @@ TARGET_ARCH=3Drx -TARGET_BASE_ARCH=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 index f7e4244f43..9e31ce6457 100644 --- a/default-configs/targets/s390x-linux-user.mak +++ b/default-configs/targets/s390x-linux-user.mak @@ -1,6 +1,4 @@ TARGET_ARCH=3Ds390x -TARGET_BASE_ARCH=3Ds390x -TARGET_ABI_DIR=3Ds390x TARGET_SYSTBL_ABI=3Dcommon,64 TARGET_SYSTBL=3Dsyscall.tbl TARGET_WORDS_BIGENDIAN=3Dy diff --git a/default-configs/targets/s390x-softmmu.mak b/default-configs/ta= rgets/s390x-softmmu.mak index 080682f07b..fd9fbd870d 100644 --- a/default-configs/targets/s390x-softmmu.mak +++ b/default-configs/targets/s390x-softmmu.mak @@ -1,5 +1,4 @@ TARGET_ARCH=3Ds390x -TARGET_BASE_ARCH=3Ds390x 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 index db395a4886..0152d6621e 100644 --- a/default-configs/targets/sh4-linux-user.mak +++ b/default-configs/targets/sh4-linux-user.mak @@ -1,6 +1,4 @@ TARGET_ARCH=3Dsh4 -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/sh4-softmmu.mak b/default-configs/targ= ets/sh4-softmmu.mak index 037cdac1d2..95896376c4 100644 --- a/default-configs/targets/sh4-softmmu.mak +++ b/default-configs/targets/sh4-softmmu.mak @@ -1,3 +1,2 @@ TARGET_ARCH=3Dsh4 -TARGET_BASE_ARCH=3Dsh4 TARGET_ALIGNED_ONLY=3Dy diff --git a/default-configs/targets/sh4eb-linux-user.mak b/default-configs= /targets/sh4eb-linux-user.mak index b498e99ac2..9b6fb4c1bb 100644 --- a/default-configs/targets/sh4eb-linux-user.mak +++ b/default-configs/targets/sh4eb-linux-user.mak @@ -1,6 +1,4 @@ TARGET_ARCH=3Dsh4 -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 e0fc9715e0..382e9a80f8 100644 --- a/default-configs/targets/sh4eb-softmmu.mak +++ b/default-configs/targets/sh4eb-softmmu.mak @@ -1,4 +1,3 @@ TARGET_ARCH=3Dsh4 -TARGET_BASE_ARCH=3Dsh4 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 bb83a268b6..9ba3d7b07f 100644 --- a/default-configs/targets/sparc-bsd-user.mak +++ b/default-configs/targets/sparc-bsd-user.mak @@ -1,5 +1,3 @@ TARGET_ARCH=3Dsparc -TARGET_BASE_ARCH=3Dsparc -TARGET_ABI_DIR=3Dsparc 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 index 72a4a90219..53dc7aaed5 100644 --- a/default-configs/targets/sparc-linux-user.mak +++ b/default-configs/targets/sparc-linux-user.mak @@ -1,6 +1,4 @@ TARGET_ARCH=3Dsparc -TARGET_BASE_ARCH=3Dsparc -TARGET_ABI_DIR=3Dsparc TARGET_SYSTBL_ABI=3Dcommon,32 TARGET_SYSTBL=3Dsyscall.tbl TARGET_ALIGNED_ONLY=3Dy diff --git a/default-configs/targets/sparc-softmmu.mak b/default-configs/ta= rgets/sparc-softmmu.mak index dab69263bb..9ba3d7b07f 100644 --- a/default-configs/targets/sparc-softmmu.mak +++ b/default-configs/targets/sparc-softmmu.mak @@ -1,4 +1,3 @@ TARGET_ARCH=3Dsparc -TARGET_BASE_ARCH=3Dsparc 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 3202825dc3..8dd3217800 100644 --- a/default-configs/targets/sparc64-bsd-user.mak +++ b/default-configs/targets/sparc64-bsd-user.mak @@ -1,5 +1,4 @@ TARGET_ARCH=3Dsparc64 TARGET_BASE_ARCH=3Dsparc -TARGET_ABI_DIR=3Dsparc64 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 index 87d880032e..846924201a 100644 --- a/default-configs/targets/sparc64-linux-user.mak +++ b/default-configs/targets/sparc64-linux-user.mak @@ -1,6 +1,5 @@ TARGET_ARCH=3Dsparc64 TARGET_BASE_ARCH=3Dsparc -TARGET_ABI_DIR=3Dsparc64 TARGET_SYSTBL_ABI=3Dcommon,64 TARGET_SYSTBL=3Dsyscall.tbl TARGET_ALIGNED_ONLY=3Dy diff --git a/default-configs/targets/tilegx-linux-user.mak b/default-config= s/targets/tilegx-linux-user.mak index dfa00f4327..10480e74c9 100644 --- a/default-configs/targets/tilegx-linux-user.mak +++ b/default-configs/targets/tilegx-linux-user.mak @@ -1,3 +1 @@ TARGET_ARCH=3Dtilegx -TARGET_BASE_ARCH=3Dtilegx -TARGET_ABI_DIR=3Dtilegx diff --git a/default-configs/targets/tricore-softmmu.mak b/default-configs/= targets/tricore-softmmu.mak index 6f4193717f..96b10af853 100644 --- a/default-configs/targets/tricore-softmmu.mak +++ b/default-configs/targets/tricore-softmmu.mak @@ -1,2 +1 @@ TARGET_ARCH=3Dtricore -TARGET_BASE_ARCH=3Dtricore diff --git a/default-configs/targets/unicore32-softmmu.mak b/default-config= s/targets/unicore32-softmmu.mak index 23d02da953..57331e94fe 100644 --- a/default-configs/targets/unicore32-softmmu.mak +++ b/default-configs/targets/unicore32-softmmu.mak @@ -1,2 +1 @@ TARGET_ARCH=3Dunicore32 -TARGET_BASE_ARCH=3Dunicore32 diff --git a/default-configs/targets/x86_64-bsd-user.mak b/default-configs/= targets/x86_64-bsd-user.mak index 83ac877606..799cd4acd4 100644 --- a/default-configs/targets/x86_64-bsd-user.mak +++ b/default-configs/targets/x86_64-bsd-user.mak @@ -1,4 +1,3 @@ TARGET_ARCH=3Dx86_64 TARGET_BASE_ARCH=3Di386 -TARGET_ABI_DIR=3Dx86_64 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 index 6ccc10597b..9ceefbb615 100644 --- a/default-configs/targets/x86_64-linux-user.mak +++ b/default-configs/targets/x86_64-linux-user.mak @@ -1,6 +1,5 @@ TARGET_ARCH=3Dx86_64 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/xtensa-linux-user.mak b/default-config= s/targets/xtensa-linux-user.mak index 83ac59dbc9..fc95cc60f5 100644 --- a/default-configs/targets/xtensa-linux-user.mak +++ b/default-configs/targets/xtensa-linux-user.mak @@ -1,6 +1,4 @@ TARGET_ARCH=3Dxtensa -TARGET_BASE_ARCH=3Dxtensa -TARGET_ABI_DIR=3Dxtensa TARGET_SYSTBL_ABI=3Dcommon TARGET_SYSTBL=3Dsyscall.tbl TARGET_ALIGNED_ONLY=3Dy diff --git a/default-configs/targets/xtensa-softmmu.mak b/default-configs/t= argets/xtensa-softmmu.mak index 7ea404f8be..26c0285655 100644 --- a/default-configs/targets/xtensa-softmmu.mak +++ b/default-configs/targets/xtensa-softmmu.mak @@ -1,4 +1,3 @@ TARGET_ARCH=3Dxtensa -TARGET_BASE_ARCH=3Dxtensa 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 index 954e798fbe..cfc3518118 100644 --- a/default-configs/targets/xtensaeb-linux-user.mak +++ b/default-configs/targets/xtensaeb-linux-user.mak @@ -1,6 +1,4 @@ TARGET_ARCH=3Dxtensa -TARGET_BASE_ARCH=3Dxtensa -TARGET_ABI_DIR=3Dxtensa TARGET_SYSTBL_ABI=3Dcommon TARGET_SYSTBL=3Dsyscall.tbl TARGET_ALIGNED_ONLY=3Dy diff --git a/default-configs/targets/xtensaeb-softmmu.mak b/default-configs= /targets/xtensaeb-softmmu.mak index c22832d236..14cb9289a6 100644 --- a/default-configs/targets/xtensaeb-softmmu.mak +++ b/default-configs/targets/xtensaeb-softmmu.mak @@ -1,5 +1,4 @@ TARGET_ARCH=3Dxtensa -TARGET_BASE_ARCH=3Dxtensa TARGET_ALIGNED_ONLY=3Dy TARGET_WORDS_BIGENDIAN=3Dy TARGET_SUPPORTS_MTTCG=3Dy diff --git a/meson.build b/meson.build index 444610a258..b90fd23f27 100644 --- a/meson.build +++ b/meson.build @@ -780,6 +780,14 @@ foreach target : target_dirs config_target +=3D keyval.load('default-configs/targets' / target + '.ma= k') config_target +=3D { 'TARGET_' + config_target['TARGET_ARCH'].to_upper()= : 'y' } =20 + # Add default keys + if 'TARGET_BASE_ARCH' not in config_target + config_target +=3D {'TARGET_BASE_ARCH': config_target['TARGET_ARCH']} + endif + if 'TARGET_ABI_DIR' not in config_target + config_target +=3D {'TARGET_ABI_DIR': config_target['TARGET_ARCH']} + endif + foreach k, v: disassemblers if config_host['ARCH'].startswith(k) or config_target['TARGET_BASE_ARC= H'].startswith(k) foreach sym: v --=20 2.26.2