From dfc84c2296891858ef9d12800ae778063b76c05a Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Mon, 5 Dec 2016 19:52:43 +0000 Subject: mesa: make use of HAVE_FUNC_ATTRIBUTE_ALIAS macro We must make sure that xserver has an equivalent one-line change to its configure.ac as the glx/glapi headers get copied over. Then again, xserver does _not_ seem to set HAVE_ALIAS to begin with so one might want to look into that first. Cc: Adam Jackson Signed-off-by: Emil Velikov --- src/mapi/glapi/gen/glX_proto_size.py | 10 ++-------- src/mapi/glapi/gen/gl_x86_asm.py | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) (limited to 'src/mapi') diff --git a/src/mapi/glapi/gen/glX_proto_size.py b/src/mapi/glapi/gen/glX_proto_size.py index 3a1c554029..d9f95a31d8 100644 --- a/src/mapi/glapi/gen/glX_proto_size.py +++ b/src/mapi/glapi/gen/glX_proto_size.py @@ -330,10 +330,7 @@ class PrintGlxSizeStubs_c(PrintGlxSizeStubs_common): self.printFastcall() print '' print '' - print '#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(GLX_USE_APPLEGL)' - print '# undef HAVE_ALIAS' - print '#endif' - print '#ifdef HAVE_ALIAS' + print '#ifdef HAVE_FUNC_ATTRIBUTE_ALIAS' print '# define ALIAS2(from,to) \\' print ' _X_INTERNAL PURE FASTCALL GLint __gl ## from ## _size( GLenum e ) \\' print ' __attribute__ ((alias( # to )));' @@ -452,10 +449,7 @@ class PrintGlxReqSize_c(PrintGlxReqSize_common): print '#include "indirect_size.h"' print '#include "indirect_reqsize.h"' print '' - print '#if defined(__CYGWIN__) || defined(__MINGW32__)' - print '# undef HAVE_ALIAS' - print '#endif' - print '#ifdef HAVE_ALIAS' + print '#ifdef HAVE_FUNC_ATTRIBUTE_ALIAS' print '# define ALIAS2(from,to) \\' print ' GLint __glX ## from ## ReqSize( const GLbyte * pc, Bool swap, int reqlen ) \\' print ' __attribute__ ((alias( # to )));' diff --git a/src/mapi/glapi/gen/gl_x86_asm.py b/src/mapi/glapi/gen/gl_x86_asm.py index c0c7941ce1..50b09f5677 100644 --- a/src/mapi/glapi/gen/gl_x86_asm.py +++ b/src/mapi/glapi/gen/gl_x86_asm.py @@ -120,7 +120,7 @@ class PrintGenericStubs(gl_XML.gl_print_base): print '\tJMP(GL_OFFSET(off))' print '#endif' print '' - print '#ifdef HAVE_ALIAS' + print '#ifdef HAVE_FUNC_ATTRIBUTE_ALIAS' print '# define GL_STUB_ALIAS(fn,off,fn_alt,alias,alias_alt)\t\\' print '\t.globl\tGL_PREFIX(fn, fn_alt) ;\t\t\t\\' print '\t.set\tGL_PREFIX(fn, fn_alt), GL_PREFIX(alias, alias_alt)' -- cgit v1.2.3