--- a/open-src/xserver/xorg/workaround-7154410.patch	Tue Apr 10 09:09:50 2012 -0700
+++ b/open-src/xserver/xorg/workaround-7154410.patch	Tue Apr 10 21:23:33 2012 -0700
@@ -1,21 +1,11 @@
---- a/glx/glapi_gentable.c.orig  Tue Mar 27 09:06:48 2012
-+++ b/glx/glapi_gentable.c       Tue Mar 27 09:07:56 2012
-@@ -57,6 +57,18 @@
- #include "os.h"
- #endif
+diff --git a/glx/Makefile.am b/glx/Makefile.am
+index ced78b7..443d374 100644
+--- a/glx/Makefile.am
++++ b/glx/Makefile.am
+@@ -101,3 +101,6 @@ libglx_la_SOURCES = \
+         xfont.c
  
-+#if defined(__sparc__) || defined(__sparc)
-+#define WORKAROUND_7154410
-+#endif
+ libglx_la_LIBADD = $(DLOPEN_LIBS)
 +
-+#ifdef WORKAROUND_7154410
-+static void *
-+workaround_dlsym(void *handle, const char *name) {
-+    return dlsym(handle, name);
-+}
-+#define dlsym workaround_dlsym
-+#endif
-+
- static void
- __glapi_gentable_NoOp(void) {
-     const char *fstr = "Unknown";
++# Workaround Studio 12.1 optimizer bug 7154410
++glapi_gentable.lo: CFLAGS = $(CCASFLAGS:-xO4=-xO0)

--- a/open-src/xserver/xvnc/Makefile	Tue Apr 10 09:09:50 2012 -0700
+++ b/open-src/xserver/xvnc/Makefile	Tue Apr 10 21:23:33 2012 -0700
@@ -104,6 +104,10 @@
 MODULE_COMPILER=suncc
 MODULE_COMPILER_SET=yes
 
+# Make command to use
+MODULE_MAKE=$(GNUMAKE)
+MODULE_MAKE_SET=yes
+
 # Xvnc has to configure, build, and install in different directories due to 
 # the mixed codebases and unusual directory layout
 $(NO_RECURSE)MODULE_ADD_SOURCE_TARGETS = Xvnc_source_init