1.1 --- a/make/solaris/makefiles/product.make Tue May 20 09:47:05 2008 -0700
1.2 +++ b/make/solaris/makefiles/product.make Tue May 27 09:47:18 2008 -0700
1.3 @@ -38,12 +38,21 @@
1.4 endif
1.5
1.6 # (OPT_CFLAGS/SLOWER is also available, to alter compilation of buggy files)
1.7 +ifeq ("${Platform_compiler}", "sparcWorks")
1.8
1.9 -# Workaround SS11 bug 6345274 (all platforms)
1.10 -ifeq ("${Platform_compiler}", "sparcWorks")
1.11 -ifeq ($(shell expr $(COMPILER_REV) \>= 5.8), 1)
1.12 +# Problem with SS12 compiler, dtrace doesn't like the .o files (bug 6693876)
1.13 +ifeq ($(COMPILER_REV),5.9)
1.14 + # Not clear this workaround could be skipped in some cases.
1.15 + OPT_CFLAGS/vmGCOperations.o = $(OPT_CFLAGS/SLOWER) -g
1.16 + OPT_CFLAGS/java.o = $(OPT_CFLAGS/SLOWER) -g
1.17 + OPT_CFLAGS/jni.o = $(OPT_CFLAGS/SLOWER) -g
1.18 +endif
1.19 +
1.20 +# Workaround SS11 bug 6345274 (all platforms) (Fixed in SS11 patch and SS12)
1.21 +ifeq ($(COMPILER_REV),5.8)
1.22 OPT_CFLAGS/ciTypeFlow.o = $(OPT_CFLAGS/O2)
1.23 -endif # COMPILER_REV >= 5.8
1.24 +endif # COMPILER_REV == 5.8
1.25 +
1.26 endif # Platform_compiler == sparcWorks
1.27
1.28 # If you set HOTSPARC_GENERIC=yes, you disable all OPT_CFLAGS settings
