From patchwork Tue Sep 14 00:14:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 510488 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp1055007jao; Mon, 13 Sep 2021 17:40:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwnHBIN+g0Ar1cgV/X4Lt66HVfOALouyJdBOF0X3ZV5GbCkX+PZdsmXWW4w7zJc16fGH7ym X-Received: by 2002:a67:ed09:: with SMTP id l9mr7407868vsp.53.1631580051405; Mon, 13 Sep 2021 17:40:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631580051; cv=none; d=google.com; s=arc-20160816; b=P4pzNO8OTJcRDtXlPc4TKPS+D3JGz7N602AYhR0jhVKswmzQl2TlV7wjyQ+H5tzBpr YLrCnJorcCfJQ/yj0xDn304b8B5I/zhIl0q0pIGQ0Gnov7Cl30oIdDzJzzjybq5rHBEG FImdHI9EuU2gLzkA7jjip14C/fuVX/QY0KbYu+GzLhaCqgbhMOfzfZnrKN8yHMyrfFtw Ae6gtMTvvHCpiLOKwZmtpU2n4JZVGNdq8XMOAdTW/Tp7R34Up+LM0Vr7IqXj15BJHsYO +Tj2onPwoGb8Joki12RjD3dG5Z6LfE3UC69KdtzLUe6VlnIAPEmBAnijKMUhnJnKIXwr 3Pbw== 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=enaLGbWvNUeIQNl3JSOugT8ZMiXLFPXRZRQVmjGvuVU=; b=reAfBeP4uR2qGuk1N5Frpaa5ziVZcUeD7aI6ZZ0Jg9UKeJu9A3C2JQhqbLAwPwbYLf HHpzCHVaFZ4U7fo8HM1zBbdEeAqy50TwsNopeehR2TuzDC4ekycPAuvW1zcfXang439q wpxBUkWLAvis4TR4IyfhjuIpNaonLFhDCQV/5LJOzVZ+nWVE6OeGm2bgZnFu2W4+mcA8 /ZxM8T60qjYyzeYAchCEbliNo9JD3xxgRXWwps+iDmJwUskmKUOOiGgX0q8BMFquDubg 6RGfTWaCX/tWDeWJyohTyLpSF6fizitqzlqfvglEaYCFJRCs0lpO5fUZXNQtQKNbGd6Z zbPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nZV4qQjc; 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=pass (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 o191si2621748vsd.254.2021.09.13.17.40.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Sep 2021 17:40:51 -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=pass header.i=@linaro.org header.s=google header.b=nZV4qQjc; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:44158 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPwVG-0004SV-RG for patch@linaro.org; Mon, 13 Sep 2021 20:40:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53946) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPw6s-0001rw-FF for qemu-devel@nongnu.org; Mon, 13 Sep 2021 20:15:38 -0400 Received: from mail-pg1-x535.google.com ([2607:f8b0:4864:20::535]:41571) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mPw6f-0007td-Ix for qemu-devel@nongnu.org; Mon, 13 Sep 2021 20:15:34 -0400 Received: by mail-pg1-x535.google.com with SMTP id k24so11000176pgh.8 for ; Mon, 13 Sep 2021 17:15:24 -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=enaLGbWvNUeIQNl3JSOugT8ZMiXLFPXRZRQVmjGvuVU=; b=nZV4qQjcrTTgWIMOCaIlEVD4r6C/V6WH42nq8ma7kmQT926xX0ce6O8VFEC5gReLH4 m83klnE66kgawdBAhBOMLYDvSqckrBg+Lo6TT5AVeC27bq5BztpN9XjLg5WfDLgAf+0f sWvKJmmzBfCZ+50xextlJqWYpW6CfsXi4+SkK97n+vmwV7xoRR4uqjfMztGZh7tPPtcN 16IYF8F5pWlZGIgc+9aGXTUxNXx/KC/dTy/zYphJv/SVe5z15sjD7hvbVkhMPp1AAAv3 Cz/3DV/gVFjpGdNHKkvf60rLfa/MCfGwKtA6tKLLjeaklDDEU54z6iY9ctfta1YGwyR6 LIbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=enaLGbWvNUeIQNl3JSOugT8ZMiXLFPXRZRQVmjGvuVU=; b=B7DQ5VmiKsEr9ceDLh5SyRajl5N7VHDRiSCnfi0hcyjXopL4rrb26y99y6ezwN92Xb p3gcQkHqSjYlxMa9GVccklYlyD+xI4CfIaPdHQepDqvezLOK+u182rTTRPLQFTEiJYqO czVElx6DrAHBRKliX4qJU2ELnaL3AtHpQyqAGS6s8Q7HA3Uffk0Ed0oDVDlX0B8zsniV 0evvnPEAGugCzV2VMx5cEUXL/pithYLja0KjOOUPYxlyztnxF/kjpJyAR2z6CV5Awyrc wNhpJ8rnjfRpKuj4fHhTJy+l4QvJfSzJ3bpButwtm2dWdjC1BMrAsHsuk2hHlN0A18dx LzSA== X-Gm-Message-State: AOAM530wtw+7GTlrySo/15qw30ZIMLlVEixAdXuxMYYHm00KAFSfqH+c VLUI94OCHBGWcJg/pfP/EcVDPVlNe9UxNw== X-Received: by 2002:a63:204a:: with SMTP id r10mr13202528pgm.365.1631578523345; Mon, 13 Sep 2021 17:15:23 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id m7sm9334179pgn.32.2021.09.13.17.15.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 17:15:22 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 35/44] tcg/arm: Remove fallback definition of __ARM_ARCH Date: Mon, 13 Sep 2021 17:14:47 -0700 Message-Id: <20210914001456.793490-36-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210914001456.793490-1-richard.henderson@linaro.org> References: <20210914001456.793490-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::535; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x535.google.com X-Spam_score_int: -1 X-Spam_score: -0.2 X-Spam_bar: / X-Spam_report: (-0.2 / 5.0 requ) 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: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" GCC since 4.8 provides the definition and we now require 7.5. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- tcg/arm/tcg-target.h | 19 ------------------- 1 file changed, 19 deletions(-) -- 2.25.1 diff --git a/tcg/arm/tcg-target.h b/tcg/arm/tcg-target.h index d113b7f8db..18bb16c784 100644 --- a/tcg/arm/tcg-target.h +++ b/tcg/arm/tcg-target.h @@ -26,25 +26,6 @@ #ifndef ARM_TCG_TARGET_H #define ARM_TCG_TARGET_H -/* The __ARM_ARCH define is provided by gcc 4.8. Construct it otherwise. */ -#ifndef __ARM_ARCH -# if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \ - || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) \ - || defined(__ARM_ARCH_7EM__) -# define __ARM_ARCH 7 -# elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) \ - || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) \ - || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6T2__) -# define __ARM_ARCH 6 -# elif defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5E__) \ - || defined(__ARM_ARCH_5T__) || defined(__ARM_ARCH_5TE__) \ - || defined(__ARM_ARCH_5TEJ__) -# define __ARM_ARCH 5 -# else -# define __ARM_ARCH 4 -# endif -#endif - extern int arm_arch; #if defined(__ARM_ARCH_5T__) \