1.1 --- a/make/solaris/makefiles/fastdebug.make Tue May 20 09:47:05 2008 -0700
1.2 +++ b/make/solaris/makefiles/fastdebug.make Tue May 27 09:47:18 2008 -0700
1.3 @@ -25,7 +25,7 @@
1.4 # Sets make macros for making debug version of VM
1.5
1.6 # Compiler specific DEBUG_CFLAGS are passed in from gcc.make, sparcWorks.make
1.7 -# They may also specify FASTDEBUG_CFLAGS, but it defaults to DEBUG_FLAGS.
1.8 +# They may also specify FASTDEBUG_CFLAGS, but it defaults to DEBUG_CFLAGS.
1.9
1.10 FASTDEBUG_CFLAGS$(FASTDEBUG_CFLAGS) = $(DEBUG_CFLAGS)
1.11
1.12 @@ -35,15 +35,26 @@
1.13
1.14 ifeq ("${Platform_compiler}", "sparcWorks")
1.15 OPT_CFLAGS/SLOWER = -xO2
1.16 -ifeq ($(shell expr $(COMPILER_REV) \>= 5.5), 1)
1.17 -# CC 5.5 has bug 4908364 with -xO4
1.18 +
1.19 +# Problem with SS12 compiler, dtrace doesn't like the .o files (bug 6693876)
1.20 +ifeq ($(COMPILER_REV), 5.9)
1.21 + # Not clear this workaround could be skipped in some cases.
1.22 + OPT_CFLAGS/vmGCOperations.o = $(OPT_CFLAGS/SLOWER)
1.23 + OPT_CFLAGS/java.o = $(OPT_CFLAGS/SLOWER)
1.24 + OPT_CFLAGS/jni.o = $(OPT_CFLAGS/SLOWER)
1.25 +endif
1.26 +
1.27 +ifeq ($(COMPILER_REV), 5.5)
1.28 +# CC 5.5 has bug 4908364 with -xO4 (Fixed in 5.6)
1.29 OPT_CFLAGS/library_call.o = $(OPT_CFLAGS/SLOWER)
1.30 -else # COMPILER_REV >= 5.5
1.31 +endif # COMPILER_REV == 5.5
1.32 +
1.33 +ifeq ($(shell expr $(COMPILER_REV) \<= 5.4), 1)
1.34 # Compilation of *_<arch>.cpp can take an hour or more at O3. Use O2
1.35 # See comments at top of sparc.make.
1.36 OPT_CFLAGS/ad_$(Platform_arch).o = $(OPT_CFLAGS/SLOWER)
1.37 OPT_CFLAGS/dfa_$(Platform_arch).o = $(OPT_CFLAGS/SLOWER)
1.38 -endif # COMPILER_REV >= 5.5
1.39 +endif # COMPILER_REV <= 5.4
1.40
1.41 ifeq (${COMPILER_REV}, 5.0)
1.42 # Avoid a compiler bug caused by using -xO<level> -g<level>
