summaryrefslogtreecommitdiff
path: root/src/mesa/x86/assyntax.h
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2002-06-11 01:26:58 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2002-06-11 01:26:58 +0000
commit35883ceb9389f9e5b4be8233f2326367c6aecddb (patch)
tree9bf611edc41f33119ce4f1152db50943a5f762d7 /src/mesa/x86/assyntax.h
parent4fe2f3f1a01b3825a6d24f5694d705aee6911a3b (diff)
Fix NASM problems, remove static var in SSE detection code. (Josh Vanderhoof)
Diffstat (limited to 'src/mesa/x86/assyntax.h')
-rw-r--r--src/mesa/x86/assyntax.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/x86/assyntax.h b/src/mesa/x86/assyntax.h
index 6a4aa62147..6ee6ac6c29 100644
--- a/src/mesa/x86/assyntax.h
+++ b/src/mesa/x86/assyntax.h
@@ -1,4 +1,4 @@
-/* $Id: assyntax.h,v 1.20 2002/06/06 15:33:37 brianp Exp $ */
+/* $Id: assyntax.h,v 1.21 2002/06/11 01:26:58 brianp Exp $ */
#ifndef __ASSYNTAX_H__
#define __ASSYNTAX_H__
@@ -964,11 +964,11 @@ SECTION _DATA public align=16 class=DATA use32 flat
#endif
#if defined(Lynx) || (defined(SYSV) || defined(SVR4)) \
- || (defined(linux) || defined(__OS2ELF__)) && defined(__ELF__) \
+ || (defined(__linux__) || defined(__OS2ELF__)) && defined(__ELF__) \
|| defined(__FreeBSD__) && __FreeBSD__ >= 3
#define GLNAME(a) a
#else
-#define GLNAME(a) _ ## a
+#define GLNAME(a) CONCAT(_, a)
#endif
/*
@@ -1077,7 +1077,7 @@ SECTION _DATA public align=16 class=DATA use32 flat
#define VARINDIRECT(var) var
/* Use register contents as jump/call target: */
-#define CODEPTR(reg) reg
+#define CODEPTR(reg) P_(reg)
/*
* Redefine assembler commands
@@ -1201,7 +1201,7 @@ SECTION _DATA public align=16 class=DATA use32 flat
#define JS(a) js NEAR a
#define JZ(a) jz NEAR a
#define JMP(a) jmp a
-#define JMPF(s,a) jmpf
+#define JMPF(s,a) jmp far s:a
#define LAHF lahf
#define LAR(a, b) lar b, a
#define LEA_L(a, b) lea P_(b), P_(a)