summaryrefslogtreecommitdiff
path: root/xc/extras/Mesa/src/X86/assyntax.h
diff options
context:
space:
mode:
Diffstat (limited to 'xc/extras/Mesa/src/X86/assyntax.h')
-rw-r--r--xc/extras/Mesa/src/X86/assyntax.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/xc/extras/Mesa/src/X86/assyntax.h b/xc/extras/Mesa/src/X86/assyntax.h
index 2aabbe4f8..25da11604 100644
--- a/xc/extras/Mesa/src/X86/assyntax.h
+++ b/xc/extras/Mesa/src/X86/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)