diff options
| author | notaz | 2016-04-01 01:49:55 +0300 |
|---|---|---|
| committer | notaz | 2016-04-01 02:39:58 +0300 |
| commit | 8f2bb0cbd20c00475196d1efb72103b65e57bc66 (patch) | |
| tree | 5ed73d69b8a3194f819b741f5f4872ede92d93ee /plugins | |
| parent | 8638b7ee92c5bad04f724b056efb47e390b2ad8c (diff) | |
| download | pcsx_rearmed-8f2bb0cbd20c00475196d1efb72103b65e57bc66.tar.gz pcsx_rearmed-8f2bb0cbd20c00475196d1efb72103b65e57bc66.tar.bz2 pcsx_rearmed-8f2bb0cbd20c00475196d1efb72103b65e57bc66.zip | |
don't use __ARM_ARCH_7A__
github issue #68
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/dfsound/arm_utils.S | 4 | ||||
| -rw-r--r-- | plugins/dfsound/spu.c | 2 | ||||
| -rw-r--r-- | plugins/gpu_unai/gpulib_if.cpp | 3 |
3 files changed, 5 insertions, 4 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 diff --git a/plugins/gpu_unai/gpulib_if.cpp b/plugins/gpu_unai/gpulib_if.cpp index 646b0f2..2dedbf8 100644 --- a/plugins/gpu_unai/gpulib_if.cpp +++ b/plugins/gpu_unai/gpulib_if.cpp @@ -23,6 +23,7 @@ #include <stdlib.h> #include <string.h> #include "../gpulib/gpu.h" +#include "arm_features.h" #define u8 uint8_t #define s8 int8_t @@ -171,7 +172,7 @@ int do_cmd_list(unsigned int *list, int list_len, int *last_cmd) unsigned int *list_end = list + list_len; linesInterlace = force_interlace; -#ifndef __ARM_ARCH_7A__ /* XXX */ +#ifdef HAVE_PRE_ARMV7 /* XXX */ linesInterlace |= gpu.status.interlace; #endif |