From patchwork Tue Jul 8 17:17:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 33245 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f199.google.com (mail-ve0-f199.google.com [209.85.128.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 930A52070A for ; Tue, 8 Jul 2014 18:28:25 +0000 (UTC) Received: by mail-ve0-f199.google.com with SMTP id oy12sf23759654veb.10 for ; Tue, 08 Jul 2014 11:28:25 -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:cc: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=PH8QVpSnHiSAEHHjGDFJ3DOFJulkTt7L6bHGHoCC7zw=; b=QpEASYPeClmkw1AQ4diiF8yi7I8QmQrEACThMZtGJtevX/vqKtxWBVCJY5Z4KWPRo+ FPf9nEOFba6OVnObsbkZIDAysBUq4shTq5ldWF/naDO6vf3sP4VZZL0zLpjJlpBncko6 F0w20Ng9YS72SF5mcM2ybiNN158zFe3yvCuYiCQibOix+eGtKs8MtzmH53r8edVQRgj9 tQZp1Cfw57toaOcM+xPf3Bj6esDlvIgIZdq4J5sMZOoIydWO50FANyiYZqfSTd79FmJT tzI7TOazU6bHoI2TySEybK1HKJxIgmYegBUKnfjMNlcSKbCYsX7ZQO8xZcZMw19tTBM4 OZpw== X-Gm-Message-State: ALoCoQl2jgEL5uBoyyBsVs3L1UEzEHSFkvi0u22v2lhBIgWKz0pF2McinY8JcvG7ZJP5mc6M6sNN X-Received: by 10.236.203.169 with SMTP id f29mr9824707yho.24.1404844105308; Tue, 08 Jul 2014 11:28:25 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.39.145 with SMTP id v17ls821105qgv.14.gmail; Tue, 08 Jul 2014 11:28:25 -0700 (PDT) X-Received: by 10.58.80.6 with SMTP id n6mr1780606vex.32.1404844105229; Tue, 08 Jul 2014 11:28:25 -0700 (PDT) Received: from mail-ve0-f169.google.com (mail-ve0-f169.google.com [209.85.128.169]) by mx.google.com with ESMTPS id or9si20506059vcb.81.2014.07.08.11.28.24 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 08 Jul 2014 11:28:24 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.169 as permitted sender) client-ip=209.85.128.169; Received: by mail-ve0-f169.google.com with SMTP id pa12so6089126veb.14 for ; Tue, 08 Jul 2014 11:28:24 -0700 (PDT) X-Received: by 10.52.115.101 with SMTP id jn5mr1443969vdb.65.1404844104852; Tue, 08 Jul 2014 11:28:24 -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.37.5 with SMTP id tc5csp795093vcb; Tue, 8 Jul 2014 11:28:24 -0700 (PDT) X-Received: by 10.224.120.68 with SMTP id c4mr23977335qar.17.1404844104423; Tue, 08 Jul 2014 11:28:24 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id p8si41604738qct.15.2014.07.08.11.28.24 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 08 Jul 2014 11:28:24 -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]:57124 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X4ZJA-0004s9-KN for patch@linaro.org; Tue, 08 Jul 2014 13:36:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40360) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X4Z5Q-00047R-RY for qemu-devel@nongnu.org; Tue, 08 Jul 2014 13:22:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X4Z4v-000809-3q for qemu-devel@nongnu.org; Tue, 08 Jul 2014 13:21:48 -0400 Received: from e39.co.us.ibm.com ([32.97.110.160]:51511) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X4Z4u-0007zW-R5 for qemu-devel@nongnu.org; Tue, 08 Jul 2014 13:21:17 -0400 Received: from /spool/local by e39.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 8 Jul 2014 11:21:16 -0600 Received: from d01dlp01.pok.ibm.com (9.56.250.166) by e39.co.us.ibm.com (192.168.1.139) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 8 Jul 2014 11:21:14 -0600 Received: from b01cxnp22034.gho.pok.ibm.com (b01cxnp22034.gho.pok.ibm.com [9.57.198.24]) by d01dlp01.pok.ibm.com (Postfix) with ESMTP id 2AB9C38C8046; Tue, 8 Jul 2014 13:21:14 -0400 (EDT) Received: from d01av03.pok.ibm.com (d01av03.pok.ibm.com [9.56.224.217]) by b01cxnp22034.gho.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s68HLDTf48234554; Tue, 8 Jul 2014 17:21:13 GMT Received: from d01av03.pok.ibm.com (localhost [127.0.0.1]) by d01av03.pok.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s68HLD6d000455; Tue, 8 Jul 2014 13:21:13 -0400 Received: from localhost ([9.41.105.211]) by d01av03.pok.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id s68HLDs5000434; Tue, 8 Jul 2014 13:21:13 -0400 From: Michael Roth To: qemu-devel@nongnu.org Date: Tue, 8 Jul 2014 12:17:32 -0500 Message-Id: <1404839947-1086-62-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1404839947-1086-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1404839947-1086-1-git-send-email-mdroth@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14070817-9332-0000-0000-000001506881 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 32.97.110.160 Cc: qemu-stable@nongnu.org Subject: [Qemu-devel] [PATCH 061/156] linux-user/elfload.c: Fix incorrect ARM HWCAP bits 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: mdroth@linux.vnet.ibm.com 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.169 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 From: Peter Maydell The ELF HWCAP bits for ARM features THUMBEE, NEON, VFPv3 and VFPv3D16 are all off by one compared to the kernel definitions. Fix this discrepancy and add in the missing CRUNCH bit which was the cause of the off-by-one error. (We don't emulate any of the CPUs which have that weird hardware, so it's otherwise uninteresting to us.) Cc: qemu-stable@nongnu.org Signed-off-by: Peter Maydell Signed-off-by: Riku Voipio (cherry picked from commit 43ce393ee5f7b96d2ac22fedc40d6b6fb3f65a3e) Signed-off-by: Michael Roth --- linux-user/elfload.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 8dd424d..7d1e097 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -346,10 +346,11 @@ enum ARM_HWCAP_ARM_EDSP = 1 << 7, ARM_HWCAP_ARM_JAVA = 1 << 8, ARM_HWCAP_ARM_IWMMXT = 1 << 9, - ARM_HWCAP_ARM_THUMBEE = 1 << 10, - ARM_HWCAP_ARM_NEON = 1 << 11, - ARM_HWCAP_ARM_VFPv3 = 1 << 12, - ARM_HWCAP_ARM_VFPv3D16 = 1 << 13, + ARM_HWCAP_ARM_CRUNCH = 1 << 10, + ARM_HWCAP_ARM_THUMBEE = 1 << 11, + ARM_HWCAP_ARM_NEON = 1 << 12, + ARM_HWCAP_ARM_VFPv3 = 1 << 13, + ARM_HWCAP_ARM_VFPv3D16 = 1 << 14, }; #define TARGET_HAS_VALIDATE_GUEST_SPACE