diff options
| author | Mans Rullgard <mans@mansr.com> | 2012-12-01 16:41:39 +0000 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2012-12-07 16:54:03 +0000 |
| commit | a7831d509f8db397f74895dca3dd3b4ac791ef03 (patch) | |
| tree | 22cac51b499ab8c14039ac79cc78b8b75c6089f3 /libavutil/arm/asm.S | |
| parent | 7f2b3dcabd108926bde819ad574017f4161d1546 (diff) | |
| download | ffmpeg-a7831d509f8db397f74895dca3dd3b4ac791ef03.tar.gz | |
arm: use HAVE*_INLINE/EXTERNAL macros for conditional compilation
These macros reflect the actual capabilities required here.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavutil/arm/asm.S')
| -rw-r--r-- | libavutil/arm/asm.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavutil/arm/asm.S b/libavutil/arm/asm.S index 78942c808c..8ac28e263e 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 |