--- a/components/cvs/Makefile	Wed Sep 12 18:56:18 2012 -0700
+++ b/components/cvs/Makefile	Thu Sep 13 21:10:39 2012 -0700
@@ -21,10 +21,6 @@
 # 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/python/python26/Makefile	Wed Sep 12 18:56:18 2012 -0700
+++ b/components/python/python26/Makefile	Thu Sep 13 21:10:39 2012 -0700
@@ -58,12 +58,7 @@
 # requirements.
 COMPONENT_BUILD_TARGETS = profile-opt
 XPROFILE_DIR = $(BUILD_DIR_$(BITS))/.profile
-# the non-clang compiler we need to use for now doesn't like
-# this flag
-#ifneq   ($(strip $(PARFAIT_BUILD)),yes)
-PYFLAGS.i386 = -xtarget=opteron
-#endif
-PYFLAGS.i386 += -xarch=sse2 -xcache=generic
+PYFLAGS.i386 = -xtarget=opteron -xarch=sse2 -xcache=generic
 PYFLAGS.sparc =
 CFLAGS += -xO5 $(PYFLAGS.$(MACH))
 LDFLAGS += -xO5 $(PYFLAGS.$(MACH))

--- a/components/python/python27/Makefile	Wed Sep 12 18:56:18 2012 -0700
+++ b/components/python/python27/Makefile	Thu Sep 13 21:10:39 2012 -0700
@@ -71,12 +71,7 @@
 # requirements.
 COMPONENT_BUILD_TARGETS = profile-opt
 XPROFILE_DIR = $(BUILD_DIR_$(BITS))/.profile
-# the non-clang compiler we need to use for now doesn't like
-# this flag
-#ifneq   ($(strip $(PARFAIT_BUILD)),yes)
-PYFLAGS.i386 = -xtarget=opteron
-#endif
-PYFLAGS.i386 += -xarch=sse2 -xcache=generic
+PYFLAGS.i386 = -xtarget=opteron -xarch=sse2 -xcache=generic
 PYFLAGS.sparc =
 CFLAGS += -xO5 $(PYFLAGS.$(MACH))
 LDFLAGS += -xO5 $(PYFLAGS.$(MACH))

--- a/components/samba/samba/Makefile	Wed Sep 12 18:56:18 2012 -0700
+++ b/components/samba/samba/Makefile	Thu Sep 13 21:10:39 2012 -0700
@@ -23,10 +23,6 @@
 # Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
-# parfait seems to spin when looking at the .bc files, so
-# for now disable it.
-PARFAIT_BUILD=no
-
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		samba

--- a/make-rules/shared-macros.mk	Wed Sep 12 18:56:18 2012 -0700
+++ b/make-rules/shared-macros.mk	Thu Sep 13 21:10:39 2012 -0700
@@ -219,14 +219,12 @@
 SPRO_ROOT =	$(BUILD_TOOLS)/SUNWspro
 SPRO_VROOT =	$(SPRO_ROOT)/sunstudio12.1
 
-PARFAIT_ROOT =	$(BUILD_TOOLS)/parfait/parfait-tools-0.5.0.1/
+PARFAIT_ROOT =	$(BUILD_TOOLS)/parfait/parfait-tools-1.0.1/
 PARFAIT= $(PARFAIT_ROOT)/bin/parfait
 export PARFAIT_NATIVESUNCC=$(SPRO_VROOT)/bin/cc
 export PARFAIT_NATIVESUNCXX=$(SPRO_VROOT)/bin/CC
 export PARFAIT_NATIVEGCC=$(GCC_ROOT)/bin/gcc
 export PARFAIT_NATIVEGXX=$(GCC_ROOT)/bin/g++
-# for now
-export PARFAIT_CLANG=0
 
 GCC_ROOT =	/usr/sfw
 

--- a/tools/Makefile	Wed Sep 12 18:56:18 2012 -0700
+++ b/tools/Makefile	Thu Sep 13 21:10:39 2012 -0700
@@ -41,7 +41,6 @@
 		echo "export PARFAIT_NATIVESUNCXX=$(SPRO_VROOT)/bin/CC" >> parfait/$$i ; \
 		echo "export PARFAIT_NATIVEGCC=$(GCC_ROOT)/bin/gcc" >> parfait/$$i ; \
 		echo "export PARFAIT_NATIVEGXX=$(GCC_ROOT)/bin/g++" >> parfait/$$i ; \
-		echo "export PARFAIT_CLANG="$(PARFAIT_CLANG) >> parfait/$$i ; \
 		echo "exec" $(PARFAIT_ROOT)/bin/parfait-$$i '$$*' >> parfait/$$i ; \
 		chmod +x parfait/$$i ; \
 	done