--- a/open-src/xserver/xorg/Makefile	Mon Nov 11 14:46:00 2013 -0800
+++ b/open-src/xserver/xorg/Makefile	Sat Mar 14 12:06:11 2015 -0700
@@ -2,7 +2,7 @@
 #
 # Xorg server Makefile
 #
-# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -155,13 +155,16 @@
 # from the Xorg binary itself
 XORG_EXTERNS_FLAG = -Wl,-M,$(PWD)/$(XORG_EXTERNS_FILE)
 MODULE_BUILD_ENV = XORG_EXTERNS_FLAG='$(XORG_EXTERNS_FLAG)'
-MODULE_LDFLAGS += $(XORG_EXTERNS_FLAG)
+MODULE_LD_SHARED_OPTIONS += -M $(PWD)/$(XORG_EXTERNS_FILE)
+
+# Disable direct binding in shared objects, since it breaks libglx.so
+MODULE_BUILD_ENV += LD_SHARED_UNSET="-B direct"
 
 # 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.
-# Adding -z muldefs for 16418361 - which should be removed once we fix that
-MODULE_CONFIG_OPTS += LIBS="-z ignore -lpixman-1 -z muldefs"
+# binaries referencing pixman symbols that normally don't need them.  The
+# $(ZDISCARD_UNUSED_DEP) in LD_OPTIONS should avoid adding it when
+# not really needed.
+MODULE_CONFIG_OPTS += LIBS="-lpixman-1"
 
 # pkg-config files that need to have -R added
 FIX_PC_FILES=xorg-server.pc.in