ARM: set Tag_ABI_align_preserved in all asm files

All our ARM asm preserves alignment so setting this attribute
in a common location is simpler.  This removes numerous warnings
when linking with armcc.

Signed-off-by: Mans Rullgard <mans@mansr.com>

diff --git a/libavcodec/arm/dsputil_arm.S b/libavcodec/arm/dsputil_arm.S
index 3686bef..78d7ad8 100644 (file)
--- a/libavcodec/arm/dsputil_arm.S
+++ b/libavcodec/arm/dsputil_arm.S
@@ -22,8 +22,6 @@
 #include "config.h"
 #include "libavutil/arm/asm.S"
 
-        preserve8
-
 #if HAVE_ARMV5TE
 function ff_prefetch_arm, export=1
         subs            r2,  r2,  #1

diff --git a/libavcodec/arm/dsputil_armv6.S b/libavcodec/arm/dsputil_armv6.S
index 6eabeee..61535a1 100644 (file)
--- a/libavcodec/arm/dsputil_armv6.S
+++ b/libavcodec/arm/dsputil_armv6.S
@@ -20,8 +20,6 @@
 
 #include "libavutil/arm/asm.S"
 
-        preserve8
-
 .macro  call_2x_pixels  type, subp
 function ff_\type\()_pixels16\subp\()_armv6, export=1
         push            {r0-r3, lr}

diff --git a/libavcodec/arm/dsputil_neon.S b/libavcodec/arm/dsputil_neon.S
index 358ed61..ca1d2de 100644 (file)
--- a/libavcodec/arm/dsputil_neon.S
+++ b/libavcodec/arm/dsputil_neon.S
@@ -22,8 +22,6 @@
 #include "config.h"
 #include "libavutil/arm/asm.S"
 
-        preserve8
-
 function ff_clear_block_neon, export=1
         vmov.i16        q0,  #0
         .rept           8

diff --git a/libavcodec/arm/fmtconvert_neon.S b/libavcodec/arm/fmtconvert_neon.S
index 66ff166..41a095a 100644 (file)
--- a/libavcodec/arm/fmtconvert_neon.S
+++ b/libavcodec/arm/fmtconvert_neon.S
@@ -22,8 +22,6 @@
 #include "config.h"
 #include "libavutil/arm/asm.S"
 
-        preserve8
-
 function ff_float_to_int16_neon, export=1
         subs            r2,  r2,  #8
         vld1.64         {d0-d1},  [r1,:128]!

diff --git a/libavcodec/arm/h264idct_neon.S b/libavcodec/arm/h264idct_neon.S
index 182d3b2..b23ddb1 100644 (file)
--- a/libavcodec/arm/h264idct_neon.S
+++ b/libavcodec/arm/h264idct_neon.S
@@ -20,8 +20,6 @@
 
 #include "libavutil/arm/asm.S"
 
-        preserve8
-
 function ff_h264_idct_add_neon, export=1
         vld1.64         {d0-d3},  [r1,:128]
 

diff --git a/libavcodec/arm/int_neon.S b/libavcodec/arm/int_neon.S
index 92cc518..04208c2 100644 (file)
--- a/libavcodec/arm/int_neon.S
+++ b/libavcodec/arm/int_neon.S
@@ -21,7 +21,6 @@
 
 #include "libavutil/arm/asm.S"
 
-        preserve8
         .fpu neon
 
 function ff_scalarproduct_int16_neon, export=1

diff --git a/libavcodec/arm/mdct_fixed_neon.S b/libavcodec/arm/mdct_fixed_neon.S
index 08a3887..c77be59 100644 (file)
--- a/libavcodec/arm/mdct_fixed_neon.S
+++ b/libavcodec/arm/mdct_fixed_neon.S
@@ -20,8 +20,6 @@
 
 #include "libavutil/arm/asm.S"
 
-        preserve8
-
 .macro  prerot          dst, rt
         lsr             r3,  r6,  #2            @ n4
         add             \rt, r4,  r6,  lsr #1   @ revtab + n4

diff --git a/libavcodec/arm/mdct_neon.S b/libavcodec/arm/mdct_neon.S
index 09dfdf4..9f7cb46 100644 (file)
--- a/libavcodec/arm/mdct_neon.S
+++ b/libavcodec/arm/mdct_neon.S
@@ -21,8 +21,6 @@
 
 #include "libavutil/arm/asm.S"
 
-        preserve8
-
 #define ff_fft_calc_neon X(ff_fft_calc_neon)
 
 function ff_imdct_half_neon, export=1

diff --git a/libavcodec/arm/rdft_neon.S b/libavcodec/arm/rdft_neon.S
index eb7433a..7d01d53 100644 (file)
--- a/libavcodec/arm/rdft_neon.S
+++ b/libavcodec/arm/rdft_neon.S
@@ -21,8 +21,6 @@
 
 #include "libavutil/arm/asm.S"
 
-        preserve8
-
 function ff_rdft_calc_neon, export=1
         push            {r4-r8,lr}
 

diff --git a/libavcodec/arm/synth_filter_neon.S b/libavcodec/arm/synth_filter_neon.S
index 6dabce6..62bb667 100644 (file)
--- a/libavcodec/arm/synth_filter_neon.S
+++ b/libavcodec/arm/synth_filter_neon.S
@@ -20,8 +20,6 @@
 
 #include "libavutil/arm/asm.S"
 
-        preserve8
-
 function ff_synth_filter_float_neon, export=1
         push            {r3-r11,lr}
 

diff --git a/libavutil/arm/asm.S b/libavutil/arm/asm.S
index 50305f7..67d42e6 100644 (file)
--- a/libavutil/arm/asm.S
+++ b/libavutil/arm/asm.S
@@ -52,14 +52,7 @@
 
         .syntax unified
 T       .thumb
-
-.macro  require8 val=1
-ELF     .eabi_attribute 24, \val
-.endm
-
-.macro  preserve8 val=1
-ELF     .eabi_attribute 25, \val
-.endm
+ELF     .eabi_attribute Tag_ABI_align_preserved, 1
 
 .macro  function name, export=0
         .set            .Lpic_idx, 0

diff --git a/libavutil/arm/float_dsp_neon.S b/libavutil/arm/float_dsp_neon.S
index 03b1643..4aa6f83 100644 (file)
--- a/libavutil/arm/float_dsp_neon.S
+++ b/libavutil/arm/float_dsp_neon.S
@@ -22,8 +22,6 @@
 #include "config.h"
 #include "asm.S"
 
-        preserve8
-
 function ff_vector_fmul_neon, export=1
         subs            r3,  r3,  #8
         vld1.32         {d0-d3},  [r1,:128]!