Mesa (master): glapi: adding @ char before type specifier in glapi_x86.S
Brian Paul
brianp at kemper.freedesktop.org
Tue Jan 25 16:24:48 UTC 2011
Module: Mesa
Branch: master
Commit: 37bffe8d128bd00343169188c9af4852bbd4783e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=37bffe8d128bd00343169188c9af4852bbd4783e
Author: Dimitry Andric <dimitry at andric.com>
Date: Tue Jan 25 09:23:44 2011 -0700
glapi: adding @ char before type specifier in glapi_x86.S
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=33433
NOTE: This is a candidate for the 7.9 and 7.10 branches.
Signed-off-by: Brian Paul <brianp at vmware.com>
---
src/mapi/glapi/gen/gl_x86_asm.py | 2 +-
src/mapi/glapi/glapi_x86.S | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/mapi/glapi/gen/gl_x86_asm.py b/src/mapi/glapi/gen/gl_x86_asm.py
index 21996a3..4ef4acb 100644
--- a/src/mapi/glapi/gen/gl_x86_asm.py
+++ b/src/mapi/glapi/gen/gl_x86_asm.py
@@ -73,7 +73,7 @@ class PrintGenericStubs(gl_XML.gl_print_base):
print '#define GL_OFFSET(x) CODEPTR(REGOFF(4 * x, EAX))'
print ''
print '#if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32__) && !defined(__APPLE__)'
- print '#define GLOBL_FN(x) GLOBL x ; .type x, function'
+ print '#define GLOBL_FN(x) GLOBL x ; .type x, @function'
print '#else'
print '#define GLOBL_FN(x) GLOBL x'
print '#endif'
diff --git a/src/mapi/glapi/glapi_x86.S b/src/mapi/glapi/glapi_x86.S
index fa448c1..8d85f61 100644
--- a/src/mapi/glapi/glapi_x86.S
+++ b/src/mapi/glapi/glapi_x86.S
@@ -46,7 +46,7 @@
#define GL_OFFSET(x) CODEPTR(REGOFF(4 * x, EAX))
#if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32__) && !defined(__APPLE__)
-#define GLOBL_FN(x) GLOBL x ; .type x, function
+#define GLOBL_FN(x) GLOBL x ; .type x, @function
#else
#define GLOBL_FN(x) GLOBL x
#endif
More information about the mesa-commit
mailing list