From 820ab7126cd1a857f3c3299125eb5d9f280f2de5 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Tue, 11 Aug 2015 14:34:51 -0600
Subject: [PATCH] fix enum mismatch in ARM JIT

Also, recognize `__ARM_ARCH_6ZK__`.
---
 racket/src/racket/src/lightning/arm/asm.h    | 2 +-
 racket/src/racket/src/lightning/arm/fp-swf.h | 2 +-
 racket/src/racket/src/lightning/arm/fp-vfp.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/racket/src/racket/src/lightning/arm/asm.h b/racket/src/racket/src/lightning/arm/asm.h
index 81e4b78212..7eaa50b327 100644
--- a/racket/src/racket/src/lightning/arm/asm.h
+++ b/racket/src/racket/src/lightning/arm/asm.h
@@ -124,7 +124,7 @@ typedef enum {
 # define JIT_ARM_THUMB 1
 # define JIT_ARM_VERSION 5
 # define JIT_ARM_EXTENDED 1
-#elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6K__)
+#elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6ZK__)
 # define JIT_ARM_VERSION 6
 #elif defined(__ARM_ARCH_6T__) || defined(__ARM_ARCH_6T2__)
 # define JIT_ARM_THUMB 2
diff --git a/racket/src/racket/src/lightning/arm/fp-swf.h b/racket/src/racket/src/lightning/arm/fp-swf.h
index 8402493b99..c310f0ab46 100644
--- a/racket/src/racket/src/lightning/arm/fp-swf.h
+++ b/racket/src/racket/src/lightning/arm/fp-swf.h
@@ -570,7 +570,7 @@ swf_iff(jit_state_t _jitp, int (*i0)(float, float),
 
 __jit_inline void
 swf_idd(jit_state_t _jitp, int (*i0)(double, double),
-	jit_fpr_t r0, jit_fpr_t r1, jit_fpr_t r2)
+	jit_gpr_t r0, jit_fpr_t r1, jit_fpr_t r2)
 {
     int			l;
     l = 0xf;
diff --git a/racket/src/racket/src/lightning/arm/fp-vfp.h b/racket/src/racket/src/lightning/arm/fp-vfp.h
index d114395fd5..737b13315f 100644
--- a/racket/src/racket/src/lightning/arm/fp-vfp.h
+++ b/racket/src/racket/src/lightning/arm/fp-vfp.h
@@ -420,7 +420,7 @@ _vcmp_10_f(jit_state_t _jitp, int cc, jit_gpr_t r0, jit_fpr_t r1, jit_fpr_t r2)
 }
 
 __jit_inline void
-_vcmp_10_d(jit_state_t _jitp, int cc, jit_gpr_t r0, jit_gpr_t r1, jit_gpr_t r2)
+_vcmp_10_d(jit_state_t _jitp, int cc, jit_gpr_t r0, jit_fpr_t r1, jit_fpr_t r2)
 {
     _VCMP_F64(r1, r2);
     _vcmp10_x(_jitp, cc, r0);