From patchwork Wed Aug 6 20:38:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 34997 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f70.google.com (mail-yh0-f70.google.com [209.85.213.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5DF6F2136C for ; Wed, 6 Aug 2014 21:05:00 +0000 (UTC) Received: by mail-yh0-f70.google.com with SMTP id b6sf9866909yha.9 for ; Wed, 06 Aug 2014 14:05:00 -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=TgOunir1fszUNuCq+V90wgGQeLNuhIIMJMt4socVOaA=; b=buqRmxjsPuFaWotdkbq+ZuVkr/NQ3ljcAL5QggjRD2w3ZHiTZbRD0c0OTF71S+EVI/ ndRKG04Av6PgFL3a8xQE+9egspGqIEvARDPeaVMeQDBU3UIJRXK7MdBd+XZcOa7M6Zx1 L/K+IqKIV+h5/wgi9J6rv7rxJpuo4+0RhN5I+yLGKNBpY4hSBgKm4+Vxt9MSXNj23plE 4R/tnf6lwnySrUNpmFX/Baz3Kr6YEbc1SdGglUTceqK0tEK+p3sE21EuhSCjiOcgGltc SPNog8Qo/ejHCd/CjlklQDDzoP2SIq1GyyzwHSpvuIooSggDq4IhYkxSpfOnbzXzEdIz 1sTg== X-Gm-Message-State: ALoCoQk3ndhqsN6O+yN5qAtXKeWaRxi1EpswvR5BiWmGPczCPVu/8Bjrm+R+lFr1/cMLstEe6rFX X-Received: by 10.52.29.72 with SMTP id i8mr6984447vdh.6.1407359100178; Wed, 06 Aug 2014 14:05:00 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.22.11 with SMTP id 11ls391450qgm.98.gmail; Wed, 06 Aug 2014 14:05:00 -0700 (PDT) X-Received: by 10.52.147.15 with SMTP id tg15mr11008872vdb.53.1407359100049; Wed, 06 Aug 2014 14:05:00 -0700 (PDT) Received: from mail-vc0-f178.google.com (mail-vc0-f178.google.com [209.85.220.178]) by mx.google.com with ESMTPS id ey10si966567vdb.30.2014.08.06.14.05.00 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 06 Aug 2014 14:05:00 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.178 as permitted sender) client-ip=209.85.220.178; Received: by mail-vc0-f178.google.com with SMTP id la4so4996504vcb.9 for ; Wed, 06 Aug 2014 14:05:00 -0700 (PDT) X-Received: by 10.220.187.134 with SMTP id cw6mr12776643vcb.3.1407359099959; Wed, 06 Aug 2014 14:04:59 -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 tc5csp57101vcb; Wed, 6 Aug 2014 14:04:59 -0700 (PDT) X-Received: by 10.140.102.142 with SMTP id w14mr6977589qge.101.1407359099226; Wed, 06 Aug 2014 14:04:59 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id c107si3514748qgd.54.2014.08.06.14.04.59 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 06 Aug 2014 14:04:59 -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]:41160 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XF8OI-0001rf-Me for patch@linaro.org; Wed, 06 Aug 2014 17:04:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37808) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XF82m-0007sJ-56 for qemu-devel@nongnu.org; Wed, 06 Aug 2014 16:42:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XF82d-00056u-N0 for qemu-devel@nongnu.org; Wed, 06 Aug 2014 16:42:44 -0400 Received: from e39.co.us.ibm.com ([32.97.110.160]:41484) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XF82d-00055d-FI for qemu-devel@nongnu.org; Wed, 06 Aug 2014 16:42:35 -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 ; Wed, 6 Aug 2014 14:42:34 -0600 Received: from d03dlp02.boulder.ibm.com (9.17.202.178) by e39.co.us.ibm.com (192.168.1.139) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 6 Aug 2014 14:42:31 -0600 Received: from b03cxnp08025.gho.boulder.ibm.com (b03cxnp08025.gho.boulder.ibm.com [9.17.130.17]) by d03dlp02.boulder.ibm.com (Postfix) with ESMTP id 25C173E4003F; Wed, 6 Aug 2014 14:42:31 -0600 (MDT) Received: from d03av06.boulder.ibm.com (d03av06.boulder.ibm.com [9.17.195.245]) by b03cxnp08025.gho.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s76KgVgC57409720; Wed, 6 Aug 2014 22:42:31 +0200 Received: from d03av06.boulder.ibm.com (loopback [127.0.0.1]) by d03av06.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id s76KkjoG020785; Wed, 6 Aug 2014 14:46:45 -0600 Received: from localhost ([9.80.101.111]) by d03av06.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id s76Kkioh020715; Wed, 6 Aug 2014 14:46:44 -0600 From: Michael Roth To: qemu-devel@nongnu.org Date: Wed, 6 Aug 2014 15:38:47 -0500 Message-Id: <1407357598-21541-38-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1407357598-21541-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1407357598-21541-1-git-send-email-mdroth@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14080620-9332-0000-0000-0000019D39CA 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 037/108] 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.220.178 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 d2380b6..6cfaa3a 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, }; #ifndef TARGET_AARCH64