diff options
| author | dankcushions | 2016-04-22 15:10:35 +0100 |
|---|---|---|
| committer | dankcushions | 2016-04-22 15:10:35 +0100 |
| commit | 163249087400935f084080127990bc762e83319c (patch) | |
| tree | 93e9704ebb9395c4f6c7bab847d9df7abb005d3d /plugins/dfsound | |
| parent | 4ed8f00a1221b15925117f1c7413b4640e6e7198 (diff) | |
| parent | cb4d282af668df3bdbd428be5a5ad26996cd0f4f (diff) | |
| download | pcsx_rearmed-163249087400935f084080127990bc762e83319c.tar.gz pcsx_rearmed-163249087400935f084080127990bc762e83319c.tar.bz2 pcsx_rearmed-163249087400935f084080127990bc762e83319c.zip | |
Merge branch 'notaz-master'
Diffstat (limited to 'plugins/dfsound')
| -rw-r--r-- | plugins/dfsound/arm_utils.S | 4 | ||||
| -rw-r--r-- | plugins/dfsound/spu.c | 2 |
2 files changed, 3 insertions, 3 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: diff --git a/plugins/dfsound/spu.c b/plugins/dfsound/spu.c index c6a1bf5..0058ad2 100644 --- a/plugins/dfsound/spu.c +++ b/plugins/dfsound/spu.c @@ -35,7 +35,7 @@ #include "arm_features.h" #endif -#ifdef __ARM_ARCH_7A__ +#ifdef HAVE_ARMV7 #define ssat32_to_16(v) \ asm("ssat %0,#16,%1" : "=r" (v) : "r" (v)) #else |