summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHolger Waechtler <holger@akaflieg.extern.tu-berlin.de>2000-04-06 21:59:24 +0000
committerHolger Waechtler <holger@akaflieg.extern.tu-berlin.de>2000-04-06 21:59:24 +0000
commite4fb0285f2c753dc88e1e6e8678ea09a58a0c424 (patch)
tree40deacb59037f1b2cc67b7e3e20c00023da10450 /src
parent573ab9c9646680a226083abed5ccdea973ae766b (diff)
added CONCAT macro in NASM/MASM section
Diffstat (limited to 'src')
-rw-r--r--src/mesa/x86/assyntax.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mesa/x86/assyntax.h b/src/mesa/x86/assyntax.h
index 43164d9070c..2a1034870a5 100644
--- a/src/mesa/x86/assyntax.h
+++ b/src/mesa/x86/assyntax.h
@@ -243,10 +243,7 @@
#endif /* ACK_ASSEMBLER */
-#if (defined(Lynx) || (defined(SYSV) || defined(SVR4)) && !defined(ACK_ASSEMBLER) \
- || (defined(linux) || defined(__OS2ELF__)) && defined(__ELF__) \
- || defined(__FreeBSD__) && __FreeBSD__ >= 3) \
- || (defined(__NetBSD__) && defined(__ELF__))
+#if defined(__QNX__) || defined(Lynx) || (defined(SYSV) || defined(SVR4)) && !defined(ACK_ASSEMBLER) || defined(__ELF__) || defined(__GNU__)
#define GLNAME(a) a
#else
#define GLNAME(a) CONCAT(_,a)
@@ -851,6 +848,8 @@
#define P_XMM6 xmm6
#define P_XMM7 xmm7
+#define CONCAT(x, y) x ## y
+
#if defined(NASM_ASSEMBLER)
#define ST(n) st ## n