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
gpulib: maybe better loop detection
[pcsx_rearmed.git]
/
plugins
/
dfsound
/
arm_utils.S
diff --git
a/plugins/dfsound/arm_utils.S
b/plugins/dfsound/arm_utils.S
index
9652313
..
8ac7c30
100644
(file)
--- a/
plugins/dfsound/arm_utils.S
+++ b/
plugins/dfsound/arm_utils.S
@@
-10,7
+10,7
@@
#include "arm_features.h"
#include "arm_features.h"
-#ifdef
__MACH__
+#ifdef
TEXRELS_FORBIDDEN
.data
.align 2
ptr_ChanBuf: .word ESYM(ChanBuf)
.data
.align 2
ptr_ChanBuf: .word ESYM(ChanBuf)
@@
-20,14
+20,14
@@
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__)
- movw \reg, #:lower16:ESYM(\var)
- movt \reg, #:upper16:ESYM(\var)
-#elif defined(__ARM_ARCH_7A__) && defined(__MACH__)
+#if defined(HAVE_ARMV7) && defined(TEXRELS_FORBIDDEN)
movw \reg, #:lower16:(ptr_\var-(1678f+8))
movt \reg, #:upper16:(ptr_\var-(1678f+8))
1678:
ldr \reg, [pc, \reg]
movw \reg, #:lower16:(ptr_\var-(1678f+8))
movt \reg, #:upper16:(ptr_\var-(1678f+8))
1678:
ldr \reg, [pc, \reg]
+#elif defined(HAVE_ARMV7) && !defined(__PIC__)
+ movw \reg, #:lower16:ESYM(\var)
+ movt \reg, #:upper16:ESYM(\var)
#else
ldr \reg, =ESYM(\var)
#endif
#else
ldr \reg, =ESYM(\var)
#endif