diff --git a/libavcodec/arm/dsputil_armv6.S b/libavcodec/arm/dsputil_armv6.S
index b8461059d9a279220204b8e8c0293fc3e1863e55..becf85182dbf52f8a106eb524c192c6d8e4e9963 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 13f0699eb252b5d9d030bdc0cc535dd5478f8e52..33969134d73564282957fbf64420d575a8fb867e 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 b79a2dc2653ad00ba7abc20eb9bee5a38ae41df8..a45898592eea2f03635f19187d7efd37dc2f6a02 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 45cc84b7ec4af3a7002f215447822e8d93a7c5f9..ad1c15d0fa895ea44aa9095cbe71f9238a67a55c 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 3d2c6746aea9e924fe8be3339c0b66ac6fbd1fe6..5156538ed2b36053c7b76d19cd0aa44868c7c16b 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 6c62e0f7cbd7770ca14e4e3d9d9e7e02115b3558..edb2ae5270eef4366700fee2ea554e32eb470c4f 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 5a149912f42e93594639625f6ff9336d7829d63a..8bb58afb18c94e9e97b076211f3c9ac695907b0a 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 1ba3067c4e874eb707d066cd8628d2419527ba49..5669075521dd3c938bbfd9c2cd5d60799591d611 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 fce40b7d8cb03b584282bdb27e0a81eed93ca7e6..1490f539dfda637abffcb8760648d3c063da2ce4 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),