--- a/exception_lists/check_rtime	Fri Jan 17 13:59:18 2014 -0800
+++ b/exception_lists/check_rtime	Tue Jan 21 17:24:52 2014 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, 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"),
@@ -83,6 +83,10 @@
 # Ancient non-thread-safe version of libXaw in the process of being EOF'ed
 ERRNO		^usr/lib/libXaw\.so\.4$
 
+# Since we're not in ON, elfsigning happens at RE dock integration,
+# not during the build process.
+NOELFSIGN	.*
+
 ## Things we might be able to fix eventually, but not today:
 #
 # libXinerama only uses libc for malloc() - when linked with synergyc &

--- a/open-src/xserver/xorg/sun-src/os/solaris/mdb/modules/Makefile	Fri Jan 17 13:59:18 2014 -0800
+++ b/open-src/xserver/xorg/sun-src/os/solaris/mdb/modules/Makefile	Tue Jan 21 17:24:52 2014 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2014, 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"),
@@ -26,12 +26,13 @@
 
 CFLAGS += -K pic -g
 CPPFLAGS += -I ../../../../include -I ../../../.. -I ../../../../Xext
-LDFLAGS += -lc -Wl,-z,text -M mapfile -Wl,-z,parent=/usr/bin/$(ARCHLIBSUBDIR)/mdb 
+LDFLAGS += -Wl,-z,direct -Wl,-z,text -M mapfile -lc
+LDFLAGS += -Wl,-z,parent=/usr/bin$(ARCHLIBSUBDIR)/mdb
 
 HEADERS = Xserver_mdb.h
 SOURCES = Xserver_clients.c Xserver_device_grabs.c mdb_module.c
 OBJECTS = $(SOURCES:%.c=%.o)
-LINTFILES = $(SOURCES:%.so=%.ln)
+LINTFILES = $(SOURCES:%.c=%.ln)
 
 all: $(MODULES)