diff options
| author | twinaphex | 2017-05-03 03:55:32 +0200 |
|---|---|---|
| committer | twinaphex | 2017-05-03 03:55:32 +0200 |
| commit | f0a02fdcf0043d9afa9c4b26c38c28cb761e1e10 (patch) | |
| tree | c4200a0cd30014da03c08455a6f619fedde4bc31 /plugins/dfsound/arm_utils.S | |
| parent | ee091481d4aa4a525f84f9c499641c9ba49b8164 (diff) | |
| parent | 0e4ad31902f206e2c6945632bb1f558eae941ff1 (diff) | |
| download | pcsx_rearmed-f0a02fdcf0043d9afa9c4b26c38c28cb761e1e10.tar.gz pcsx_rearmed-f0a02fdcf0043d9afa9c4b26c38c28cb761e1e10.tar.bz2 pcsx_rearmed-f0a02fdcf0043d9afa9c4b26c38c28cb761e1e10.zip | |
Merge https://github.com/notaz/pcsx_rearmed
Diffstat (limited to 'plugins/dfsound/arm_utils.S')
| -rw-r--r-- | plugins/dfsound/arm_utils.S | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/dfsound/arm_utils.S b/plugins/dfsound/arm_utils.S index eaeca51..8ac7c30 100644 --- a/plugins/dfsound/arm_utils.S +++ b/plugins/dfsound/arm_utils.S @@ -10,7 +10,7 @@ #include "arm_features.h" -#ifdef __MACH__ +#ifdef TEXRELS_FORBIDDEN .data .align 2 ptr_ChanBuf: .word ESYM(ChanBuf) @@ -20,14 +20,14 @@ ptr_ChanBuf: .word ESYM(ChanBuf) .align 2 .macro load_varadr reg var -#if defined(HAVE_ARMV7) && !defined(__PIC__) - movw \reg, #:lower16:ESYM(\var) - movt \reg, #:upper16:ESYM(\var) -#elif defined(HAVE_ARMV7) && 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] +#elif defined(HAVE_ARMV7) && !defined(__PIC__) + movw \reg, #:lower16:ESYM(\var) + movt \reg, #:upper16:ESYM(\var) #else ldr \reg, =ESYM(\var) #endif |