--- a/components/p7zip/Makefile	Fri Feb 07 17:03:23 2014 -0500
+++ b/components/p7zip/Makefile	Fri Feb 07 14:38:38 2014 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -44,6 +44,9 @@
 include ../../make-rules/justmake.mk
 include ../../make-rules/ips.mk
 
+# the tests fail horribly with -Bdirect
+LD_B_DIRECT=
+
 COMPONENT_PREP_ACTION = (cd $(@D); cp ../makefile.solaris makefile.machine)
 COMPONENT_BUILD_TARGETS = all3
 COMPONENT_INSTALL_ARGS += DEST_HOME=/usr DEST_DIR=$(PROTO_DIR)

--- a/components/ruby/ruby-19/Makefile	Fri Feb 07 17:03:23 2014 -0500
+++ b/components/ruby/ruby-19/Makefile	Fri Feb 07 14:38:38 2014 -0800
@@ -99,6 +99,9 @@
 # the 12.3 compiler
 studio_OPT.i386.64 = -xO3
 
+# sparc build sometimes fails with studio 12.3 because of 17537968.
+studio_OPT.sparc.64 = -xO3
+
 # without this define, config fails frequently on i386 when including 
 # /usr/include/sys/isa_defs.h with error: "ISA not supported";
 # many extensions don't get built and at least one error causes 

--- a/make-rules/shared-macros.mk	Fri Feb 07 17:03:23 2014 -0500
+++ b/make-rules/shared-macros.mk	Fri Feb 07 14:38:38 2014 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 PATH=/usr/bin:/usr/gnu/bin
@@ -229,7 +229,7 @@
 BUILD_TOOLS ?=	/ws/on12-tools
 
 SPRO_ROOT =	$(BUILD_TOOLS)/SUNWspro
-SPRO_VROOT =	$(SPRO_ROOT)/sunstudio12.1
+SPRO_VROOT =	$(SPRO_ROOT)/solarisstudio12.3
 
 PARFAIT_ROOT =	$(BUILD_TOOLS)/parfait/parfait-tools-1.2.0.2
 PARFAIT_TOOLS=	$(WS_TOOLS)/$(MACH)/parfait