diff options
| author | Mans Rullgard <mans@mansr.com> | 2011-05-29 14:22:52 +0100 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2011-05-29 15:42:56 +0100 |
| commit | 371266daa3df35c424203fff0ce2e6de0e33a29d (patch) | |
| tree | 0d855cfc3896f9083c3e532195976ca291f6fce8 /libavcodec | |
| parent | 7a70e01b267b499d92fda68724d311c94cd76b26 (diff) | |
| download | ffmpeg-371266daa3df35c424203fff0ce2e6de0e33a29d.tar.gz | |
ARM: enable UAL syntax in asm.S
This enables UAL syntax for all asm files instead of only those
which happen to be incompatible with the old, deprecated syntax.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/arm/asm.S | 2 | ||||
| -rw-r--r-- | libavcodec/arm/dsputil_vfp.S | 1 | ||||
| -rw-r--r-- | libavcodec/arm/fmtconvert_vfp.S | 2 | ||||
| -rw-r--r-- | libavcodec/arm/mpegvideo_armv5te_s.S | 2 | ||||
| -rw-r--r-- | libavcodec/arm/vp8_armv6.S | 2 |
5 files changed, 3 insertions, 6 deletions
diff --git a/libavcodec/arm/asm.S b/libavcodec/arm/asm.S index 6e3d7881dd..8d7fe98614 100644 --- a/libavcodec/arm/asm.S +++ b/libavcodec/arm/asm.S @@ -26,6 +26,8 @@ # define ELF @ #endif + .syntax unified + .macro require8 val=1 ELF .eabi_attribute 24, \val .endm diff --git a/libavcodec/arm/dsputil_vfp.S b/libavcodec/arm/dsputil_vfp.S index b41db03b63..16ea25afe6 100644 --- a/libavcodec/arm/dsputil_vfp.S +++ b/libavcodec/arm/dsputil_vfp.S @@ -21,7 +21,6 @@ #include "config.h" #include "asm.S" - .syntax unified /* * VFP is a floating point coprocessor used in some ARM cores. VFP11 has 1 cycle * throughput for almost all the instructions (except for double precision diff --git a/libavcodec/arm/fmtconvert_vfp.S b/libavcodec/arm/fmtconvert_vfp.S index e01627b669..1bb7f49801 100644 --- a/libavcodec/arm/fmtconvert_vfp.S +++ b/libavcodec/arm/fmtconvert_vfp.S @@ -21,8 +21,6 @@ #include "config.h" #include "asm.S" - .syntax unified - /** * ARM VFP optimized float to int16 conversion. * Assume that len is a positive number and is multiple of 8, destination diff --git a/libavcodec/arm/mpegvideo_armv5te_s.S b/libavcodec/arm/mpegvideo_armv5te_s.S index 6473926c0e..e83fe991e6 100644 --- a/libavcodec/arm/mpegvideo_armv5te_s.S +++ b/libavcodec/arm/mpegvideo_armv5te_s.S @@ -95,7 +95,7 @@ function ff_dct_unquantize_h263_armv5te, export=1 strh lr, [r0], #2 subs r3, r3, #8 - ldrgtd r4, [r0, #0] /* load data early to avoid load/use pipeline stall */ + ldrdgt r4, [r0, #0] /* load data early to avoid load/use pipeline stall */ bgt 1b adds r3, r3, #2 diff --git a/libavcodec/arm/vp8_armv6.S b/libavcodec/arm/vp8_armv6.S index 11d3521f8d..602c8a58be 100644 --- a/libavcodec/arm/vp8_armv6.S +++ b/libavcodec/arm/vp8_armv6.S @@ -20,8 +20,6 @@ #include "asm.S" - .syntax unified - .macro rac_get_prob h, bs, buf, cw, pr, t0, t1 adds \bs, \bs, \t0 lsl \cw, \cw, \t0 |