From patchwork Mon Jun 9 14:57:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 31582 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f70.google.com (mail-oa0-f70.google.com [209.85.219.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E1DE120675 for ; Mon, 9 Jun 2014 15:30:16 +0000 (UTC) Received: by mail-oa0-f70.google.com with SMTP id g18sf36856864oah.5 for ; Mon, 09 Jun 2014 08:30:16 -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:date :message-id:in-reply-to:references:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=VmUGqsKCE2D58lMY2AHAFLeZ2EOA7oV/iHfCwMp006Q=; b=MA0ldZiAolXAz8T/AcjYHPAJ5S7BsTkVlupUYSbREX3Jn/39/+jq+lqgsnczx2MNbh 3u/QnSEZqKAHkPELGC+BfSrQ5jczBYoNnMlxqia84I/4E/aG+Tcih4WrIGiyJz59+gY1 2U5auYvQoSrQABKBSS/mW9r6L/koENwYxoK1d3Vd0R2vwQ0uJIDPZ2jFqby6i99xKJEW sMgxRMC+SobbWPAERgjhDCf02/IOi0VOeWVcYMi59VHGsGzsUbpM62AsKxjcHij6qTIk /0juZxlWsV2hJsWYQ9GKLbIAZC4cog/dvABYI5MKTixeqCtoHkU2BS/zyu4UUKmc1Iby 6Gjw== X-Gm-Message-State: ALoCoQlPGka3ZrM6mkoBBykhQhWKZkUp7uhcd3Zy3NoQum0JamlHUl/bV5fLzpLgfpEOFIs8qi8f X-Received: by 10.182.104.74 with SMTP id gc10mr510446obb.40.1402327816532; Mon, 09 Jun 2014 08:30:16 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.46.53 with SMTP id j50ls1654448qga.67.gmail; Mon, 09 Jun 2014 08:30:16 -0700 (PDT) X-Received: by 10.220.50.138 with SMTP id z10mr990493vcf.75.1402327816088; Mon, 09 Jun 2014 08:30:16 -0700 (PDT) Received: from mail-ve0-f182.google.com (mail-ve0-f182.google.com [209.85.128.182]) by mx.google.com with ESMTPS id ls1si10730368vcb.99.2014.06.09.08.30.16 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 09 Jun 2014 08:30:16 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.182 as permitted sender) client-ip=209.85.128.182; Received: by mail-ve0-f182.google.com with SMTP id sa20so6711945veb.13 for ; Mon, 09 Jun 2014 08:30:16 -0700 (PDT) X-Received: by 10.220.53.72 with SMTP id l8mr26622978vcg.16.1402327816013; Mon, 09 Jun 2014 08:30:16 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.54.6 with SMTP id vs6csp154492vcb; Mon, 9 Jun 2014 08:30:15 -0700 (PDT) X-Received: by 10.229.87.201 with SMTP id x9mr11817337qcl.20.1402327815584; Mon, 09 Jun 2014 08:30:15 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 1si24151450qap.29.2014.06.09.08.30.15 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 09 Jun 2014 08:30:15 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:33589 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wu13u-0001Vj-Rm for patch@linaro.org; Mon, 09 Jun 2014 11:00:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55118) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wu116-00053I-2U for qemu-devel@nongnu.org; Mon, 09 Jun 2014 10:57:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wu115-0005g3-0O for qemu-devel@nongnu.org; Mon, 09 Jun 2014 10:57:43 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:48572) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wu114-0005dP-Qm for qemu-devel@nongnu.org; Mon, 09 Jun 2014 10:57:42 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1Wu110-0006A9-JW for qemu-devel@nongnu.org; Mon, 09 Jun 2014 15:57:38 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 9 Jun 2014 15:57:28 +0100 Message-Id: <1402325858-23615-11-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1402325858-23615-1-git-send-email-peter.maydell@linaro.org> References: <1402325858-23615-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Subject: [Qemu-devel] [PULL 10/20] target-arm: arm_any_initfn() should never set ARM_FEATURE_AARCH64 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.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.128.182 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 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 Message-id: 1401458125-27977-2-git-send-email-peter.maydell@linaro.org --- target-arm/cpu.c | 3 --- 1 file changed, 3 deletions(-) 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