Disable the FASTCALL optimization because it still breaks server-side GLX.

diff --git a/src/glx/x11/indirect.c b/src/glx/x11/indirect.c
index 2a4db6578a78149ca2ca5f773efc73dcaae3e7cb..35be63f36ec1b857f12553433f3be8688a1be0cd 100644 (file)
--- a/src/glx/x11/indirect.c
+++ b/src/glx/x11/indirect.c
@@ -39,11 +39,7 @@
 
 #define __GLX_PAD(n) (((n) + 3) & ~3)
 
-#  if defined(__i386__) && defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__)
-#    define FASTCALL __attribute__((fastcall))
-#  else
-#    define FASTCALL
-#  endif
+#define FASTCALL
 #  if defined(__GNUC__)
 #    define NOINLINE __attribute__((noinline))
 #  else

diff --git a/src/glx/x11/indirect.h b/src/glx/x11/indirect.h
index 1c45fa28a4cbe809fad56b90ee7961496f2e36d1..fd5cbf1edb1650bcb37a02ab9930c76c5a870277 100644 (file)
--- a/src/glx/x11/indirect.h
+++ b/src/glx/x11/indirect.h
@@ -42,11 +42,7 @@
 #  else
 #    define HIDDEN
 #  endif
-#  if defined(__i386__) && defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__)
-#    define FASTCALL __attribute__((fastcall))
-#  else
-#    define FASTCALL
-#  endif
+#define FASTCALL
 #  if defined(__GNUC__)
 #    define NOINLINE __attribute__((noinline))
 #  else

diff --git a/src/glx/x11/indirect_size.c b/src/glx/x11/indirect_size.c
index 79d57d55b68f82d619b524881a7629ec46a130c4..aa5ed752a591e185a85c5cb0f644b0c76ea1bdd9 100644 (file)
--- a/src/glx/x11/indirect_size.c
+++ b/src/glx/x11/indirect_size.c
@@ -35,11 +35,7 @@
 #    define PURE
 #  endif
 
-#  if defined(__i386__) && defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__)
-#    define FASTCALL __attribute__((fastcall))
-#  else
-#    define FASTCALL
-#  endif
+#define FASTCALL
 
 #  if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__)
 #    define INTERNAL  __attribute__((visibility("internal")))

diff --git a/src/glx/x11/indirect_size.h b/src/glx/x11/indirect_size.h
index 9ba0bd690755a3facf4cd7ae0635de2199073d18..c3f353dbf4c1bc748146e95d5569125bdbff31d5 100644 (file)
--- a/src/glx/x11/indirect_size.h
+++ b/src/glx/x11/indirect_size.h
@@ -42,11 +42,7 @@
 #    define PURE
 #  endif
 
-#  if defined(__i386__) && defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__)
-#    define FASTCALL __attribute__((fastcall))
-#  else
-#    define FASTCALL
-#  endif
+#define FASTCALL
 
 #  if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__)
 #    define INTERNAL  __attribute__((visibility("internal")))

diff --git a/src/mesa/glapi/gl_XML.py b/src/mesa/glapi/gl_XML.py
index 11b23b7a8674a9c2acbb45f2a61cd371b66f4d2d..0cea26877711f9b20f91480dd006943b20e3f949 100644 (file)
--- a/src/mesa/glapi/gl_XML.py
+++ b/src/mesa/glapi/gl_XML.py
@@ -194,11 +194,9 @@ class gl_print_base:
                """
 
                self.undef_list.append("FASTCALL")
-               print """#  if defined(__i386__) && defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__)
-#    define FASTCALL __attribute__((fastcall))
-#  else
-#    define FASTCALL
-#  endif"""
+               # I've removed the previous code for __attribute__((fastcall))
+               # because it breaks server-side GLX. (BrianP)
+               print "#define FASTCALL"
                return