From patchwork Fri May 2 19:15:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 29590 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f199.google.com (mail-ie0-f199.google.com [209.85.223.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 253DB202E7 for ; Fri, 2 May 2014 19:50:16 +0000 (UTC) Received: by mail-ie0-f199.google.com with SMTP id rl12sf26084378iec.2 for ; Fri, 02 May 2014 12:50:15 -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=HmxOK8A2r8U3VmWArb4W1FvDfhvpZiC29OCCMB7l5rY=; b=AzT3ornVWnAa777Xedyq2oC4g5gr8PqNWjBvDJPRo3eQn5jJ/cegHcdfy2mCbBoy8y /YT3fJ1V+nH0bWe4f8eQq+Zisjdg09mFqqaoTt9SE8aylY97AotZ8qk8eONtr/VzRb7c bxkVMPj2+XkF3LAYm/vvhTtPSHMEZ+xs+3NOf1BR+LUlmVSnkdAjcPysNYqXXrk1iAJp m1MzpJEiifzmOqiAxJY1pmj3fqLnBAB7kPVct2sbX7Ln6KkdTI8TCed849R3igy+Mn0p nv5BUTYYMTJKI8vDSDdizt2J2nCavlAIyvL0/zUjqvR+j62PZYdkTGhOtjwEB/xAM7vf 2cDw== X-Gm-Message-State: ALoCoQkW1nYK6RwsL42SJkKUX2a46pw7BgyQ/bo8Z654GGrqgviXbfxPJVrGHB1GZ9f9COSLU/4p X-Received: by 10.50.43.228 with SMTP id z4mr2884668igl.0.1399060215475; Fri, 02 May 2014 12:50:15 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.88.72 with SMTP id s66ls1607248qgd.11.gmail; Fri, 02 May 2014 12:50:15 -0700 (PDT) X-Received: by 10.52.31.167 with SMTP id b7mr81909vdi.79.1399060215300; Fri, 02 May 2014 12:50:15 -0700 (PDT) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by mx.google.com with ESMTPS id ck5si6933024vdd.55.2014.05.02.12.50.15 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 02 May 2014 12:50:15 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=209.85.220.173; Received: by mail-vc0-f173.google.com with SMTP id ik5so5834528vcb.4 for ; Fri, 02 May 2014 12:50:15 -0700 (PDT) X-Received: by 10.52.249.48 with SMTP id yr16mr878872vdc.62.1399060215239; Fri, 02 May 2014 12:50:15 -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.220.221.72 with SMTP id ib8csp127581vcb; Fri, 2 May 2014 12:50:14 -0700 (PDT) X-Received: by 10.140.19.68 with SMTP id 62mr24073533qgg.55.1399060214583; Fri, 02 May 2014 12:50:14 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id x1si8092181qal.119.2014.05.02.12.50.14 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 02 May 2014 12:50:14 -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]:45959 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WgIyT-0003LH-S7 for patch@linaro.org; Fri, 02 May 2014 15:18:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33480) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WgIwD-000828-Ms for qemu-devel@nongnu.org; Fri, 02 May 2014 15:16:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WgIw5-0000BR-D7 for qemu-devel@nongnu.org; Fri, 02 May 2014 15:16:01 -0400 Received: from afflict.kos.to ([92.243.29.197]:48082) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WgIw5-00009u-5M; Fri, 02 May 2014 15:15:53 -0400 Received: from localhost.localdomain (afflict [92.243.29.197]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by afflict.kos.to (Postfix) with ESMTPSA id 1BDD7264D3; Fri, 2 May 2014 21:15:51 +0200 (CEST) From: riku.voipio@linaro.org To: qemu-devel@nongnu.org Date: Fri, 2 May 2014 22:15:46 +0300 Message-Id: <43ce393ee5f7b96d2ac22fedc40d6b6fb3f65a3e.1399057853.git.riku.voipio@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 92.243.29.197 Cc: peter.maydell@linaro.org, qemu-stable@nongnu.org Subject: [Qemu-devel] [PULL 11/14] 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: riku.voipio@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) 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 --- 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 ecf6f35..18ea1b3 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