From patchwork Tue Sep 3 19:12:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 19730 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ye0-f198.google.com (mail-ye0-f198.google.com [209.85.213.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 21DF624869 for ; Tue, 3 Sep 2013 19:12:48 +0000 (UTC) Received: by mail-ye0-f198.google.com with SMTP id m12sf6441341yen.9 for ; Tue, 03 Sep 2013 12:12:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=FADk/6pT9u4D0Q7py3x7o5Yvpegneki3dst1rGSpaK0=; b=jxIeQJhkf1t3ModAy0hfdR8gAKhZemxT0kegUZ1gsJ10FQ5M+R/muJUqWv9vspCh3B LidbYSgr4XwuIEbOFp8d1qhDAQbvi5R83IXE7WslwfUZ896DYwjsxdP+AXaAoKcWmWs8 cCxOb5NlBnfFK9vY1VmSuE/e+fMIA0lCpLaPGryvQWIx+TuobRwToY3Glx1W6FA6qKbF sStBKL9IpIwGW1h3DrgD/kOVhg/YFfeeZwD6Z5bD7lPLNbL4pRii50+9I1iIoKykIHLW q9iiiEvL86pked5NvS7bRMprFpfcy/5DhGfytOykVjqcyZqpTPBgfnSA5cN/qw+dwgYG CYpA== X-Received: by 10.236.31.228 with SMTP id m64mr11526768yha.5.1378235567933; Tue, 03 Sep 2013 12:12:47 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.59.132 with SMTP id z4ls2707781qeq.69.gmail; Tue, 03 Sep 2013 12:12:47 -0700 (PDT) X-Received: by 10.58.224.102 with SMTP id rb6mr24570vec.43.1378235567849; Tue, 03 Sep 2013 12:12:47 -0700 (PDT) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by mx.google.com with ESMTPS id o5si3880247vdw.128.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 03 Sep 2013 12:12:47 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.170; Received: by mail-vc0-f170.google.com with SMTP id kw10so4436606vcb.1 for ; Tue, 03 Sep 2013 12:12:47 -0700 (PDT) X-Gm-Message-State: ALoCoQkNOEaFdjKKQY6ubLlvmiqIHwUGS3zS0MjJQza7lAMvYUaycpqeHkPKLx/gxp7tdlUGbcu8 X-Received: by 10.220.169.203 with SMTP id a11mr2651688vcz.26.1378235567778; Tue, 03 Sep 2013 12:12:47 -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.174.196 with SMTP id u4csp190484vcz; Tue, 3 Sep 2013 12:12:47 -0700 (PDT) X-Received: by 10.194.85.198 with SMTP id j6mr3110155wjz.51.1378235550288; Tue, 03 Sep 2013 12:12:30 -0700 (PDT) Received: from chiark.greenend.org.uk (v6.chiark.greenend.org.uk. [2001:ba8:1e3::]) by mx.google.com with ESMTPS id gj11si7811358wic.66.1969.12.31.16.00.00 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 03 Sep 2013 12:12:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pmaydell@chiark.greenend.org.uk designates 2001:ba8:1e3:: as permitted sender) client-ip=2001:ba8:1e3::; Received: by chiark.greenend.org.uk (Debian Exim 4.72 #1) with local (return-path pmaydell@chiark.greenend.org.uk) id 1VGw1Y-0005oU-Mo; Tue, 03 Sep 2013 20:12:24 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Andreas Schwab , Alexander Graf , "Mian M. Hamayun" , kvmarm@lists.cs.columbia.edu, =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [PATCH v6 17/24] linux-user: Make sure NWFPE code is 32 bit ARM only Date: Tue, 3 Sep 2013 20:12:17 +0100 Message-Id: <1378235544-22290-18-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1378235544-22290-1-git-send-email-peter.maydell@linaro.org> References: <1378235544-22290-1-git-send-email-peter.maydell@linaro.org> Sender: Peter Maydell X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) 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: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , On ARM, linux-user emulation includes NWFPE support for emulating the ancient FPA floating point coprocessor. This has long since been superseded by VFP and is only required for legacy binaries. The AArch64 linux-user target doesn't compile in NWFPE support, so make sure the relevant code is protected by suitable ifdefs. Signed-off-by: Peter Maydell --- linux-user/qemu.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/linux-user/qemu.h b/linux-user/qemu.h index 4a16e8f..4df4fcb 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -74,7 +74,7 @@ struct vm86_saved_state { }; #endif -#ifdef TARGET_ARM +#if defined(TARGET_ARM) && defined(TARGET_ABI32) /* FPU emulator */ #include "nwfpe/fpa11.h" #endif @@ -98,8 +98,10 @@ struct emulated_sigtable { typedef struct TaskState { pid_t ts_tid; /* tid (or pid) of this task */ #ifdef TARGET_ARM +# ifdef TARGET_ABI32 /* FPA state */ FPA11 fpa; +# endif int swi_errno; #endif #ifdef TARGET_UNICORE32