Unified · Split
| @@ -191,11 +191,7 @@ static int have_simd() · 190 unmodified lines | |||
| 191 | #define HAVE_SIMD 0 | 191 | #define HAVE_SIMD 0 |
| 192 | #endif /* !defined(MINIMP3_NO_SIMD) */ | 192 | #endif /* !defined(MINIMP3_NO_SIMD) */ |
| 193 | 193 | ||
| 194 | #define HAVE_ARMV6 0 | ||
| 195 | #if defined(__ARM_ARCH) && (__ARM_ARCH >= 6) && !defined(__aarch64__) | 194 | #if defined(__ARM_ARCH) && (__ARM_ARCH >= 6) && !defined(__aarch64__) |
| 196 | #ifdef HAVE_ARMV6 | ||
| 197 | #undef HAVE_ARMV6 | ||
| 198 | #endif | ||
| 199 | #define HAVE_ARMV6 1 | 195 | #define HAVE_ARMV6 1 |
| 200 | static __inline__ __attribute__((always_inline)) int32_t minimp3_clip_int16_arm(int32_t a) | 196 | static __inline__ __attribute__((always_inline)) int32_t minimp3_clip_int16_arm(int32_t a) |
| 201 | { | 197 | { |
| @@ -203,6 +199,8 @@ static __inline__ __attribute__((always_inline)) int32_t minimp3_clip_int16_arm( · 1 unmodified line | |||
| 203 | __asm__ ("ssat %0, #16, %1" : "=r"(x) : "r"(a)); | 199 | __asm__ ("ssat %0, #16, %1" : "=r"(x) : "r"(a)); |
| 204 | return x; | 200 | return x; |
| 205 | } | 201 | } |
| 202 | #else | ||
| 203 | #define HAVE_ARMV6 0 | ||
| 206 | #endif | 204 | #endif |
| 207 | 205 | ||
| 208 | typedef struct | 206 | typedef struct |