From 3a0b72dee0d92470cd8bd986dd419e387c7cf5ec Mon Sep 17 00:00:00 2001
From: Mans Rullgard <mans@mansr.com>
Date: Tue, 22 Nov 2011 16:53:18 +0000
Subject: [PATCH] ARM: remove needless .text/.align directives
The 'function' macro already includes the appropriate
directives.
Signed-off-by: Mans Rullgard <mans@mansr.com>
---
libavcodec/arm/dsputil_armv6.S | 2 --
libavcodec/arm/dsputil_neon.S | 1 -
libavcodec/arm/fft_neon.S | 1 -
libavcodec/arm/fmtconvert_neon.S | 1 -
libavcodec/arm/h264dsp_neon.S | 3 ---
libavcodec/arm/h264idct_neon.S | 1 -
libavcodec/arm/int_neon.S | 1 -
libavcodec/arm/mdct_neon.S | 2 --
libavcodec/arm/simple_idct_arm.S | 2 --
9 files changed, 14 deletions(-)
diff --git a/libavcodec/arm/dsputil_armv6.S b/libavcodec/arm/dsputil_armv6.S
index b8461059d9a..becf85182db 100644
--- a/libavcodec/arm/dsputil_armv6.S
+++ b/libavcodec/arm/dsputil_armv6.S
@@ -22,8 +22,6 @@
preserve8
- .text
-
.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 13f0699eb25..33969134d73 100644
--- a/libavcodec/arm/dsputil_neon.S
+++ b/libavcodec/arm/dsputil_neon.S
@@ -23,7 +23,6 @@
#include "asm.S"
preserve8
- .text
function ff_clear_block_neon, export=1
vmov.i16 q0, #0
diff --git a/libavcodec/arm/fft_neon.S b/libavcodec/arm/fft_neon.S
index b79a2dc2653..a45898592ee 100644
--- a/libavcodec/arm/fft_neon.S
+++ b/libavcodec/arm/fft_neon.S
@@ -28,7 +28,6 @@
#define M_SQRT1_2 0.70710678118654752440
- .text
function fft4_neon
vld1.32 {d0-d3}, [r0,:128]
diff --git a/libavcodec/arm/fmtconvert_neon.S b/libavcodec/arm/fmtconvert_neon.S
index 45cc84b7ec4..ad1c15d0fa8 100644
--- a/libavcodec/arm/fmtconvert_neon.S
+++ b/libavcodec/arm/fmtconvert_neon.S
@@ -23,7 +23,6 @@
#include "asm.S"
preserve8
- .text
function ff_float_to_int16_neon, export=1
subs r2, r2, #8
diff --git a/libavcodec/arm/h264dsp_neon.S b/libavcodec/arm/h264dsp_neon.S
index 3d2c6746aea..5156538ed2b 100644
--- a/libavcodec/arm/h264dsp_neon.S
+++ b/libavcodec/arm/h264dsp_neon.S
@@ -392,9 +392,6 @@ function ff_\type\()_h264_chroma_mc2_neon, export=1
endfunc
.endm
- .text
- .align
-
h264_chroma_mc8 put
h264_chroma_mc8 avg
h264_chroma_mc4 put
diff --git a/libavcodec/arm/h264idct_neon.S b/libavcodec/arm/h264idct_neon.S
index 6c62e0f7cbd..edb2ae5270e 100644
--- a/libavcodec/arm/h264idct_neon.S
+++ b/libavcodec/arm/h264idct_neon.S
@@ -21,7 +21,6 @@
#include "asm.S"
preserve8
- .text
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 5a149912f42..8bb58afb18c 100644
--- a/libavcodec/arm/int_neon.S
+++ b/libavcodec/arm/int_neon.S
@@ -23,7 +23,6 @@
preserve8
.fpu neon
- .text
function ff_scalarproduct_int16_neon, export=1
vmov.i16 q0, #0
diff --git a/libavcodec/arm/mdct_neon.S b/libavcodec/arm/mdct_neon.S
index 1ba3067c4e8..5669075521d 100644
--- a/libavcodec/arm/mdct_neon.S
+++ b/libavcodec/arm/mdct_neon.S
@@ -23,8 +23,6 @@
preserve8
- .text
-
#define ff_fft_calc_neon X(ff_fft_calc_neon)
function ff_imdct_half_neon, export=1
diff --git a/libavcodec/arm/simple_idct_arm.S b/libavcodec/arm/simple_idct_arm.S
index fce40b7d8cb..1490f539dfd 100644
--- a/libavcodec/arm/simple_idct_arm.S
+++ b/libavcodec/arm/simple_idct_arm.S
@@ -53,8 +53,6 @@
#define COL_SHIFTED_1 524288 /* 1<< (COL_SHIFT-1) */
- .text
-
function ff_simple_idct_arm, export=1
@@ void simple_idct_arm(int16_t *block)
@@ save stack for reg needed (take all of them),
--
GitLab