aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2012-10-02 16:00:48 +0100
committerMans Rullgard <mans@mansr.com>2012-10-02 19:47:56 +0100
commit5e826fd65e6e8385a196aa0fdb01f60cfb0b55b6 (patch)
treef5b211b68d728508a008f0ca12ad41dcf2fa32e9
parent7bda4ed780c23c4bd50cf9ccd91f235e67ab0eae (diff)
downloadffmpeg-5e826fd65e6e8385a196aa0fdb01f60cfb0b55b6.tar.gz
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>
-rw-r--r--libavcodec/arm/dsputil_arm.S2
-rw-r--r--libavcodec/arm/dsputil_armv6.S2
-rw-r--r--libavcodec/arm/dsputil_neon.S2
-rw-r--r--libavcodec/arm/fmtconvert_neon.S2
-rw-r--r--libavcodec/arm/h264idct_neon.S2
-rw-r--r--libavcodec/arm/int_neon.S1
-rw-r--r--libavcodec/arm/mdct_fixed_neon.S2
-rw-r--r--libavcodec/arm/mdct_neon.S2
-rw-r--r--libavcodec/arm/rdft_neon.S2
-rw-r--r--libavcodec/arm/synth_filter_neon.S2
-rw-r--r--libavutil/arm/asm.S9
-rw-r--r--libavutil/arm/float_dsp_neon.S2
12 files changed, 1 insertions, 29 deletions
diff --git a/libavcodec/arm/dsputil_arm.S b/libavcodec/arm/dsputil_arm.S
index 3686befec1..78d7ad8e81 100644
--- 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 6eabeee7ab..61535a121f 100644
--- 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 358ed61299..ca1d2dee3f 100644
--- 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 66ff166f24..41a095a9cc 100644
--- 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 182d3b2393..b23ddb1b73 100644
--- 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 92cc518338..04208c2be9 100644
--- 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 08a388777a..c77be59c65 100644
--- 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 09dfdf4dd2..9f7cb46cd0 100644
--- 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 eb7433aca4..7d01d53f1a 100644
--- 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 6dabce6db8..62bb6674ed 100644
--- 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 50305f778b..67d42e6ce6 100644
--- 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 03b164388f..4aa6f838dd 100644
--- 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]!