Mesa (mesa_7_7_branch): glapi: Do not use .type pseudo-op on Mac OS X.
Vinson Lee
vlee at kemper.freedesktop.org
Sun Jan 24 07:01:30 UTC 2010
Module: Mesa
Branch: mesa_7_7_branch
Commit: bc75ec0f3824176f3fd7182846b3ec36051945b3
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bc75ec0f3824176f3fd7182846b3ec36051945b3
Author: Vinson Lee <vlee at vmware.com>
Date: Sat Jan 23 22:59:31 2010 -0800
glapi: Do not use .type pseudo-op on Mac OS X.
The .type directive is an unknown pseudo-op on Mac OS X.
---
src/mesa/glapi/gl_x86_asm.py | 2 +-
src/mesa/x86/glapi_x86.S | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/mesa/glapi/gl_x86_asm.py b/src/mesa/glapi/gl_x86_asm.py
index 36f0e31..3bc955d 100644
--- a/src/mesa/glapi/gl_x86_asm.py
+++ b/src/mesa/glapi/gl_x86_asm.py
@@ -73,7 +73,7 @@ class PrintGenericStubs(gl_XML.gl_print_base):
print ''
print '#define GL_OFFSET(x) CODEPTR(REGOFF(4 * x, EAX))'
print ''
- print '#if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32__)'
+ print '#if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32__) && !defined(__APPLE__)'
print '#define GLOBL_FN(x) GLOBL x ; .type x, function'
print '#else'
print '#define GLOBL_FN(x) GLOBL x'
diff --git a/src/mesa/x86/glapi_x86.S b/src/mesa/x86/glapi_x86.S
index 0da924c..849fbce 100644
--- a/src/mesa/x86/glapi_x86.S
+++ b/src/mesa/x86/glapi_x86.S
@@ -46,7 +46,7 @@
#define GL_OFFSET(x) CODEPTR(REGOFF(4 * x, EAX))
-#if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32__)
+#if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32__) && !defined(__APPLE__)
#define GLOBL_FN(x) GLOBL x ; .type x, function
#else
#define GLOBL_FN(x) GLOBL x
More information about the mesa-commit
mailing list