--- nasm.inc	2009/05/28 15:04:35	1.1.2.4
+++ nasm.inc	2008/11/30 16:36:44	1.2
@@ -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.4 2009/05/28 15:04:35 Isibaar Exp $
+; * $Id: nasm.inc,v 1.2 2008/11/30 16:36:44 Isibaar Exp $
 ; *
 ; ***************************************************************************/
 
@@ -50,16 +50,6 @@
 %define prm7d dword prm7
 %define prm8d dword prm8
 
-%macro PUSH_XMM6_XMM7 0
-      movdqa [_ESP+PTR_SIZE], xmm6
-      movdqa [_ESP+PTR_SIZE+16], xmm7
-%endmacro
-
-%macro POP_XMM6_XMM7 0
-      movdqa xmm6, [_ESP+PTR_SIZE]
-      movdqa xmm7, [_ESP+PTR_SIZE+16]
-%endmacro
-
 %else ; Linux
 
 %define prm1 rdi
@@ -80,9 +70,6 @@
 %define prm7d dword prm7
 %define prm8d dword prm8
 
-%define PUSH_XMM6_XMM7
-%define POP_XMM6_XMM7
-
 %endif
 
 %define _EAX rax
@@ -103,12 +90,6 @@
 %define PTR_SIZE 8
 %define PTR_TYPE qword
 
-%ifdef __YASM_VERSION_ID__
-%define XVID_MOVSXD movsxd
-%else
-%define XVID_MOVSXD movsx
-%endif
-
 %else
 
 %define SECTION_ALIGN 16
@@ -151,10 +132,6 @@
 %define PTR_SIZE 4
 %define PTR_TYPE dword
 
-%define PUSH_XMM6_XMM7
-%define POP_XMM6_XMM7
-
-%define XVID_MOVSXD movsx
 %endif
 
 
@@ -174,14 +151,6 @@
       %endif
 %endmacro
 
-%macro TEXT 0
-%ifidn __OUTPUT_FORMAT__,macho
-      SECTION .text align=SECTION_ALIGN
-%else
-      SECTION .rotext align=SECTION_ALIGN
-%endif
-%endmacro
-
 %macro cglobal 1
 	%ifdef PREFIX
 		%ifdef MARK_FUNCS