Message ID | 1401458125-27977-2-git-send-email-peter.maydell@linaro.org |
---|---|
State | Superseded |
Headers | show
Return-Path: <patchwork-forward+bncBC6Z756YVMIBBYU3UKOAKGQEVCD5JSI@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qg0-f72.google.com (mail-qg0-f72.google.com [209.85.192.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 367C120671 for <linaro@patches.linaro.org>; Fri, 30 May 2014 13:55:47 +0000 (UTC) Received: by mail-qg0-f72.google.com with SMTP id q108sf4795999qgd.3 for <linaro@patches.linaro.org>; Fri, 30 May 2014 06:55:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=vRwUECXb3lFeZy8PWdpISkWm/4W4uRVh5GSHqjrVWFg=; b=Uwdmb/e7wuDQrgXV2ylGvNlo31pln8UFuRfehpGHUJa5LV4tF4+chfAzAvwaabrhu2 XmD+4LAYnn+j74XhXgdH6RifStGPglMet3ERa1xL5pe6MN7TTFbVbWLOGK1kpLXTuqN+ ocEnzNd1o2EN0UoVKURS30L3BkYU5ziOzsCIy8mjLU3jWnh7qZSMzJCeDesB3Ehbt2Bf zDlLV35wZui8MGMWv824H5jB20CmwCJaFVqHYJIrsjZ8GHY/oN9i4LcFatgQkoAZC6s5 GwP/uDZUi7X0j5DVKPhCVt2ar6wqMTU5QQG8sEGeyIGGf3Y0DcS7R8JBbTAaX0VtIR9w vrOg== X-Gm-Message-State: ALoCoQnfrkKQhShNTSNqI8imvG6ItrIKJ+XQfCmsy7U00J6poKIHnQ1MW/262flhgE7MmquzPdlC X-Received: by 10.58.38.199 with SMTP id i7mr6302796vek.6.1401458146972; Fri, 30 May 2014 06:55:46 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.94.145 with SMTP id g17ls984540qge.76.gmail; Fri, 30 May 2014 06:55:46 -0700 (PDT) X-Received: by 10.52.252.231 with SMTP id zv7mr11704526vdc.36.1401458146841; Fri, 30 May 2014 06:55:46 -0700 (PDT) Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com [209.85.220.181]) by mx.google.com with ESMTPS id to8si3103893vdb.2.2014.05.30.06.55.46 for <patchwork-forward@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 30 May 2014 06:55:46 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.181 as permitted sender) client-ip=209.85.220.181; Received: by mail-vc0-f181.google.com with SMTP id hq11so121552vcb.26 for <patchwork-forward@linaro.org>; Fri, 30 May 2014 06:55:46 -0700 (PDT) X-Received: by 10.220.53.72 with SMTP id l8mr14139403vcg.16.1401458146774; Fri, 30 May 2014 06:55:46 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp114300vcb; Fri, 30 May 2014 06:55:46 -0700 (PDT) X-Received: by 10.180.77.70 with SMTP id q6mr7127747wiw.28.1401458145765; Fri, 30 May 2014 06:55:45 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id fl9si4862710wib.82.2014.05.30.06.55.38 for <multiple recipients> (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 30 May 2014 06:55:40 -0700 (PDT) Received-SPF: none (google.com: pm215@archaic.org.uk does not designate permitted sender hosts) client-ip=2001:8b0:1d0::1; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from <pm215@archaic.org.uk>) id 1WqNHJ-0007Hl-5F; Fri, 30 May 2014 14:55:25 +0100 From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Cc: patches@linaro.org, Ard Biesheuvel <ard.biesheuvel@linaro.org>, =?UTF-8?q?Alex=20Benn=C3=A9e?= <alex.bennee@linaro.org> Subject: [PATCH 1/9] target-arm: arm_any_initfn() should never set ARM_FEATURE_AARCH64 Date: Fri, 30 May 2014 14:55:17 +0100 Message-Id: <1401458125-27977-2-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1401458125-27977-1-git-send-email-peter.maydell@linaro.org> References: <1401458125-27977-1-git-send-email-peter.maydell@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.181 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: <patchwork-forward.linaro.org> X-Google-Group-Id: 836684582541 List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Unsubscribe: <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe>, <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com> |
diff --git a/target-arm/cpu.c b/target-arm/cpu.c index fb9c12d..94123b2 100644 --- a/target-arm/cpu.c +++ b/target-arm/cpu.c @@ -963,9 +963,6 @@ static void arm_any_initfn(Object *obj) set_feature(&cpu->env, ARM_FEATURE_ARM_DIV); set_feature(&cpu->env, ARM_FEATURE_V7MP); set_feature(&cpu->env, ARM_FEATURE_CRC); -#ifdef TARGET_AARCH64 - set_feature(&cpu->env, ARM_FEATURE_AARCH64); -#endif cpu->midr = 0xffffffff; } #endif
The arm_any_initfn() is used only for the 32-bit linux-user "cpu any", so it only gets called in builds where TARGET_AARCH64 is not defined. Remove the unreachable line which sets ARM_FEATURE_AARCH64. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- target-arm/cpu.c | 3 --- 1 file changed, 3 deletions(-)