From abb2e6526b16826eca17ba57c72e36ed852d4296 Mon Sep 17 00:00:00 2001
From: meepingsnesroms <guicrith@gmail.com>
Date: Fri, 28 Dec 2018 16:57:58 -0800
Subject: [PATCH] Disable cyclone again

As of now its not stable and there isnt plans to reenable it unless someone else can figure out what is wrong since I dont know ARM ASM.
---
 bugs/regressions.txt                      |  2 ++
 libretroBuildSystem/build/Makefile.common | 18 +++++++++---------
 libretroBuildSystem/jni/Android.mk        | 10 +++++-----
 qtBuildSystem/Mu/Mu.pro                   |  2 +-
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/bugs/regressions.txt b/bugs/regressions.txt
index e2f23df..3ac4b5b 100644
--- a/bugs/regressions.txt
+++ b/bugs/regressions.txt
@@ -1,3 +1,5 @@
+cyclone68k is crasing again when you turn the Palm off then turn it back on
+
 Fixed:
 Endian compatibility is broken(the CPU state needs to be standardized)(fixed again with musashi and the other 68k core isn't used right now)
 RetroArch port crashes on exit(needed to check if environ_cb returned true, switched to libretro-common filestreams too)
diff --git a/libretroBuildSystem/build/Makefile.common b/libretroBuildSystem/build/Makefile.common
index 2e06e27..f0afcdc 100644
--- a/libretroBuildSystem/build/Makefile.common
+++ b/libretroBuildSystem/build/Makefile.common
@@ -28,15 +28,15 @@ else ifeq ($(platform), osx)
 	endif
 endif
 
-ifneq (,$(filter qnx vita ctr rpi2 classic_armv7_a7,$(platform)))
-	EMU_OPTIMIZE_FOR_ARM32 = 1
-else ifneq (,$(findstring armv7,$(platform)))
-	EMU_OPTIMIZE_FOR_ARM32 = 1
-else ifneq (,$(findstring armv6,$(platform)))
-	EMU_OPTIMIZE_FOR_ARM32 = 1
-else ifneq (,$(findstring armhf,$(platform)))
-	EMU_OPTIMIZE_FOR_ARM32 = 1
-endif
+# ifneq (,$(filter qnx vita ctr rpi2 classic_armv7_a7,$(platform)))
+# 	EMU_OPTIMIZE_FOR_ARM32 = 1
+# else ifneq (,$(findstring armv7,$(platform)))
+# 	EMU_OPTIMIZE_FOR_ARM32 = 1
+# else ifneq (,$(findstring armv6,$(platform)))
+# 	EMU_OPTIMIZE_FOR_ARM32 = 1
+# else ifneq (,$(findstring armhf,$(platform)))
+# 	EMU_OPTIMIZE_FOR_ARM32 = 1
+# endif
 
 include $(EMU_PATH)/makefile.all
 
diff --git a/libretroBuildSystem/jni/Android.mk b/libretroBuildSystem/jni/Android.mk
index ded2993..f236de3 100644
--- a/libretroBuildSystem/jni/Android.mk
+++ b/libretroBuildSystem/jni/Android.mk
@@ -8,11 +8,11 @@ GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
 EMU_OPTIMIZE_FOR_ARM32 := 0
 
 # set ASM CPU core, only use with ARMv4<->7, ARMv8 is its own architecture
-ifeq ($(TARGET_ARCH), arm)
-	ifneq ($(TARGET_ARCH_ABI), arm64-v8a)
-		EMU_OPTIMIZE_FOR_ARM32 := 1
-	endif
-endif
+# ifeq ($(TARGET_ARCH), arm)
+# 	ifneq ($(TARGET_ARCH_ABI), arm64-v8a)
+# 		EMU_OPTIMIZE_FOR_ARM32 := 1
+# 	endif
+# endif
 
 include $(CORE_DIR)/build/Makefile.common
 
diff --git a/qtBuildSystem/Mu/Mu.pro b/qtBuildSystem/Mu/Mu.pro
index 9962800..6852f52 100644
--- a/qtBuildSystem/Mu/Mu.pro
+++ b/qtBuildSystem/Mu/Mu.pro
@@ -50,7 +50,7 @@ android{
     QMAKE_CXXFLAGS += -fopenmp
     QMAKE_LFLAGS += -fopenmp
     DEFINES += EMU_MULTITHREADED
-    CONFIG += optimize_for_arm32 # for now, later this will check if building for ARMv4<->7
+    # CONFIG += optimize_for_arm32 # for now, later this will check if building for ARMv4<->7
 }
 
 ios{