From nobody Sun Nov 16 16:28:48 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