--- trunk/xvidcore/src/utils/x86_64_asm/cpuid.asm 2008/09/02 12:23:30 1792 +++ trunk/xvidcore/src/utils/x86_64_asm/cpuid.asm 2008/11/11 20:46:24 1793 @@ -20,7 +20,7 @@ ; * along with this program ; if not, write to the Free Software ; * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ; * -; * $Id: cpuid.asm,v 1.4 2008-08-19 09:17:17 Isibaar Exp $ +; * $Id: cpuid.asm,v 1.5 2008-11-11 20:46:24 Isibaar Exp $ ; * ; ***************************************************************************/ @@ -31,15 +31,19 @@ %ifdef MARK_FUNCS global _%1:function %1.endfunc-%1 %define %1 _%1:function %1.endfunc-%1 + %define ENDFUNC .endfunc %else global _%1 %define %1 _%1 + %define ENDFUNC %endif %else %ifdef MARK_FUNCS global %1:function %1.endfunc-%1 + %define ENDFUNC .endfunc %else global %1 + %define ENDFUNC %endif %endif %endmacro @@ -184,7 +188,7 @@ pop rbx ret -.endfunc +ENDFUNC ; sse/sse2 operating support detection routines ; these will trigger an invalid instruction signal if not supported. @@ -193,7 +197,7 @@ sse_os_trigger: xorps xmm0, xmm0 ret -.endfunc +ENDFUNC ALIGN 16 @@ -201,7 +205,7 @@ sse2_os_trigger: xorpd xmm0, xmm0 ret -.endfunc +ENDFUNC ; enter/exit mmx state @@ -210,7 +214,7 @@ emms_mmx: emms ret -.endfunc +ENDFUNC ; faster enter/exit mmx state ALIGN 16 @@ -218,7 +222,7 @@ emms_3dn: femms ret -.endfunc +ENDFUNC %ifidn __OUTPUT_FORMAT__,elf section ".note.GNU-stack" noalloc noexec nowrite progbits