x86inc: Drop SECTION_TEXT macro

The .text section is already 16-byte aligned by default on all supported platforms so `SECTION_TEXT` isn't any different from `SECTION .text`.
10 years ago · f0b7882ceb
parent 826790f596
commit f0b7882ceb
34 changed files with 34 additions and 45 deletions
--- a/libavcodec/x86/aacpsdsp.asm
+++ b/libavcodec/x86/aacpsdsp.asm
@ -26,7 +26,7 @@ SECTION_RODATA

 ps_p1m1p1m1: dd 0, 0x80000000, 0, 0x80000000

-SECTION_TEXT
+SECTION .text

 ;*************************************************************************
 ;void ff_ps_add_squares_<opt>(float *dst, const float (*src)[2], int n);
--- a/libavcodec/x86/audiodsp.asm
+++ b/libavcodec/x86/audiodsp.asm
@ -21,7 +21,7 @@

 %include "libavutil/x86/x86util.asm"

-SECTION_TEXT
+SECTION .text

 %macro SCALARPRODUCT 0
 ; int ff_scalarproduct_int16(int16_t *v1, int16_t *v2, int order)
--- a/libavcodec/x86/blockdsp.asm
+++ b/libavcodec/x86/blockdsp.asm
@ -23,7 +23,7 @@

 %include "libavutil/x86/x86util.asm"

-SECTION_TEXT
+SECTION .text

 ;----------------------------------------
 ; void ff_clear_block(int16_t *blocks);
--- a/libavcodec/x86/bswapdsp.asm
+++ b/libavcodec/x86/bswapdsp.asm
@ -28,7 +28,7 @@ pb_bswap32: db 3, 2, 1, 0, 7, 6, 5, 4, 11, 10, 9, 8, 15, 14, 13, 12

 cextern pb_80

-SECTION_TEXT
+SECTION .text

 ; %1 = aligned/unaligned
 %macro BSWAP_LOOPS  1
--- a/libavcodec/x86/dcadsp.asm
+++ b/libavcodec/x86/dcadsp.asm
@ -24,7 +24,7 @@
 SECTION_RODATA
 pf_inv16:  times 4 dd 0x3D800000 ; 1/16

-SECTION_TEXT
+SECTION .text

 ; void decode_hf(float dst[DCA_SUBBANDS][8], const int32_t vq_num[DCA_SUBBANDS],
 ;                const int8_t hf_vq[1024][32], intptr_t vq_offset,
--- a/libavcodec/x86/dct32.asm
+++ b/libavcodec/x86/dct32.asm
@ -191,7 +191,7 @@ ps_p1p1m1m1: dd 0, 0, 0x80000000, 0x80000000, 0, 0, 0x80000000, 0x80000000
 %endmacro

 INIT_YMM avx
-SECTION_TEXT
+SECTION .text
 %if HAVE_AVX_EXTERNAL
 ; void ff_dct32_float_avx(FFTSample *out, const FFTSample *in)
 cglobal dct32_float, 2,3,8, out, in, tmp
--- a/libavcodec/x86/fft.asm
+++ b/libavcodec/x86/fft.asm
@ -90,7 +90,7 @@ cextern cos_ %+ i
    %1
 %endmacro

-SECTION_TEXT
+SECTION .text

 %macro T2_3DNOW 4 ; z0, z1, mem0, mem1
    mova     %1, %3
--- a/libavcodec/x86/flac_dsp_gpl.asm
+++ b/libavcodec/x86/flac_dsp_gpl.asm
@ -22,7 +22,7 @@

 %include "libavutil/x86/x86util.asm"

-SECTION_TEXT
+SECTION .text

 INIT_XMM sse4
 %if ARCH_X86_64
--- a/libavcodec/x86/fmtconvert.asm
+++ b/libavcodec/x86/fmtconvert.asm
@ -21,7 +21,7 @@

 %include "libavutil/x86/x86util.asm"

-SECTION_TEXT
+SECTION .text

 ;------------------------------------------------------------------------------
 ; void ff_int32_to_float_fmul_scalar(float *dst, const int32_t *src, float mul,
--- a/libavcodec/x86/g722dsp.asm
+++ b/libavcodec/x86/g722dsp.asm
@ -29,7 +29,7 @@ pw_qmf_coeffs2: dw  12, 3876, -156,  951,   32, -805, 362, -210
 pw_qmf_coeffs3: dw 362,    0 ,  32,    0, -156,    0,  12,    0
 pw_qmf_coeffs4: dw  53,    0,  -11,    0,  -11,    0,   3,    0

-SECTION_TEXT
+SECTION .text

 INIT_XMM sse2
 cglobal g722_apply_qmf, 2, 2, 5, prev, out
--- a/libavcodec/x86/h263_loopfilter.asm
+++ b/libavcodec/x86/h263_loopfilter.asm
@ -26,7 +26,7 @@ SECTION_RODATA
 cextern pb_FC
 cextern h263_loop_filter_strength

-SECTION_TEXT
+SECTION .text

 %macro H263_LOOP_FILTER 5
    pxor         m7, m7
--- a/libavcodec/x86/hevc_idct.asm
+++ b/libavcodec/x86/hevc_idct.asm
@ -21,7 +21,7 @@
 ; */
 %include "libavutil/x86/x86util.asm"

-SECTION_TEXT 32
+SECTION .text

 ; void ff_hevc_idctHxW_dc_{8,10}_<opt>(int16_t *coeffs)
 ; %1 = HxW
--- a/libavcodec/x86/hevc_mc.asm
+++ b/libavcodec/x86/hevc_mc.asm
@ -40,7 +40,6 @@ max_pixels_12:          times 16 dw ((1 << 12)-1)
 cextern pd_1
 cextern pb_0

-SECTION_TEXT 32
 %macro EPEL_TABLE 4
 hevc_epel_filters_%4_%1 times %2 d%3 -2, 58
                        times %2 d%3 10, -2
@ -88,6 +87,8 @@ QPEL_TABLE 12, 4, w, sse4
 QPEL_TABLE  8,16, b, avx2
 QPEL_TABLE 10, 8, w, avx2

+SECTION .text
+
 %define MAX_PB_SIZE  64

 %define hevc_qpel_filters_sse4_14 hevc_qpel_filters_sse4_10
--- a/libavcodec/x86/hevc_sao.asm
+++ b/libavcodec/x86/hevc_sao.asm
@ -36,7 +36,7 @@ cextern pw_2
 cextern pb_1
 cextern pb_2

-SECTION_TEXT
+SECTION .text

 %define MAX_PB_SIZE  64
 %define PADDING_SIZE 32 ; AV_INPUT_BUFFER_PADDING_SIZE
--- a/libavcodec/x86/hpeldsp.asm
+++ b/libavcodec/x86/hpeldsp.asm
@ -35,7 +35,7 @@ pb_interleave8:  db 0, 4, 1, 5, 2, 6, 3, 7

 cextern pw_8192

-SECTION_TEXT
+SECTION .text

 ; void ff_put_pixels8_x2(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
 %macro PUT_PIXELS8_X2 0
--- a/libavcodec/x86/huffyuvdsp.asm
+++ b/libavcodec/x86/huffyuvdsp.asm
@ -29,7 +29,7 @@ pb_7: times 8 db 7
 pb_zzzz3333zzzzbbbb: db -1,-1,-1,-1,3,3,3,3,-1,-1,-1,-1,11,11,11,11
 pb_zz11zz55zz99zzdd: db -1,-1,1,1,-1,-1,5,5,-1,-1,9,9,-1,-1,13,13

-SECTION_TEXT
+SECTION .text

 ; void ff_add_hfyu_median_pred_mmxext(uint8_t *dst, const uint8_t *top,
 ;                                     const uint8_t *diff, int w,
--- a/libavcodec/x86/idctdsp.asm
+++ b/libavcodec/x86/idctdsp.asm
@ -27,7 +27,7 @@ SECTION_RODATA

 cextern pb_80

-SECTION_TEXT
+SECTION .text

 ;--------------------------------------------------------------------------
 ;void ff_put_signed_pixels_clamped(const int16_t *block, uint8_t *pixels,
--- a/libavcodec/x86/imdct36.asm
+++ b/libavcodec/x86/imdct36.asm
@ -72,7 +72,7 @@ costabs:  times 4 dd  0.98480773
          times 4 dd  5.73685646

 %define SBLIMIT 32
-SECTION_TEXT
+SECTION .text

 %macro PSHUFD 3
 %if cpuflag(sse2) && notcpuflag(avx)
--- a/libavcodec/x86/lossless_audiodsp.asm
+++ b/libavcodec/x86/lossless_audiodsp.asm
@ -20,7 +20,7 @@

 %include "libavutil/x86/x86util.asm"

-SECTION_TEXT
+SECTION .text

 %macro SCALARPRODUCT 0
 ; int ff_scalarproduct_and_madd_int16(int16_t *v1, int16_t *v2, int16_t *v3,
--- a/libavcodec/x86/lossless_videodsp.asm
+++ b/libavcodec/x86/lossless_videodsp.asm
@ -29,7 +29,7 @@ pb_67: times 8 db  6, 7
 pb_zzzz2323zzzzabab: db -1,-1,-1,-1, 2, 3, 2, 3,-1,-1,-1,-1,10,11,10,11
 pb_zzzzzzzz67676767: db -1,-1,-1,-1,-1,-1,-1,-1, 6, 7, 6, 7, 6, 7, 6, 7

-SECTION_TEXT
+SECTION .text

 %macro INT16_LOOP 2 ; %1 = a/u (aligned/unaligned), %2 = add/sub
    movd    m4, maskd
--- a/libavcodec/x86/mlpdsp.asm
+++ b/libavcodec/x86/mlpdsp.asm
@ -21,7 +21,7 @@

 %include "libavutil/x86/x86util.asm"

-SECTION_TEXT
+SECTION .text

 %if ARCH_X86_64

--- a/libavcodec/x86/pngdsp.asm
+++ b/libavcodec/x86/pngdsp.asm
@ -27,7 +27,7 @@ SECTION_RODATA

 cextern pw_255

-SECTION_TEXT
+SECTION .text

 ; %1 = nr. of xmm registers used
 %macro ADD_BYTES_FN 1
--- a/libavcodec/x86/qpeldsp.asm
+++ b/libavcodec/x86/qpeldsp.asm
@ -31,7 +31,7 @@ cextern pw_16
 cextern pw_20


-SECTION_TEXT
+SECTION .text

 ; void ff_put_no_rnd_pixels8_l2(uint8_t *dst, uint8_t *src1, uint8_t *src2, int dstStride, int src1Stride, int h)
 %macro PUT_NO_RND_PIXELS8_L2 0
--- a/libavcodec/x86/sbrdsp.asm
+++ b/libavcodec/x86/sbrdsp.asm
@ -34,7 +34,7 @@ ps_noise13      dd  0.0,  1.0, 0.0, -1.0
 cextern         sbr_noise_table
 cextern         ps_neg

-SECTION_TEXT
+SECTION .text

 INIT_XMM sse
 cglobal sbr_sum_square, 2, 3, 6
--- a/libavcodec/x86/svq1enc.asm
+++ b/libavcodec/x86/svq1enc.asm
@ -21,7 +21,7 @@

 %include "libavutil/x86/x86util.asm"

-SECTION_TEXT
+SECTION .text

 %macro SSD_INT8_VS_INT16 0
 cglobal ssd_int8_vs_int16, 3, 3, 3, pix1, pix2, size
--- a/libavfilter/x86/af_volume.asm
+++ b/libavfilter/x86/af_volume.asm
@ -29,7 +29,7 @@ pw_1:         times 8 dw 1
 pw_128:       times 8 dw 128
 pq_128:       times 2 dq 128

-SECTION_TEXT
+SECTION .text

 ;------------------------------------------------------------------------------
 ; void ff_scale_samples_s16(uint8_t *dst, const uint8_t *src, int len,
--- a/libavfilter/x86/vf_idet.asm
+++ b/libavfilter/x86/vf_idet.asm
@ -23,7 +23,7 @@

 %include "libavutil/x86/x86util.asm"

-SECTION_TEXT
+SECTION .text

 ; Implementation that does 8-bytes at a time using single-word operations.
 %macro IDET_FILTER_LINE 1
--- a/libavfilter/x86/vf_pullup.asm
+++ b/libavfilter/x86/vf_pullup.asm
@ -20,7 +20,7 @@

 %include "libavutil/x86/x86util.asm"

-SECTION_TEXT
+SECTION .text

 INIT_MMX mmx
 cglobal pullup_filter_diff, 3, 5, 8, first, second, size
--- a/libavfilter/x86/vf_removegrain.asm
+++ b/libavfilter/x86/vf_removegrain.asm
@ -33,7 +33,7 @@ pw_4:    times 16 dw 4
 pw_8:    times 16 dw 8
 pw_div9: times 16 dw ((1<<16)+4)/9

-SECTION_TEXT
+SECTION .text

 ;*** Preprocessor helpers

--- a/libavresample/x86/audio_convert.asm
+++ b/libavresample/x86/audio_convert.asm
@ -36,7 +36,7 @@ pb_interleave_words: SHUFFLE_MASK_W  0,  4,  1,  5,  2,  6,  3,  7
 pb_deinterleave_words: SHUFFLE_MASK_W  0,  2,  4,  6,  1,  3,  5,  7
 pw_zero_even:     times 4 dw 0x0000, 0xffff

-SECTION_TEXT
+SECTION .text

 ;------------------------------------------------------------------------------
 ; void ff_conv_s16_to_s32(int32_t *dst, const int16_t *src, int len);
--- a/libavresample/x86/audio_mix.asm
+++ b/libavresample/x86/audio_mix.asm
@ -22,7 +22,7 @@
 %include "libavutil/x86/x86util.asm"
 %include "util.asm"

-SECTION_TEXT
+SECTION .text

 ;-----------------------------------------------------------------------------
 ; void ff_mix_2_to_1_fltp_flt(float **src, float **matrix, int len,
--- a/libavresample/x86/dither.asm
+++ b/libavresample/x86/dither.asm
@ -28,7 +28,7 @@ pf_dither_scale: times 8 dd 2.32830643762e-10

 pf_s16_scale: times 4 dd 32753.0

-SECTION_TEXT
+SECTION .text

 ;------------------------------------------------------------------------------
 ; void ff_quantize(int16_t *dst, float *src, float *dither, int len);
--- a/libavutil/x86/pixelutils.asm
+++ b/libavutil/x86/pixelutils.asm
@ -23,7 +23,7 @@

 %include "x86util.asm"

-SECTION_TEXT
+SECTION .text

 ;-------------------------------------------------------------------------------
 ; int ff_pixelutils_sad_8x8_mmx(const uint8_t *src1, ptrdiff_t stride1,
--- a/libavutil/x86/x86inc.asm
+++ b/libavutil/x86/x86inc.asm
@ -93,14 +93,6 @@
    %endif
 %endmacro

-%macro SECTION_TEXT 0-1 16
-    %ifidn __OUTPUT_FORMAT__,aout
-        SECTION .text
-    %else
-        SECTION .text align=%1
-    %endif
-%endmacro
-
 %if WIN64
    %define PIC
 %elif ARCH_X86_64 == 0
@ -753,10 +745,6 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, jge, jng, jnge, ja, jae,
    [SECTION .note.GNU-stack noalloc noexec nowrite progbits]
 %endif

-; Overrides the default .text section.
-; Silences warnings when defining structures.
-%define __SECT__
-
 ; cpuflags

 %assign cpuflags_mmx      (1<<0)