Revision: 19889
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19889
Author: sirdude
Date: 2009-04-23 03:13:29 +0200 (Thu, 23 Apr 2009)
Log Message:
-----------
Fix for yasm on 64bit machines...
Kent
Modified Paths:
--------------
trunk/blender/extern/ffmpeg/libavcodec/x86/x86inc.asm
Modified: trunk/blender/extern/ffmpeg/libavcodec/x86/x86inc.asm
===================================================================
--- trunk/blender/extern/ffmpeg/libavcodec/x86/x86inc.asm 2009-04-23
00:56:05 UTC (rev 19888)
+++ trunk/blender/extern/ffmpeg/libavcodec/x86/x86inc.asm 2009-04-23
01:13:29 UTC (rev 19889)
@@ -399,7 +399,11 @@
; This is needed for ELF, otherwise the GNU linker assumes the stack is
; executable by default.
%ifidn __OUTPUT_FORMAT__,elf
-SECTION .note.GNU-stack noalloc noexec nowrite progbits
+ %ifdef __NASM_MAJOR__
+ section .note.GNU-stack noalloc noexec nowrite progbits
+ %else
+ section ".note.GNU-stack" noalloc noexec nowrite progbits
+ %endif
%endif
%assign FENC_STRIDE 16
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
