From patchwork Mon Jul 1 17:35:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 18220 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f72.google.com (mail-ee0-f72.google.com [74.125.83.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 149CA2774C for ; Mon, 1 Jul 2013 17:35:40 +0000 (UTC) Received: by mail-ee0-f72.google.com with SMTP id d41sf5942626eek.11 for ; Mon, 01 Jul 2013 10:35:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-beenthere:x-forwarded-to:x-forwarded-for :delivered-to:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=GNdUq4Qq3iymy0zRezShpmLJyCb3rOtivubfBzlGca4=; b=cUjuh068DgyQ8cIv/2DfUGLMKzMCcvHqDOjHwyFzeTq8R7ZCmk71HWP6WdHfk+D6pL uYMsQfafT0l7pz54SKlw2kxLOExuR0OWjj1yP91xBhQzYu7e8C04zz8bqKhCmptSGL4Y gtvz9hMqOsJ3p/l3p7Te42+WizqvUL22iKwaagOzp8BKdJ+TZr1TjTZ1Hq/7WSdexd6T GduLHFw3o4nhJTxvVmWrBgyr+1TOMREvLFfmxiKs41X5X7eot1Q3nfRe5cuGQ4fUcHn4 nI3zC9ptBLWQym11yAigtYmzBqM5kjBjQ1/9Pb8RK6tlI6Gh0wRWhTMtOLJ/owX98jOP CG2w== X-Received: by 10.180.185.132 with SMTP id fc4mr9489066wic.7.1372700139180; Mon, 01 Jul 2013 10:35:39 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.180.188.197 with SMTP id gc5ls239080wic.22.gmail; Mon, 01 Jul 2013 10:35:39 -0700 (PDT) X-Received: by 10.180.160.203 with SMTP id xm11mr2293233wib.58.1372700139017; Mon, 01 Jul 2013 10:35:39 -0700 (PDT) Received: from mail-ve0-f174.google.com (mail-ve0-f174.google.com [209.85.128.174]) by mx.google.com with ESMTPS id vv5si6837216wjc.49.2013.07.01.10.35.38 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 01 Jul 2013 10:35:39 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.174 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.174; Received: by mail-ve0-f174.google.com with SMTP id oz10so3985369veb.5 for ; Mon, 01 Jul 2013 10:35:38 -0700 (PDT) X-Received: by 10.220.67.10 with SMTP id p10mr9806585vci.85.1372700137961; Mon, 01 Jul 2013 10:35:37 -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.58.165.8 with SMTP id yu8csp289815veb; Mon, 1 Jul 2013 10:35:37 -0700 (PDT) X-Received: by 10.194.2.13 with SMTP id 13mr20950392wjq.74.1372700130436; Mon, 01 Jul 2013 10:35:30 -0700 (PDT) Received: from mnementh.archaic.org.uk (1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id f7si3551406wiv.8.2013.07.01.10.35.29 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 01 Jul 2013 10:35:30 -0700 (PDT) Received-SPF: neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) client-ip=2001:8b0:1d0::1; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1Uti0Z-0002Lb-HP; Mon, 01 Jul 2013 18:35:23 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Alexander Graf , Andreas Schwab , "Mian M. Hamayun" Subject: [PATCH v5 14/21] linux-user: Make sure NWFPE code is 32 bit ARM only Date: Mon, 1 Jul 2013 18:35:13 +0100 Message-Id: <1372700120-8896-15-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1372700120-8896-1-git-send-email-peter.maydell@linaro.org> References: <1372700120-8896-1-git-send-email-peter.maydell@linaro.org> X-Gm-Message-State: ALoCoQk4VLDfeLYqE96TgBCI4yR5A+xne/Qfe8tLLNRM2sDHhBGwLzW7wpG+Eg2fFcRZ/hnFmT83 X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.174 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 b10e957..d51d827 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -79,7 +79,7 @@ struct vm86_saved_state { }; #endif -#ifdef TARGET_ARM +#if defined(TARGET_ARM) && defined(TARGET_ABI32) /* FPU emulator */ #include "nwfpe/fpa11.h" #endif @@ -103,8 +103,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