From 8f2bb0cbd20c00475196d1efb72103b65e57bc66 Mon Sep 17 00:00:00 2001
From: notaz
Date: Fri, 1 Apr 2016 01:49:55 +0300
Subject: don't use __ARM_ARCH_7A__

github issue #68
---
 frontend/libretro.c | 4 ++--
 frontend/main.c     | 5 +++--
 frontend/menu.c     | 9 +++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'frontend')

diff --git a/frontend/libretro.c b/frontend/libretro.c
index acc64a1..37cccc4 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -25,6 +25,7 @@
 #include "main.h"
 #include "plugin.h"
 #include "plugin_lib.h"
+#include "arm_features.h"
 #include "revision.h"
 #include "libretro.h"
 
@@ -1249,9 +1250,8 @@ void retro_init(void)
 	/* Set how much slower PSX CPU runs * 100 (so that 200 is 2 times)
 	 * we have to do this because cache misses and some IO penalties
 	 * are not emulated. Warning: changing this may break compatibility. */
-#if !defined(__arm__) || defined(__ARM_ARCH_7A__)
 	cycle_multiplier = 175;
-#else
+#ifdef HAVE_PRE_ARMV7
 	cycle_multiplier = 200;
 #endif
 	pl_rearmed_cbs.gpu_peops.iUseDither = 1;
diff --git a/frontend/main.c b/frontend/main.c
index 4c84803..a824fdc 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -26,6 +26,7 @@
 #include "../libpcsxcore/new_dynarec/new_dynarec.h"
 #include "../plugins/cdrcimg/cdrcimg.h"
 #include "../plugins/dfsound/spu_config.h"
+#include "arm_features.h"
 #include "revision.h"
 
 #ifndef NO_FRONTEND
@@ -142,7 +143,7 @@ void emu_set_default_config(void)
 	spu_config.iVolume = 768;
 	spu_config.iTempo = 0;
 	spu_config.iUseThread = 1; // no effect if only 1 core is detected
-#if defined(__arm__) && !defined(__ARM_ARCH_7A__) /* XXX GPH hack */
+#ifdef HAVE_PRE_ARMV7 /* XXX GPH hack */
 	spu_config.iUseReverb = 0;
 	spu_config.iUseInterpolation = 0;
 	spu_config.iTempo = 1;
@@ -771,7 +772,7 @@ int emu_save_state(int slot)
 		return ret;
 
 	ret = SaveState(fname);
-#if defined(__arm__) && !defined(__ARM_ARCH_7A__) /* XXX GPH hack */
+#ifdef HAVE_PRE_ARMV7 /* XXX GPH hack */
 	sync();
 #endif
 	SysPrintf("* %s \"%s\" [%d]\n",
diff --git a/frontend/menu.c b/frontend/menu.c
index 9ddbe37..cf9382a 100644
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -39,6 +39,7 @@
 #include "../plugins/dfinput/externals.h"
 #include "../plugins/dfsound/spu_config.h"
 #include "psemu_plugin_defs.h"
+#include "arm_features.h"
 #include "revision.h"
 
 #define REARMED_BIRTHDAY_TIME 1293306830	/* 25 Dec 2010 */
@@ -100,7 +101,7 @@ int scanlines, scanline_level = 20;
 int soft_scaling, analog_deadzone; // for Caanoo
 int soft_filter;
 
-#ifdef __ARM_ARCH_7A__
+#ifndef HAVE_PRE_ARMV7
 #define DEFAULT_PSX_CLOCK 57
 #define DEFAULT_PSX_CLOCK_S "57"
 #else
@@ -732,7 +733,7 @@ static unsigned short fname2color(const char *fname)
 static void draw_savestate_bg(int slot);
 
 #define MENU_ALIGN_LEFT
-#ifdef __ARM_ARCH_7A__ // assume hires device
+#ifndef HAVE_PRE_ARMV7 // assume hires device
 #define MENU_X2 1
 #else
 #define MENU_X2 0
@@ -852,7 +853,7 @@ me_bind_action emuctrl_actions[] =
 	{ "Toggle Frameskip ", 1 << SACTION_TOGGLE_FSKIP },
 	{ "Take Screenshot  ", 1 << SACTION_SCREENSHOT },
 	{ "Show/Hide FPS    ", 1 << SACTION_TOGGLE_FPS },
-#ifdef __ARM_ARCH_7A__
+#ifndef HAVE_PRE_ARMV7
 	{ "Switch Renderer  ", 1 << SACTION_SWITCH_DISPMODE },
 #endif
 	{ "Fast Forward     ", 1 << SACTION_FAST_FORWARD },
@@ -2521,7 +2522,7 @@ void menu_init(void)
 	me_enable(e_menu_gfx_options, MA_OPT_GAMMA,
 		plat_target.gamma_set != NULL);
 
-#ifndef __ARM_ARCH_7A__
+#ifdef HAVE_PRE_ARMV7
 	me_enable(e_menu_gfx_options, MA_OPT_SWFILTER, 0);
 #endif
 	me_enable(e_menu_gfx_options, MA_OPT_VARSCALER, MENU_SHOW_VARSCALER);
-- 
cgit v1.2.3