--- nasm.inc	2009/09/16 17:11:39	1.1.2.5
+++ nasm.inc	2008/12/04 14:41:50	1.4
@@ -19,7 +19,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: nasm.inc,v 1.1.2.5 2009/09/16 17:11:39 Isibaar Exp $
+; * $Id: nasm.inc,v 1.4 2008/12/04 14:41:50 Isibaar Exp $
 ; *
 ; ***************************************************************************/
 
@@ -104,9 +104,9 @@
 %define PTR_TYPE qword
 
 %ifdef __YASM_VERSION_ID__
-%define XVID_MOVSXD movsxd
+%define XVID_MOVSX movsxd
 %else
-%define XVID_MOVSXD movsx
+%define XVID_MOVSX movsx
 %endif
 
 %else
@@ -154,7 +154,8 @@
 %define PUSH_XMM6_XMM7
 %define POP_XMM6_XMM7
 
-%define XVID_MOVSXD movsx
+%define XVID_MOVSX movsx
+
 %endif
 
 
@@ -175,11 +176,7 @@
 %endmacro
 
 %macro TEXT 0
-%ifidn __OUTPUT_FORMAT__,macho
-      SECTION .text align=SECTION_ALIGN
-%else
       SECTION .rotext align=SECTION_ALIGN
-%endif
 %endmacro
 
 %macro cglobal 1
@@ -203,12 +200,3 @@
 		%endif
 	%endif
 %endmacro
-
-%macro NON_EXEC_STACK 0
-%ifidn __OUTPUT_FORMAT__,elf
-section .note.GNU-stack noalloc noexec nowrite progbits
-%endif
-%ifidn __OUTPUT_FORMAT__,elf64
-section .note.GNU-stack noalloc noexec nowrite progbits
-%endif
-%endmacro