diff options
author | Twinaphex | 2016-04-22 17:06:53 +0200 |
---|---|---|
committer | Twinaphex | 2016-04-22 17:06:53 +0200 |
commit | 18ef7635b0b265350eb8304a26edeb8d4b0b2e19 (patch) | |
tree | 93e9704ebb9395c4f6c7bab847d9df7abb005d3d /plugins/dfsound/arm_utils.S | |
parent | 4ed8f00a1221b15925117f1c7413b4640e6e7198 (diff) | |
parent | 163249087400935f084080127990bc762e83319c (diff) | |
download | pcsx_rearmed-18ef7635b0b265350eb8304a26edeb8d4b0b2e19.tar.gz pcsx_rearmed-18ef7635b0b265350eb8304a26edeb8d4b0b2e19.tar.bz2 pcsx_rearmed-18ef7635b0b265350eb8304a26edeb8d4b0b2e19.zip |
Merge pull request #33 from dankcushions/master
Merging in latest upstream changes
Diffstat (limited to 'plugins/dfsound/arm_utils.S')
-rw-r--r-- | plugins/dfsound/arm_utils.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/dfsound/arm_utils.S b/plugins/dfsound/arm_utils.S index 9652313..eaeca51 100644 --- 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 -#if defined(__ARM_ARCH_7A__) && !defined(__PIC__) +#if defined(HAVE_ARMV7) && !defined(__PIC__) 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: |