--- a/hotspot/make/solaris/makefiles/amd64.make	Mon May 17 00:47:28 2010 -0700
+++ b/hotspot/make/solaris/makefiles/amd64.make	Tue May 18 11:02:18 2010 -0700
@@ -33,14 +33,8 @@
 #
 ifeq ("${Platform_compiler}", "sparcWorks")
 
-# Temporary until C++ compiler is fixed
-
-# _lwp_create_interpose must have a frame
-OPT_CFLAGS/os_solaris_x86_64.o = -xO1
-
 # Temporary until SS10 C++ compiler is fixed
 OPT_CFLAGS/generateOptoStub.o = -xO2
-OPT_CFLAGS/thread.o = -xO2
 
 else