Commit c00e15b7 authored by Loren Merritt's avatar Loren Merritt Committed by Fiona Glaser

x86inc.asm: error on duplicate functions

Compile error if there's two functions of the same name, instead of silently renaming one of them.
parent ff3c1be4
......@@ -1349,6 +1349,7 @@ ZIGZAG_8x8_CAVLC mmx , W
%endif
%endmacro
%ifndef HIGH_BIT_DEPTH
INIT_XMM
cglobal zigzag_interleave_8x8_cavlc_sse2, 3,3,8
INTERLEAVE_XMM 0
......@@ -1364,4 +1365,4 @@ cglobal zigzag_interleave_8x8_cavlc_sse2, 3,3,8
shr r0d, 16
mov [r2+8], r0w
RET
%endif ; !HIGH_BIT_DEPTH
......@@ -1205,6 +1205,7 @@ ALIGN 4
%endif ;!HIGH_BIT_DEPTH
REP_RET
%ifndef HIGH_BIT_DEPTH
INIT_XMM
;-----------------------------------------------------------------------------
; void predict_8x8_ddl( uint8_t *src, uint8_t *edge )
......@@ -1248,8 +1249,8 @@ cglobal predict_8x8_ddr_sse2, 2,2
%endrep
movq [r0-3*FDEC_STRIDE], xmm0
movq [r0-4*FDEC_STRIDE], xmm1
RET
%endif ; !HIGH_BIT_DEPTH
;-----------------------------------------------------------------------------
; void predict_8x8_vl( uint8_t *src, uint8_t *edge )
......@@ -1477,8 +1478,10 @@ cglobal predict_8x8_hu_%1, 2,2
RET
%endmacro
%ifndef HIGH_BIT_DEPTH
PREDICT_8x8_HU sse2
PREDICT_8x8_HU ssse3
%endif
;-----------------------------------------------------------------------------
; void predict_8x8c_v( uint8_t *src )
......
......@@ -450,8 +450,11 @@ DECLARE_REG 6, ebp, ebp, bp, null, [esp + stack_offset + 28]
; Symbol prefix for C linkage
%macro cglobal 1-2+
%xdefine %1 mangle(program_name %+ _ %+ %1)
%xdefine %1.skip_prologue %1 %+ .skip_prologue
%ifndef cglobaled_%1
%xdefine %1 mangle(program_name %+ _ %+ %1)
%xdefine %1.skip_prologue %1 %+ .skip_prologue
CAT_XDEFINE cglobaled_, %1, 1
%endif
%ifidn __OUTPUT_FORMAT__,elf
global %1:function hidden
%else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment