From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 3 Sep 2013 19:12:17 +0000 (+0100)
Subject: linux-user: Make sure NWFPE code is 32 bit ARM only
X-Git-Tag: v1.7.0-rc0~125^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=848d72cdd894e3a883118fd0f1ede14ff66bfa21;p=thirdparty%2Fqemu.git

linux-user: Make sure NWFPE code is 32 bit ARM only

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 <peter.maydell@linaro.org>
Message-id: 1378235544-22290-18-git-send-email-peter.maydell@linaro.org
---

diff --git a/linux-user/qemu.h b/linux-user/qemu.h
index 4a16e8fe1dd..4df4fcb8654 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