notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drc: fix a mistake from w^x change
[pcsx_rearmed.git]
/
plugins
/
dfsound
/
arm_utils.S
diff --git
a/plugins/dfsound/arm_utils.S
b/plugins/dfsound/arm_utils.S
index
9652313
..
eaeca51
100644
(file)
--- a/
plugins/dfsound/arm_utils.S
+++ b/
plugins/dfsound/arm_utils.S
@@
-20,10
+20,10
@@
ptr_ChanBuf: .word ESYM(ChanBuf)
.align 2
.macro load_varadr reg var
.align 2
.macro load_varadr reg var
-#if defined(
__ARM_ARCH_7A__
) && !defined(__PIC__)
+#if defined(
HAVE_ARMV7
) && !defined(__PIC__)
movw \reg, #:lower16:ESYM(\var)
movt \reg, #:upper16:ESYM(\var)
movw \reg, #:lower16:ESYM(\var)
movt \reg, #:upper16:ESYM(\var)
-#elif defined(
__ARM_ARCH_7A__
) && defined(__MACH__)
+#elif defined(
HAVE_ARMV7
) && defined(__MACH__)
movw \reg, #:lower16:(ptr_\var-(1678f+8))
movt \reg, #:upper16:(ptr_\var-(1678f+8))
1678:
movw \reg, #:lower16:(ptr_\var-(1678f+8))
movt \reg, #:upper16:(ptr_\var-(1678f+8))
1678: