From a80ae4a0353fce94df700ec84222d3c56c3d813a Mon Sep 17 00:00:00 2001
From: notaz
Date: Fri, 23 Sep 2011 19:29:03 +0300
Subject: support armv5 build

---
 libpcsxcore/new_dynarec/emu_if.c      | 4 +++-
 libpcsxcore/new_dynarec/emu_if.h      | 4 ++++
 libpcsxcore/new_dynarec/linkage_arm.s | 9 +--------
 3 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'libpcsxcore/new_dynarec')

diff --git a/libpcsxcore/new_dynarec/emu_if.c b/libpcsxcore/new_dynarec/emu_if.c
index 5821650..8a068ea 100644
--- a/libpcsxcore/new_dynarec/emu_if.c
+++ b/libpcsxcore/new_dynarec/emu_if.c
@@ -161,11 +161,13 @@ static int ari64_init()
 	for (i = 0; i < ARRAY_SIZE(gte_handlers); i++)
 		if (psxCP2[i] != psxNULL)
 			gte_handlers[i] = psxCP2[i];
-#if defined(__arm__) && !defined(DRC_DBG)
+#ifndef DRC_DBG
+#ifdef __ARM_NEON__
 	gte_handlers[0x01] = gteRTPS_neon;
 	gte_handlers[0x30] = gteRTPT_neon;
 	gte_handlers[0x12] = gteMVMVA_neon;
 	gte_handlers[0x06] = gteNCLIP_neon;
+#endif
 #endif
 	psxH_ptr = psxH;
 
diff --git a/libpcsxcore/new_dynarec/emu_if.h b/libpcsxcore/new_dynarec/emu_if.h
index 128d431..8acd1f5 100644
--- a/libpcsxcore/new_dynarec/emu_if.h
+++ b/libpcsxcore/new_dynarec/emu_if.h
@@ -1,6 +1,10 @@
 #include "new_dynarec.h"
 #include "../r3000a.h"
 
+#ifndef __ARM_ARCH_7A__
+#define ARMv5_ONLY
+#endif
+
 extern char invalid_code[0x100000];
 
 /* weird stuff */
diff --git a/libpcsxcore/new_dynarec/linkage_arm.s b/libpcsxcore/new_dynarec/linkage_arm.s
index c545ed3..f5af0f5 100644
--- a/libpcsxcore/new_dynarec/linkage_arm.s
+++ b/libpcsxcore/new_dynarec/linkage_arm.s
@@ -19,15 +19,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-.equiv HAVE_ARMV7, 1
+/* .equiv HAVE_ARMV7, 1 */
 
-.if HAVE_ARMV7
-	.cpu cortex-a8
-	.fpu vfp
-.else
-	.cpu arm9tdmi
-	.fpu softvfp
-.endif 
 	.global	rdram
 rdram = 0x80000000
 	.global	dynarec_local
-- 
cgit v1.2.3