diff options
| author | meepingsnesroms | 2017-09-01 11:21:48 -0700 |
|---|---|---|
| committer | GitHub | 2017-09-01 11:21:48 -0700 |
| commit | 6c5b8733e0b286d5a4b4d9b7899e4c17a92cd04a (patch) | |
| tree | 924720c49ac10c9ab3c98e3d3e06c8f4a06bc33c /plugins/dfsound/arm_utils.S | |
| parent | 646a63e41c53e5c1c971a4e305d4627dcee43c5e (diff) | |
| parent | 874706c9a527d43f1a737b772225c120da86c31e (diff) | |
| download | pcsx_rearmed-6c5b8733e0b286d5a4b4d9b7899e4c17a92cd04a.tar.gz pcsx_rearmed-6c5b8733e0b286d5a4b4d9b7899e4c17a92cd04a.tar.bz2 pcsx_rearmed-6c5b8733e0b286d5a4b4d9b7899e4c17a92cd04a.zip | |
Merge pull request #2 from libretro/master
Update from master
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 |