--- a/components/cvs/Makefile	Tue Apr 24 12:04:18 2012 -0700
+++ b/components/cvs/Makefile	Tue Apr 24 14:39:01 2012 -0700
@@ -20,6 +20,11 @@
 #
 # Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
+
+# we hit parfait bug 12333159 in a case statement, so disable parfait
+# until we can move to clang
+PARFAIT_BUILD=no
+
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		cvs

--- a/components/ksh93/Makefile	Tue Apr 24 12:04:18 2012 -0700
+++ b/components/ksh93/Makefile	Tue Apr 24 14:39:01 2012 -0700
@@ -20,6 +20,8 @@
 #
 # Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
 #
+PARFAIT_BUILD=no
+
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_PROJECT_URL= http://www2.research.att.com/sw/download/

--- a/components/openssl/openssl-0.9.8-fips-140/Makefile	Tue Apr 24 12:04:18 2012 -0700
+++ b/components/openssl/openssl-0.9.8-fips-140/Makefile	Tue Apr 24 14:39:01 2012 -0700
@@ -20,6 +20,8 @@
 #
 # Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
+PARFAIT_BUILD=no
+
 include ../../../make-rules/shared-macros.mk
 
 PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin:/usr/perl5/bin

--- a/make-rules/shared-macros.mk	Tue Apr 24 12:04:18 2012 -0700
+++ b/make-rules/shared-macros.mk	Tue Apr 24 14:39:01 2012 -0700
@@ -398,7 +398,11 @@
 # Code generation instruction set and optimization 'hints'.  Use studio_XBITS
 # and not the .arch.bits variety directly.
 studio_XBITS.sparc.32 =	-xtarget=ultra2 -xarch=sparcvis -xchip=ultra2
-studio_XBITS.sparc.64 =	-xtarget=ultra2 -xarch=sparcvis -xchip=ultra2
+studio_XBITS.sparc.64 =	
+ifneq   ($(strip $(PARFAIT_BUILD)),yes)
+studio_XBITS.sparc.64 += -xtarget=ultra2
+endif
+studio_XBITS.sparc.64 += -xarch=sparcvis -xchip=ultra2
 studio_XBITS.i386.32 =	-xchip=pentium
 studio_XBITS.i386.64 =	-xchip=generic -Ui386 -U__i386
 studio_XBITS = $(studio_XBITS.$(MACH).$(BITS))