diff --git a/libavcodec/x86/apedsp.asm b/libavcodec/x86/apedsp.asm index d721ebda6b..d6abd982e8 100644 --- a/libavcodec/x86/apedsp.asm +++ b/libavcodec/x86/apedsp.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, diff --git a/libavcodec/x86/audiodsp.asm b/libavcodec/x86/audiodsp.asm index f2e831df17..696a73bd81 100644 --- 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) diff --git a/libavcodec/x86/bswapdsp.asm b/libavcodec/x86/bswapdsp.asm index 42580a392c..4810867921 100644 --- a/libavcodec/x86/bswapdsp.asm +++ b/libavcodec/x86/bswapdsp.asm @@ -24,7 +24,7 @@ SECTION_RODATA pb_bswap32: db 3, 2, 1, 0, 7, 6, 5, 4, 11, 10, 9, 8, 15, 14, 13, 12 -SECTION_TEXT +SECTION .text ; %1 = aligned/unaligned %macro BSWAP_LOOPS 1 diff --git a/libavcodec/x86/dcadsp.asm b/libavcodec/x86/dcadsp.asm index c99df126b0..18c7a0c354 100644 --- 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, diff --git a/libavcodec/x86/dct32.asm b/libavcodec/x86/dct32.asm index 0879c685f1..2c4c32eb11 100644 --- 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 ; void ff_dct32_float_avx(FFTSample *out, const FFTSample *in) cglobal dct32_float, 2,3,8, out, in, tmp ; pass 1 diff --git a/libavcodec/x86/fft.asm b/libavcodec/x86/fft.asm index e4744a3b60..d3be72e576 100644 --- 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 diff --git a/libavcodec/x86/fmtconvert.asm b/libavcodec/x86/fmtconvert.asm index e82f14923a..727daa9774 100644 --- 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, diff --git a/libavcodec/x86/h263_loopfilter.asm b/libavcodec/x86/h263_loopfilter.asm index 673f795daa..cd726ba86d 100644 --- a/libavcodec/x86/h263_loopfilter.asm +++ b/libavcodec/x86/h263_loopfilter.asm @@ -24,7 +24,7 @@ SECTION_RODATA cextern pb_FC cextern h263_loop_filter_strength -SECTION_TEXT +SECTION .text %macro H263_LOOP_FILTER 5 pxor m7, m7 diff --git a/libavcodec/x86/hpeldsp.asm b/libavcodec/x86/hpeldsp.asm index 073f7f908e..b8929b96d4 100644 --- a/libavcodec/x86/hpeldsp.asm +++ b/libavcodec/x86/hpeldsp.asm @@ -23,7 +23,7 @@ SECTION_RODATA cextern pb_1 -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 diff --git a/libavcodec/x86/huffyuvdsp.asm b/libavcodec/x86/huffyuvdsp.asm index 436abc8b75..e7536da998 100644 --- a/libavcodec/x86/huffyuvdsp.asm +++ b/libavcodec/x86/huffyuvdsp.asm @@ -28,7 +28,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, diff --git a/libavcodec/x86/imdct36.asm b/libavcodec/x86/imdct36.asm index 633fcd9d59..f85e2e4cc3 100644 --- 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) diff --git a/libavcodec/x86/pngdsp.asm b/libavcodec/x86/pngdsp.asm index c05f3da017..722caf0fd1 100644 --- 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 diff --git a/libavcodec/x86/qpeldsp.asm b/libavcodec/x86/qpeldsp.asm index 8f65550e60..ef5f1d8826 100644 --- a/libavcodec/x86/qpeldsp.asm +++ b/libavcodec/x86/qpeldsp.asm @@ -30,7 +30,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 diff --git a/libavcodec/x86/sbrdsp.asm b/libavcodec/x86/sbrdsp.asm index d7164b6496..b449de5f9a 100644 --- a/libavcodec/x86/sbrdsp.asm +++ b/libavcodec/x86/sbrdsp.asm @@ -27,7 +27,7 @@ ps_mask times 2 dd 1<<31, 0 ps_mask2 times 2 dd 0, 1<<31 ps_neg times 4 dd 1<<31 -SECTION_TEXT +SECTION .text INIT_XMM sse cglobal sbr_sum_square, 2, 3, 6 diff --git a/libavfilter/x86/af_volume.asm b/libavfilter/x86/af_volume.asm index 4e5ad2258c..25ba9234e5 100644 --- 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, diff --git a/libavresample/x86/audio_convert.asm b/libavresample/x86/audio_convert.asm index 1af1429bae..28f05a2c6c 100644 --- 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); diff --git a/libavresample/x86/audio_mix.asm b/libavresample/x86/audio_mix.asm index 2c657b50d4..13a04c6aab 100644 --- 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, diff --git a/libavresample/x86/dither.asm b/libavresample/x86/dither.asm index 2192e98eb4..67af203a26 100644 --- 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); diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm index d4ce68fa63..a519fd5f5d 100644 --- a/libavutil/x86/x86inc.asm +++ b/libavutil/x86/x86inc.asm @@ -84,14 +84,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 @@ -743,10 +735,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)