From patchwork Fri Jul 30 10:59:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 489313 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:1185:0:0:0:0 with SMTP id f5csp3040545jas; Fri, 30 Jul 2021 04:00:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwLvVet2xnPLWIwIO2jiAT2NIty2dxL/efrHCvDAZNGBEM6Y0bWggXdSH1stY4tmaXBibLE X-Received: by 2002:a25:ea52:: with SMTP id o18mr2532237ybe.150.1627642828033; Fri, 30 Jul 2021 04:00:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627642828; cv=none; d=google.com; s=arc-20160816; b=N++1PKg67X1Xcm7Zr+djPrziFDeX7u91WiLuz6VK/Meo+VE21Qod0kNWjl/omxExz+ drc4aHchHtCAFq+6FwzNwk395etLsp+2qnjKPw+6Zy/SY4nJcaexjD/8Hhe9uFxoNX77 vDHzB6xTsrq2gKodsvZ5I1CWMnvEQXUr1d/BUocQFJevQIwCIU3ZYBCswxwyv44Ax1fO mmDMVkm8yuKGEqrWS82U33YMCGW+1P0EKMLwHhhOUf9tlyuO/M0jlEM1GY0ET+9xHu6D l3fD4lGJz6DAFjWiiRXilzJZKkc4Qx0Qvm3ggyUJhbn7ovl8u7NSMJOXjPvfpycmgF6u DRiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=RsHqQzhMnNyF8S9+GK7laO6hiG/HlpjDGIbIoWLeMbg=; b=a9rRscx5muEbavO//qV/6nTtoz/3/Z82Rn3ERXDifX0AWH8ItTj/YXpRP/hD60khE6 /nnVAuok68xsEs3V05cY1bMyKs6bwf3uI/a4NW8y2HSytreJ321U6SIyNzKVNV//yTlt +B+S8M+kFKD2Al7Dm8wj4m0K6AhX6TPNp9ylg/+S8PTxgKOKlZTLO6E5ocMZD+6yn2+w Y6uAQZ0zxLDiSRrvR78fZPP9Lnl/0Ho7Ky+wz8rgbfCNdPng6tcp0N2FNuY2+lb8AVVY +LCXj6aMdrKFav59i7Orp3+JWrv3plj2gACn+NH916Jlc9DaKUN65uQunUCPgt8bit/m vAgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=K0ObMVVO; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id q129si1711263ybc.242.2021.07.30.04.00.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 30 Jul 2021 04:00:28 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=K0ObMVVO; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:59124 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m9QFf-00007e-Dl for patch@linaro.org; Fri, 30 Jul 2021 07:00:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42370) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m9QFA-0008Tn-6m for qemu-devel@nongnu.org; Fri, 30 Jul 2021 06:59:56 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:33598) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m9QF8-0002Wc-Hd for qemu-devel@nongnu.org; Fri, 30 Jul 2021 06:59:55 -0400 Received: by mail-wr1-x42b.google.com with SMTP id q3so10852859wrx.0 for ; Fri, 30 Jul 2021 03:59:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RsHqQzhMnNyF8S9+GK7laO6hiG/HlpjDGIbIoWLeMbg=; b=K0ObMVVOQq03E9p/YE2RRhfwHHxjOsf1Ug8jzdm4jKxPAJbB4kIEkPPUZ0pqLNBeAV gmZ1XBiPbo6zWnNh+ttMsie/lugtuhd9WwkU3OfJCJSzXVnmDN+SjOgJcKZKq6f7BHjK gqFPTyaVnWHiR7196osu1ZFHN4s2ym5ss+KQgZRcuX8pYTr8cxm46XhCS1PnDX3GFvhJ fzbtROtLHqES6Aa2/O9eJsdkjjntwhTZMBXZinU2T0USp7Nzs0cQI+513otxiSja9ier 97qPRsIvSWTNg1mTRY3qNqWEBuZBpe9o61uWbABJrf7YOe/plhr8L/1EtBITi3I/ld5A XS3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RsHqQzhMnNyF8S9+GK7laO6hiG/HlpjDGIbIoWLeMbg=; b=U0Po7fHWhdAqORkPmz78lsBuE8tDRRGSPQcW434iXWWSNfTagDa+8bKEKOwHWoDh9x T9ox2uRbfWllt8TsptA9thFX/bWEsGJlwTpDCXbLLd1gecUSjlqZCd2CjLyRVUoHsm+I 2DUyUzil7NpD0uu19fn1b916ah4hIOSLnVkakzkwlNG6F0vm6XNmTaqZ4tTFFDHjf42w MQzI8y8HMxboczTvLbfIB0unTy2hs280NggWfgxG2bPJsLEEPbSXErzbL5VcE1zG5l8s FbROBnfqfSQcD/76DYKw0gfBybrDeBhJgzr3g0kCNQnuAEp+WlnnU7vCssHCnhtjGxnU Ns6Q== X-Gm-Message-State: AOAM5338kAjDGcScEMjL0+IPCg9uiMGw6P0RtaQhMTPdwtYKPtwXhgTt prOsDLRMm+6B7PCV/gK+sBiaGYcbrmUdfg== X-Received: by 2002:a05:6000:1625:: with SMTP id v5mr2395194wrb.80.1627642793254; Fri, 30 Jul 2021 03:59:53 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id p2sm1349697wrr.21.2021.07.30.03.59.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jul 2021 03:59:52 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH for-6.2 4/8] meson.build: Define QEMU_ARCH in config-target.h Date: Fri, 30 Jul 2021 11:59:43 +0100 Message-Id: <20210730105947.28215-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210730105947.28215-1-peter.maydell@linaro.org> References: <20210730105947.28215-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, 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: Paolo Bonzini , Markus Armbruster , Eduardo Habkost Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Instead of using an ifdef ladder in arch_init.c (which we then have to manually update every time we add or remove a target architecture), have meson.build put "#define QEMU_ARCH QEMU_ARCH_FOO" in the config-target.h file. Signed-off-by: Peter Maydell --- meson.build | 2 ++ softmmu/arch_init.c | 41 ----------------------------------------- 2 files changed, 2 insertions(+), 41 deletions(-) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson diff --git a/meson.build b/meson.build index f2e148eaf98..861965c286b 100644 --- a/meson.build +++ b/meson.build @@ -1625,6 +1625,8 @@ foreach target : target_dirs config_target_data.set(k, v) endif endforeach + config_target_data.set('QEMU_ARCH', + 'QEMU_ARCH_' + config_target['TARGET_BASE_ARCH'].to_upper()) config_target_h += {target: configure_file(output: target + '-config-target.h', configuration: config_target_data)} diff --git a/softmmu/arch_init.c b/softmmu/arch_init.c index 91cbf883e28..8919405c7b2 100644 --- a/softmmu/arch_init.c +++ b/softmmu/arch_init.c @@ -38,45 +38,4 @@ int graphic_height = 600; int graphic_depth = 32; #endif - -#if defined(TARGET_ALPHA) -#define QEMU_ARCH QEMU_ARCH_ALPHA -#elif defined(TARGET_ARM) -#define QEMU_ARCH QEMU_ARCH_ARM -#elif defined(TARGET_CRIS) -#define QEMU_ARCH QEMU_ARCH_CRIS -#elif defined(TARGET_HPPA) -#define QEMU_ARCH QEMU_ARCH_HPPA -#elif defined(TARGET_I386) -#define QEMU_ARCH QEMU_ARCH_I386 -#elif defined(TARGET_M68K) -#define QEMU_ARCH QEMU_ARCH_M68K -#elif defined(TARGET_MICROBLAZE) -#define QEMU_ARCH QEMU_ARCH_MICROBLAZE -#elif defined(TARGET_MIPS) -#define QEMU_ARCH QEMU_ARCH_MIPS -#elif defined(TARGET_NIOS2) -#define QEMU_ARCH QEMU_ARCH_NIOS2 -#elif defined(TARGET_OPENRISC) -#define QEMU_ARCH QEMU_ARCH_OPENRISC -#elif defined(TARGET_PPC) -#define QEMU_ARCH QEMU_ARCH_PPC -#elif defined(TARGET_RISCV) -#define QEMU_ARCH QEMU_ARCH_RISCV -#elif defined(TARGET_RX) -#define QEMU_ARCH QEMU_ARCH_RX -#elif defined(TARGET_S390X) -#define QEMU_ARCH QEMU_ARCH_S390X -#elif defined(TARGET_SH4) -#define QEMU_ARCH QEMU_ARCH_SH4 -#elif defined(TARGET_SPARC) -#define QEMU_ARCH QEMU_ARCH_SPARC -#elif defined(TARGET_TRICORE) -#define QEMU_ARCH QEMU_ARCH_TRICORE -#elif defined(TARGET_XTENSA) -#define QEMU_ARCH QEMU_ARCH_XTENSA -#elif defined(TARGET_AVR) -#define QEMU_ARCH QEMU_ARCH_AVR -#endif - const uint32_t arch_type = QEMU_ARCH;