aboutsummaryrefslogtreecommitdiff
path: root/libpcsxcore/new_dynarec
diff options
context:
space:
mode:
authornotaz2016-04-01 01:49:55 +0300
committernotaz2016-04-01 02:39:58 +0300
commit8f2bb0cbd20c00475196d1efb72103b65e57bc66 (patch)
tree5ed73d69b8a3194f819b741f5f4872ede92d93ee /libpcsxcore/new_dynarec
parent8638b7ee92c5bad04f724b056efb47e390b2ad8c (diff)
downloadpcsx_rearmed-8f2bb0cbd20c00475196d1efb72103b65e57bc66.tar.gz
pcsx_rearmed-8f2bb0cbd20c00475196d1efb72103b65e57bc66.tar.bz2
pcsx_rearmed-8f2bb0cbd20c00475196d1efb72103b65e57bc66.zip
don't use __ARM_ARCH_7A__
github issue #68
Diffstat (limited to 'libpcsxcore/new_dynarec')
-rw-r--r--libpcsxcore/new_dynarec/linkage_arm.S10
1 files changed, 5 insertions, 5 deletions
diff --git a/libpcsxcore/new_dynarec/linkage_arm.S b/libpcsxcore/new_dynarec/linkage_arm.S
index 50b577b..95af8b4 100644
--- a/libpcsxcore/new_dynarec/linkage_arm.S
+++ b/libpcsxcore/new_dynarec/linkage_arm.S
@@ -116,10 +116,10 @@ ptr_hash_table:
#endif
.macro load_varadr reg var
-#if defined(__ARM_ARCH_7A__) && !defined(__PIC__)
+#if defined(HAVE_ARMV7) && !defined(__PIC__)
movw \reg, #:lower16:\var
movt \reg, #:upper16:\var
-#elif defined(__ARM_ARCH_7A__) && defined(__MACH__)
+#elif defined(HAVE_ARMV7) && defined(__MACH__)
movw \reg, #:lower16:(\var-(1678f+8))
movt \reg, #:upper16:(\var-(1678f+8))
1678:
@@ -130,7 +130,7 @@ ptr_hash_table:
.endm
.macro load_varadr_ext reg var
-#if defined(__ARM_ARCH_7A__) && defined(__MACH__) && defined(__PIC__)
+#if defined(HAVE_ARMV7) && defined(__MACH__) && defined(__PIC__)
movw \reg, #:lower16:(ptr_\var-(1678f+8))
movt \reg, #:upper16:(ptr_\var-(1678f+8))
1678:
@@ -141,7 +141,7 @@ ptr_hash_table:
.endm
.macro mov_16 reg imm
-#ifdef __ARM_ARCH_7A__
+#ifdef HAVE_ARMV7
movw \reg, #\imm
#else
mov \reg, #(\imm & 0x00ff)
@@ -150,7 +150,7 @@ ptr_hash_table:
.endm
.macro mov_24 reg imm
-#ifdef __ARM_ARCH_7A__
+#ifdef HAVE_ARMV7
movw \reg, #(\imm & 0xffff)
movt \reg, #(\imm >> 16)
#else