From b17d2d11c304d942ae0efdbd27f0157eb37ce249 Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Sat, 28 Jan 2017 11:15:30 -0800
Subject: [PATCH] ARM: Fix build

---
 src/arm/isa-arm.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/arm/isa-arm.c b/src/arm/isa-arm.c
index 9cdf6a9ec..142cc03eb 100644
--- a/src/arm/isa-arm.c
+++ b/src/arm/isa-arm.c
@@ -236,8 +236,12 @@ static inline void _immediate(struct ARMCore* cpu, uint32_t opcode) {
 	}
 
 #define ARM_NEUTRAL_HI_S(DLO, DHI) \
-	cpu->cpsr.n = ARM_SIGN(DHI); \
-	cpu->cpsr.z = !((DHI) | (DLO));
+	{ \
+		ARMPSR cpsr = 0; \
+		cpsr = ARMPSROrUnsafeN(cpsr, ARM_SIGN(DHI)); \
+		cpsr = ARMPSROrUnsafeZ(cpsr, !(DHI) | (DLO)); \
+		cpu->cpsr = cpu->cpsr & (0x3FFFFFFF) | cpsr; \
+	}
 
 #define ADDR_MODE_2_I_TEST (opcode & 0x00000F80)
 #define ADDR_MODE_2_I ((opcode & 0x00000F80) >> 7)