From 57500ad8f9c770317308244204ec5d41177d18b4 Mon Sep 17 00:00:00 2001
From: Frode Solheim <frode@fs-uae.net>
Date: Sun, 20 Sep 2015 11:24:55 +0200
Subject: [PATCH] JIT: Set compfpu default to 0 for 64-bit CPU, change a double
 to float

---
 cfgfile.cpp         | 5 +++++
 jit/codegen_x86.cpp | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/cfgfile.cpp b/cfgfile.cpp
index f7c1cfb6..62be8a3b 100644
--- a/cfgfile.cpp
+++ b/cfgfile.cpp
@@ -6015,7 +6015,12 @@ void default_prefs (struct uae_prefs *p, int type)
 	p->comp_hardflush = 0;
 	p->comp_constjump = 1;
 #ifdef USE_JIT_FPU
+#ifdef CPU_x86_64
+	/* Set default to off, since JIT FPU isn't 64-bit safe yet. */
+	p->compfpu = 0;
+#else
 	p->compfpu = 1;
+#endif
 #else
 	p->compfpu = 0;
 #endif
diff --git a/jit/codegen_x86.cpp b/jit/codegen_x86.cpp
index 7d1aca78..e68726c9 100644
--- a/jit/codegen_x86.cpp
+++ b/jit/codegen_x86.cpp
@@ -4323,7 +4323,8 @@ LOWFUNC(NONE,NONE,2,raw_fsin_rr,(FW d, FR s))
 }
 LENDFUNC(NONE,NONE,2,raw_fsin_rr,(FW d, FR s))
 
-static const double one=1;
+float one = 1;
+
 LOWFUNC(NONE,NONE,2,raw_ftwotox_rr,(FW d, FR s))
 {
 	int ds;
-- 
2.47.3