--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/xserver/xorg/16418361.patch	Thu Feb 28 15:39:49 2013 -0800
@@ -0,0 +1,17 @@
+--- a/hw/xfree86/modes/xf86cvt.c	Sat Oct 13 16:38:50 2012
++++ b/hw/xfree86/modes/xf86cvt.c	Thu Feb 28 13:00:17 2013
+@@ -63,6 +63,14 @@
+  * want that. -- libv
+  *
+  */
++
++/* this should be removed once we figure out why ld is complaining
++   even though these are included in the mapfile - 16418361 */
++#if (defined(__sparc__) || defined(__sparc))
++extern _X_EXPORT BoxRec RegionEmptyBox = { 0, 0, 0, 0 };
++extern _X_EXPORT RegDataRec RegionEmptyData = { 0, 0 };
++#endif
++
+ DisplayModePtr
+ xf86CVTMode(int HDisplay, int VDisplay, float VRefresh, Bool Reduced,
+             Bool Interlaced)

--- a/open-src/xserver/xorg/Makefile	Tue Feb 19 19:23:47 2013 -0800
+++ b/open-src/xserver/xorg/Makefile	Thu Feb 28 15:39:49 2013 -0800
@@ -148,7 +148,8 @@
 # Optimization doesn't always remove unused inline functions, leaving many 
 # binaries referencing pixman symbols that normally don't need them.  Using
 # -z ignore should ensure that it's not added when not really needed.
-MODULE_CONFIG_OPTS += LIBS="-z ignore -lpixman-1"
+# Adding -z muldefs for 16418361 - which should be removed once we fix that
+MODULE_CONFIG_OPTS += LIBS="-z ignore -lpixman-1 -z muldefs"
 
 # pkg-config files that need to have -R added
 FIX_PC_FILES=xorg-server.pc.in

--- a/open-src/xserver/xorg/patch-list	Tue Feb 19 19:23:47 2013 -0800
+++ b/open-src/xserver/xorg/patch-list	Thu Feb 28 15:39:49 2013 -0800
@@ -27,3 +27,4 @@
 sparc-no-bus-probe.patch,-p1
 113-port.patch,-p1
 16080810.patch,-p1
+16418361.patch,-p1