diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-08 14:19:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-08 14:19:55 +0100 |
| commit | 89c8eaa3216a48c1d18cc390525e90db74513f0c (patch) | |
| tree | 390a2684c7821394702fcf644f13aedcf54d0290 /libavutil | |
| parent | ee9e7a2e7a66501d5596f6bb992dc6afeaad8ec7 (diff) | |
| parent | 637606de2d2e0af0a9fa2f23f943765d7d7c5cd5 (diff) | |
| download | ffmpeg-89c8eaa3216a48c1d18cc390525e90db74513f0c.tar.gz | |
Merge commit '637606de2d2e0af0a9fa2f23f943765d7d7c5cd5'
* commit '637606de2d2e0af0a9fa2f23f943765d7d7c5cd5':
configure: arm: make _inline arch ext symbols depend on inline_asm
arm: use HAVE*_INLINE/EXTERNAL macros for conditional compilation
Conflicts:
configure
libavcodec/arm/dca.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/arm/asm.S | 6 | ||||
| -rw-r--r-- | libavutil/arm/bswap.h | 6 | ||||
| -rw-r--r-- | libavutil/arm/intmath.h | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/libavutil/arm/asm.S b/libavutil/arm/asm.S index bb7c383875..07bb6ae5b9 100644 --- a/libavutil/arm/asm.S +++ b/libavutil/arm/asm.S @@ -89,7 +89,7 @@ ELF .size \name, . - \name \name: .endm -#if !HAVE_ARMV6T2 +#if !HAVE_ARMV6T2_EXTERNAL .macro movw rd, val mov \rd, \val & 255 orr \rd, \val & ~255 @@ -97,7 +97,7 @@ ELF .size \name, . - \name #endif .macro mov32 rd, val -#if HAVE_ARMV6T2 +#if HAVE_ARMV6T2_EXTERNAL movw \rd, #(\val) & 0xffff .if (\val) >> 16 movt \rd, #(\val) >> 16 @@ -146,7 +146,7 @@ T ldr \rd, [\rd] .macro movrel rd, val #if CONFIG_PIC ldpic \rd, \val -#elif HAVE_ARMV6T2 && !defined(__APPLE__) +#elif HAVE_ARMV6T2_EXTERNAL && !defined(__APPLE__) movw \rd, #:lower16:\val movt \rd, #:upper16:\val #else diff --git a/libavutil/arm/bswap.h b/libavutil/arm/bswap.h index c10c35fa16..ae5fdb7eb8 100644 --- a/libavutil/arm/bswap.h +++ b/libavutil/arm/bswap.h @@ -35,7 +35,7 @@ static av_always_inline av_const uint32_t av_bswap32(uint32_t x) #elif HAVE_INLINE_ASM -#if HAVE_ARMV6 +#if HAVE_ARMV6_INLINE #define av_bswap16 av_bswap16 static av_always_inline av_const unsigned av_bswap16(unsigned x) { @@ -48,7 +48,7 @@ static av_always_inline av_const unsigned av_bswap16(unsigned x) #define av_bswap32 av_bswap32 static av_always_inline av_const uint32_t av_bswap32(uint32_t x) { -#if HAVE_ARMV6 +#if HAVE_ARMV6_INLINE __asm__("rev %0, %0" : "+r"(x)); #else uint32_t t; @@ -57,7 +57,7 @@ static av_always_inline av_const uint32_t av_bswap32(uint32_t x) "mov %0, %0, ror #8 \n\t" "eor %0, %0, %1, lsr #8 \n\t" : "+r"(x), "=&r"(t)); -#endif /* HAVE_ARMV6 */ +#endif /* HAVE_ARMV6_INLINE */ return x; } #endif /* !AV_GCC_VERSION_AT_LEAST(4,5) */ diff --git a/libavutil/arm/intmath.h b/libavutil/arm/intmath.h index 0980a6f3b7..fd52648f88 100644 --- a/libavutil/arm/intmath.h +++ b/libavutil/arm/intmath.h @@ -28,7 +28,7 @@ #if HAVE_INLINE_ASM -#if HAVE_ARMV6 +#if HAVE_ARMV6_INLINE #define av_clip_uint8 av_clip_uint8_arm static av_always_inline av_const unsigned av_clip_uint8_arm(int a) @@ -86,7 +86,7 @@ static av_always_inline int av_sat_dadd32_arm(int a, int b) return r; } -#endif /* HAVE_ARMV6 */ +#endif /* HAVE_ARMV6_INLINE */ #if HAVE_ASM_MOD_Q |