aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mapi
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-01-25 20:12:37 +0000
committermarha <marha@users.sourceforge.net>2011-01-25 20:12:37 +0000
commit9ad7416b909d358cb254a48eaccd7888d684fcb6 (patch)
tree79eab076e5435929794b4d97011a8e47d4b8ab57 /mesalib/src/mapi
parent815075ae9c51f21f6c3f0806f40bc9070701fd56 (diff)
parent542d457cc1382d5118bf01e88f4f88b3028be88c (diff)
downloadvcxsrv-9ad7416b909d358cb254a48eaccd7888d684fcb6.tar.gz
vcxsrv-9ad7416b909d358cb254a48eaccd7888d684fcb6.tar.bz2
vcxsrv-9ad7416b909d358cb254a48eaccd7888d684fcb6.zip
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mapi')
-rw-r--r--mesalib/src/mapi/glapi/gen/gl_x86_asm.py2
-rw-r--r--mesalib/src/mapi/glapi/glapi_x86.S2
2 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/mapi/glapi/gen/gl_x86_asm.py b/mesalib/src/mapi/glapi/gen/gl_x86_asm.py
index 324e13b79..ede034e58 100644
--- a/mesalib/src/mapi/glapi/gen/gl_x86_asm.py
+++ b/mesalib/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/mesalib/src/mapi/glapi/glapi_x86.S b/mesalib/src/mapi/glapi/glapi_x86.S
index 78e1ea668..6246e660f 100644
--- a/mesalib/src/mapi/glapi/glapi_x86.S
+++ b/mesalib/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